You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/04/04 10:53:39 UTC
[camel] 04/05: CAMEL-17686 - Support ability to load properties from Vault/Secrets cloud services - Azure Key Vault
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 43a1e8c3246deb870d32e477a97db9103c8c426b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Apr 4 11:51:05 2022 +0200
CAMEL-17686 - Support ability to load properties from Vault/Secrets cloud services - Azure Key Vault
---
.../camel/vault/AzureVaultConfiguration.java | 24 +++++++++++-----------
.../camel-main-configuration-metadata.json | 8 ++++----
core/camel-main/src/main/docs/main.adoc | 12 +++++++++++
3 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/vault/AzureVaultConfiguration.java b/core/camel-api/src/main/java/org/apache/camel/vault/AzureVaultConfiguration.java
index 6731a3e71dc..33ed8ab8164 100644
--- a/core/camel-api/src/main/java/org/apache/camel/vault/AzureVaultConfiguration.java
+++ b/core/camel-api/src/main/java/org/apache/camel/vault/AzureVaultConfiguration.java
@@ -32,46 +32,46 @@ public class AzureVaultConfiguration extends VaultConfiguration {
@Metadata(secret = true)
private String tenantId;
- /**
- * The vault Name in Azure Key Vault
- */
public String getVaultName() {
return vaultName;
}
+ /**
+ * The vault Name in Azure Key Vault
+ */
public void setVaultName(String vaultName) {
this.vaultName = vaultName;
}
- /**
- * The client Id for accessing Azure Key Vault
- */
public String getClientId() {
return clientId;
}
+ /**
+ * The client Id for accessing Azure Key Vault
+ */
public void setClientId(String clientId) {
this.clientId = clientId;
}
- /**
- * The client Secret for accessing Azure Key Vault
- */
public String getClientSecret() {
return clientSecret;
}
+ /**
+ * The client Secret for accessing Azure Key Vault
+ */
public void setClientSecret(String clientSecret) {
this.clientSecret = clientSecret;
}
- /**
- * The Tenant Id for accessing Azure Key Vault
- */
public String getTenantId() {
return tenantId;
}
+ /**
+ * The Tenant Id for accessing Azure Key Vault
+ */
public void setTenantId(String tenantId) {
this.tenantId = tenantId;
}
diff --git a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
index 9c71484b53f..5c24cc107de 100644
--- a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
+++ b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
@@ -233,10 +233,10 @@
{ "name": "camel.vault.aws.defaultCredentialsProvider", "description": "Define if we want to use the AWS Default Credentials Provider or not", "sourceType": "org.apache.camel.vault.AwsVaultConfiguration", "type": "boolean", "javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.vault.aws.region", "description": "The AWS region", "sourceType": "org.apache.camel.vault.AwsVaultConfiguration", "type": "string", "javaType": "java.lang.String" },
{ "name": "camel.vault.aws.secretKey", "description": "The AWS secret key", "sourceType": "org.apache.camel.vault.AwsVaultConfiguration", "type": "string", "javaType": "java.lang.String" },
- { "name": "camel.vault.azure.clientId", "description": null, "sourceType": "org.apache.camel.vault.AzureVaultConfiguration", "type": "string", "javaType": "java.lang.String" },
- { "name": "camel.vault.azure.clientSecret", "description": null, "sourceType": "org.apache.camel.vault.AzureVaultConfiguration", "type": "string", "javaType": "java.lang.String" },
- { "name": "camel.vault.azure.tenantId", "description": null, "sourceType": "org.apache.camel.vault.AzureVaultConfiguration", "type": "string", "javaType": "java.lang.String" },
- { "name": "camel.vault.azure.vaultName", "description": null, "sourceType": "org.apache.camel.vault.AzureVaultConfiguration", "type": "string", "javaType": "java.lang.String" },
+ { "name": "camel.vault.azure.clientId", "description": "The client Id for accessing Azure Key Vault", "sourceType": "org.apache.camel.vault.AzureVaultConfiguration", "type": "string", "javaType": "java.lang.String" },
+ { "name": "camel.vault.azure.clientSecret", "description": "The client Secret for accessing Azure Key Vault", "sourceType": "org.apache.camel.vault.AzureVaultConfiguration", "type": "string", "javaType": "java.lang.String" },
+ { "name": "camel.vault.azure.tenantId", "description": "The Tenant Id for accessing Azure Key Vault", "sourceType": "org.apache.camel.vault.AzureVaultConfiguration", "type": "string", "javaType": "java.lang.String" },
+ { "name": "camel.vault.azure.vaultName", "description": "The vault Name in Azure Key Vault", "sourceType": "org.apache.camel.vault.AzureVaultConfiguration", "type": "string", "javaType": "java.lang.String" },
{ "name": "camel.vault.gcp.projectId", "description": "The GCP Project ID", "sourceType": "org.apache.camel.vault.GcpVaultConfiguration", "type": "string", "javaType": "java.lang.String" },
{ "name": "camel.vault.gcp.serviceAccountKey", "description": "The Service Account Key location", "sourceType": "org.apache.camel.vault.GcpVaultConfiguration", "type": "string", "javaType": "java.lang.String" },
{ "name": "camel.vault.gcp.useDefaultInstance", "description": "Define if we want to use the GCP Client Default Instance or not", "sourceType": "org.apache.camel.vault.GcpVaultConfiguration", "type": "boolean", "javaType": "boolean", "defaultValue": "false" }
diff --git a/core/camel-main/src/main/docs/main.adoc b/core/camel-main/src/main/docs/main.adoc
index 5fca20b7136..f3fa102b63b 100644
--- a/core/camel-main/src/main/docs/main.adoc
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -221,6 +221,18 @@ The camel.vault.gcp supports 3 options, which are listed below.
| *camel.vault.gcp.useDefault{zwsp}Instance* | Define if we want to use the GCP Client Default Instance or not | false | boolean
|===
+=== Camel Azure Key Vault configurations
+The camel.vault.azure supports 4 options, which are listed below.
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *camel.vault.azure.clientId* | The client Id for accessing Azure Key Vault | | String
+| *camel.vault.azure.clientSecret* | The client Secret for accessing Azure Key Vault | | String
+| *camel.vault.azure.tenantId* | The Tenant Id for accessing Azure Key Vault | | String
+| *camel.vault.azure.vaultName* | The vault Name in Azure Key Vault | | String
+|===
+
=== Fault Tolerance EIP Circuit Breaker configurations
The camel.faulttolerance supports 13 options, which are listed below.