(camel) branch main updated: CAMEL-21927 - Camel Vault Properties Function: Harmonize error messages and cause (#17652)

[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


The following commit(s) were added to refs/heads/main by this push:
     new f5e831e2f94 CAMEL-21927 - Camel Vault Properties Function: Harmonize 
error messages and cause (#17652)
f5e831e2f94 is described below

commit f5e831e2f943407e31fb0f304b5ea4ce5e72a21f
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Apr 3 10:35:47 2025 +0200

    CAMEL-21927 - Camel Vault Properties Function: Harmonize error messages and 
cause (#17652)
    
    Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
 .../aws/secretsmanager/SecretsManagerPropertiesFunction.java         | 5 +++--
 .../camel/component/azure/key/vault/KeyVaultPropertiesFunction.java  | 3 ++-
 .../google/secret/manager/GoogleSecretManagerPropertiesFunction.java | 3 ++-
 .../ibm/secrets/manager/IBMSecretsManagerPropertiesFunction.java     | 3 ++-
 4 files changed, 9 insertions(+), 5 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 51d0713f158..e606a2a25cc 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
@@ -252,8 +252,9 @@ public class SecretsManagerPropertiesFunction extends 
ServiceSupport implements
         if (key != null) {
             try {
                 returnValue = getSecretFromSource(key, subkey, defaultValue, 
version);
-            } catch (JsonProcessingException e) {
-                throw new RuntimeCamelException("Something went wrong while 
recovering " + key + " from vault");
+            } catch (Exception e) {
+                throw new RuntimeCamelException(
+                        "Error getting secret from vault using key: " + key + 
" due to: " + e.getMessage(), e);
             }
         }
 
diff --git 
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultPropertiesFunction.java
 
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultPropertiesFunction.java
index 5fe0dc5f9d9..c6903b40ee2 100644
--- 
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultPropertiesFunction.java
+++ 
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultPropertiesFunction.java
@@ -202,7 +202,8 @@ public class KeyVaultPropertiesFunction extends 
ServiceSupport implements Proper
             try {
                 returnValue = getSecretFromSource(key, subkey, defaultValue, 
version);
             } catch (JsonProcessingException e) {
-                throw new RuntimeCamelException("Something went wrong while 
recovering " + key + " from vault");
+                throw new RuntimeCamelException(
+                        "Error getting secret from vault using key: " + key + 
" due to: " + e.getMessage(), e);
             }
         }
 
diff --git 
a/components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerPropertiesFunction.java
 
b/components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerPropertiesFunction.java
index 25a43e186c9..82dc1e3c290 100644
--- 
a/components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerPropertiesFunction.java
+++ 
b/components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerPropertiesFunction.java
@@ -183,7 +183,8 @@ public class GoogleSecretManagerPropertiesFunction extends 
ServiceSupport implem
             try {
                 returnValue = getSecretFromSource(key, subkey, defaultValue, 
version);
             } catch (JsonProcessingException e) {
-                throw new RuntimeCamelException("Something went wrong while 
recovering " + key + " from vault");
+                throw new RuntimeCamelException(
+                        "Error getting secret from vault using key: " + key + 
" due to: " + e.getMessage(), e);
             }
         }
 
diff --git 
a/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerPropertiesFunction.java
 
b/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerPropertiesFunction.java
index 3692bc09b7f..0c6dbce177c 100644
--- 
a/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerPropertiesFunction.java
+++ 
b/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerPropertiesFunction.java
@@ -181,7 +181,8 @@ public class IBMSecretsManagerPropertiesFunction extends 
ServiceSupport implemen
             try {
                 returnValue = getSecretFromSource(key, subkey, defaultValue, 
version);
             } catch (Exception e) {
-                throw new RuntimeCamelException("Something went wrong while 
recovering " + key + " from vault");
+                throw new RuntimeCamelException(
+                        "Error getting secret from vault using key: " + key + 
" due to: " + e.getMessage(), e);
             }
         }