This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 54ce34f camel-spring-boot - Add missing option to GCP vault
configuration.
54ce34f is described below
commit 54ce34f0d50334b40be4bb81f10331a04577afc0
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Mar 24 13:15:47 2022 +0100
camel-spring-boot - Add missing option to GCP vault configuration.
---
core/camel-spring-boot/src/main/docs/spring-boot.json | 7 +++++++
.../camel/spring/boot/vault/GcpVaultAutoConfiguration.java | 1 +
.../spring/boot/vault/GcpVaultConfigurationProperties.java | 14 ++++++++++++++
3 files changed, 22 insertions(+)
diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.json
b/core/camel-spring-boot/src/main/docs/spring-boot.json
index b987c4f..e21cdd2 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.json
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.json
@@ -1350,6 +1350,13 @@
"sourceType":
"org.apache.camel.spring.boot.vault.GcpVaultConfigurationProperties"
},
{
+ "name": "camel.vault.gcp.use-default-instance",
+ "type": "java.lang.Boolean",
+ "description": "Define if we want to use the GCP Client Default Instance
or not",
+ "sourceType":
"org.apache.camel.spring.boot.vault.GcpVaultConfigurationProperties",
+ "defaultValue": false
+ },
+ {
"name": "management.endpoint.camelroutecontroller.cache.time-to-live",
"type": "java.time.Duration",
"description": "Maximum time that a response can be cached.",
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultAutoConfiguration.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultAutoConfiguration.java
index 5318a3f..6b53399 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultAutoConfiguration.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultAutoConfiguration.java
@@ -36,6 +36,7 @@ public class GcpVaultAutoConfiguration {
GcpVaultConfiguration answer = new GcpVaultConfiguration();
answer.setServiceAccountKey(config.getServiceAccountKey());
answer.setProjectId(config.getProjectId());
+ answer.setUseDefaultInstance(config.isUseDefaultInstance());
return answer;
}
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationProperties.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationProperties.java
index 83421a1..5660834 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationProperties.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationProperties.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.spring.boot.vault;
+import org.apache.camel.spi.Metadata;
import org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties(prefix = "camel.vault.gcp")
@@ -31,6 +32,11 @@ public class GcpVaultConfigurationProperties {
*/
private String projectId;
+ /**
+ * Define if we want to use the GCP Client Default Instance or not
+ */
+ private boolean useDefaultInstance;
+
public String getServiceAccountKey() {
return serviceAccountKey;
}
@@ -46,4 +52,12 @@ public class GcpVaultConfigurationProperties {
public void setProjectId(String projectId) {
this.projectId = projectId;
}
+
+ public boolean isUseDefaultInstance() {
+ return useDefaultInstance;
+ }
+
+ public void setUseDefaultInstance(boolean useDefaultInstance) {
+ this.useDefaultInstance = useDefaultInstance;
+ }
}