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 289a68be69e860d712973130fde90d8e9823d994 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Mar 2 13:38:12 2022 +0100 CAMEL-17732 - Secrets Manager Properties Sources: if default value is provided, we should not fail with wrong credentials - GCP Secret Manager --- .../google/secret/manager/GoogleSecretManagerPropertiesFunction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 54f138a..e7010e8 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 @@ -22,13 +22,13 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.api.gax.core.FixedCredentialsProvider; -import com.google.api.gax.rpc.NotFoundException; import com.google.auth.Credentials; import com.google.auth.oauth2.ServiceAccountCredentials; import com.google.cloud.secretmanager.v1.AccessSecretVersionResponse; import com.google.cloud.secretmanager.v1.SecretManagerServiceClient; import com.google.cloud.secretmanager.v1.SecretManagerServiceSettings; import com.google.cloud.secretmanager.v1.SecretVersionName; +import io.grpc.StatusRuntimeException; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.RuntimeCamelException; @@ -170,7 +170,7 @@ public class GoogleSecretManagerPropertiesFunction extends ServiceSupport implem if (ObjectHelper.isEmpty(returnValue)) { returnValue = defaultValue; } - } catch (NotFoundException ex) { + } catch (StatusRuntimeException ex) { if (ObjectHelper.isNotEmpty(defaultValue)) { returnValue = defaultValue; } else {
