[camel] 01/03: CAMEL-17688 - Support ability to load properties from Vault/Secrets cloud services - Hashicorp Vault

[acosentino]

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 0af39dc1fdc526e67228aaa56f44f50c8f06ded4
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Jul 14 13:32:22 2022 +0200

    CAMEL-17688 - Support ability to load properties from Vault/Secrets cloud 
services - Hashicorp Vault
---
 .../main/java/org/apache/camel/vault/VaultConfiguration.java  |  4 ++--
 .../org/apache/camel/main/DefaultConfigurationConfigurer.java | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git 
a/core/camel-api/src/main/java/org/apache/camel/vault/VaultConfiguration.java 
b/core/camel-api/src/main/java/org/apache/camel/vault/VaultConfiguration.java
index 36ad27af4a7..b7edeb927fe 100644
--- 
a/core/camel-api/src/main/java/org/apache/camel/vault/VaultConfiguration.java
+++ 
b/core/camel-api/src/main/java/org/apache/camel/vault/VaultConfiguration.java
@@ -90,11 +90,11 @@ public class VaultConfiguration {
         this.azure = azure;
     }
 
-    public HashicorpVaultConfiguration getHashicorp() {
+    public HashicorpVaultConfiguration getHashicorpVaultConfiguration() {
         return hashicorp;
     }
 
-    public void setHashicorp(HashicorpVaultConfiguration hashicorp) {
+    public void setHashicorpVaultConfiguration(HashicorpVaultConfiguration 
hashicorp) {
         this.hashicorp = hashicorp;
     }
 }
diff --git 
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
 
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
index 4f9871ebe72..8828c21c437 100644
--- 
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
+++ 
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java
@@ -83,10 +83,7 @@ import org.apache.camel.support.SimpleUuidGenerator;
 import org.apache.camel.support.jsse.GlobalSSLContextParametersSupplier;
 import org.apache.camel.support.startup.LoggingStartupStepRecorder;
 import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.vault.AwsVaultConfiguration;
-import org.apache.camel.vault.AzureVaultConfiguration;
-import org.apache.camel.vault.GcpVaultConfiguration;
-import org.apache.camel.vault.VaultConfiguration;
+import org.apache.camel.vault.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -565,7 +562,11 @@ public final class DefaultConfigurationConfigurer {
             VaultConfiguration vault = camelContext.getVaultConfiguration();
             vault.setAzureVaultConfiguration(azure);
         }
-
+        HashicorpVaultConfiguration hashicorp = getSingleBeanOfType(registry, 
HashicorpVaultConfiguration.class);
+        if (hashicorp != null) {
+            VaultConfiguration vault = camelContext.getVaultConfiguration();
+            vault.setHashicorpVaultConfiguration(hashicorp);
+        }
         // set the default thread pool profile if defined
         initThreadPoolProfiles(registry, camelContext);
     }