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 8286eae4252244f639bf989242486641534dce72 Author: Andrea Cosentino <[email protected]> AuthorDate: Mon Jun 19 11:38:46 2023 +0200 CAMEL-19159 - Camel-AWS: Support Profile Credential provider as configuration - AWS MSK Signed-off-by: Andrea Cosentino <[email protected]> --- .../main/java/org/apache/camel/component/aws2/msk/MSK2Component.java | 3 ++- .../aws2/msk/client/impl/MSK2ClientProfileOptimizedImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Component.java b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Component.java index 944b0476d41..ffbfd05a268 100644 --- a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Component.java +++ b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/MSK2Component.java @@ -45,7 +45,8 @@ public class MSK2Component extends DefaultComponent { MSK2Configuration configuration = this.configuration != null ? this.configuration.copy() : new MSK2Configuration(); MSK2Endpoint endpoint = new MSK2Endpoint(uri, this, configuration); setProperties(endpoint, parameters); - if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider()) && Boolean.FALSE.equals(configuration.isUseProfileCredentialsProvider()) && configuration.getMskClient() == null + if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider()) + && Boolean.FALSE.equals(configuration.isUseProfileCredentialsProvider()) && configuration.getMskClient() == null && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) { throw new IllegalArgumentException( "useDefaultCredentialsProvider is set to false, useProfileCredentialsProvider is set to false, Amazon msk client or accessKey and secretKey must be specified"); diff --git a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/client/impl/MSK2ClientProfileOptimizedImpl.java b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/client/impl/MSK2ClientProfileOptimizedImpl.java index 5533528b522..1120aecadec 100644 --- a/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/client/impl/MSK2ClientProfileOptimizedImpl.java +++ b/components/camel-aws/camel-aws2-msk/src/main/java/org/apache/camel/component/aws2/msk/client/impl/MSK2ClientProfileOptimizedImpl.java @@ -16,6 +16,8 @@ */ package org.apache.camel.component.aws2.msk.client.impl; +import java.net.URI; + import org.apache.camel.component.aws2.msk.MSK2Configuration; import org.apache.camel.component.aws2.msk.client.MSK2InternalClient; import org.apache.camel.util.ObjectHelper; @@ -31,8 +33,6 @@ import software.amazon.awssdk.services.kafka.KafkaClient; import software.amazon.awssdk.services.kafka.KafkaClientBuilder; import software.amazon.awssdk.utils.AttributeMap; -import java.net.URI; - /** * Manage an AWS MSK client for all users to use (enabling temporary creds). This implementation is for remote instances * to manage the credentials on their own (eliminating credential rotations)
