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 c4cc58d0240f561da3a367b3b3e20a349a2fefd2 Author: Andrea Cosentino <[email protected]> AuthorDate: Fri Jun 16 10:27:50 2023 +0200 CAMEL-19159 - Camel-AWS: Support Profile Credential provider as configuration - AWS Kinesis Signed-off-by: Andrea Cosentino <[email protected]> --- .../org/apache/camel/component/aws2/kinesis/Kinesis2Component.java | 3 ++- .../apache/camel/component/aws2/kinesis/Kinesis2Configuration.java | 4 ++-- .../kinesis/client/impl/KinesisClientIAMProfileOptimizedImpl.java | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java index 06c0ba298b7..dfc5fa852ba 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java +++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Component.java @@ -45,7 +45,8 @@ public class Kinesis2Component extends DefaultComponent { configuration.setStreamName(remaining); Kinesis2Endpoint endpoint = new Kinesis2Endpoint(uri, configuration, this); setProperties(endpoint, parameters); - if (!configuration.isUseDefaultCredentialsProvider() && !configuration.isUseProfileCredentialsProvider() && configuration.getAmazonKinesisClient() == null + if (!configuration.isUseDefaultCredentialsProvider() && !configuration.isUseProfileCredentialsProvider() + && configuration.getAmazonKinesisClient() == null && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) { throw new IllegalArgumentException( "useDefaultCredentialsProvider is set to false, useProfileCredentialsProvider is set to false, AmazonKinesisClient or accessKey and secretKey must be specified"); diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Configuration.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Configuration.java index 43d4c26024c..1252a229903 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Configuration.java +++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Configuration.java @@ -86,10 +86,9 @@ public class Kinesis2Configuration implements Cloneable { description = "Set whether the Kinesis client should expect to load credentials through a profile credentials provider.") private boolean useProfileCredentialsProvider; @UriParam(label = "common", - description = "If using a profile credentials provider this parameter will set the profile name.") + description = "If using a profile credentials provider this parameter will set the profile name.") private String profileCredentialsName; - public KinesisClient getAmazonKinesisClient() { return amazonKinesisClient; } @@ -249,6 +248,7 @@ public class Kinesis2Configuration implements Cloneable { public void setProfileCredentialsName(String profileCredentialsName) { this.profileCredentialsName = profileCredentialsName; } + // ************************************************* // // ************************************************* diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMProfileOptimizedImpl.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMProfileOptimizedImpl.java index 167720af8ef..08b0fac4654 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMProfileOptimizedImpl.java +++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMProfileOptimizedImpl.java @@ -16,6 +16,8 @@ */ package org.apache.camel.component.aws2.kinesis.client.impl; +import java.net.URI; + import org.apache.camel.component.aws2.kinesis.Kinesis2Configuration; import org.apache.camel.component.aws2.kinesis.client.KinesisInternalClient; import org.apache.camel.util.ObjectHelper; @@ -31,8 +33,6 @@ import software.amazon.awssdk.services.kinesis.KinesisClient; import software.amazon.awssdk.services.kinesis.KinesisClientBuilder; import software.amazon.awssdk.utils.AttributeMap; -import java.net.URI; - /** * Manage an AWS Kinesis 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)
