[camel] 02/02: CAMEL-17644 - Support ability to load properties from Vault/Secrets cloud services - aws secrets manager

[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 ba1a6441b7fcc43060c375b3b68b8385c56025fd
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Sat Feb 19 08:23:24 2022 +0100

    CAMEL-17644 - Support ability to load properties from Vault/Secrets cloud 
services - aws secrets manager
---
 .../secretsmanager/SecretsManagerPropertiesFunction.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git 
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerPropertiesFunction.java
 
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerPropertiesFunction.java
index 1197878..6c14068 100644
--- 
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerPropertiesFunction.java
+++ 
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerPropertiesFunction.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.aws.secretsmanager;
 
 import java.util.Base64;
+import java.util.Optional;
 import java.util.Properties;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -74,9 +75,18 @@ public class SecretsManagerPropertiesFunction extends 
ServiceSupport implements
         String region = System.getenv(CAMEL_AWS_VAULT_REGION_ENV);
         if (ObjectHelper.isEmpty(accessKey) && ObjectHelper.isEmpty(secretKey) 
&& ObjectHelper.isEmpty(region)) {
             PropertiesComponent pc = 
getCamelContext().getPropertiesComponent();
-            accessKey = 
String.valueOf(pc.resolveProperty(CAMEL_AWS_VAULT_ACCESS_KEY_PROP));
-            secretKey = 
String.valueOf(pc.resolveProperty(CAMEL_AWS_VAULT_SECRET_KEY_PROP));
-            region = 
String.valueOf(pc.resolveProperty(CAMEL_AWS_VAULT_REGION_PROP));
+            Optional<String> tmpAccessKey = 
pc.resolveProperty(CAMEL_AWS_VAULT_ACCESS_KEY_PROP);
+            if (tmpAccessKey.isPresent()) {
+                accessKey = tmpAccessKey.get();
+            }
+            Optional<String> tmpSecretKey = 
pc.resolveProperty(CAMEL_AWS_VAULT_SECRET_KEY_PROP);
+            if (tmpSecretKey.isPresent()) {
+                secretKey = tmpSecretKey.get();
+            }
+            Optional<String> tmpRegion = 
pc.resolveProperty(CAMEL_AWS_VAULT_REGION_PROP);
+            if (tmpRegion.isPresent()) {
+                region = tmpRegion.get();
+            }
         }
         SecretsManagerClientBuilder clientBuilder = 
SecretsManagerClient.builder();
         AwsBasicCredentials cred = AwsBasicCredentials.create(accessKey, 
secretKey);