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 41d370e63acc0fcf843d0416551beac80c36ba86 Author: Andrea Cosentino <[email protected]> AuthorDate: Fri Jun 16 10:51:18 2023 +0200 CAMEL-19159 - Camel-AWS: Support Profile Credential provider as configuration - AWS Kinesis Firehose Signed-off-by: Andrea Cosentino <[email protected]> --- .../camel/component/aws2/firehose/KinesisFirehose2Configuration.java | 4 ++-- .../component/aws2/firehose/client/KinesisFirehoseClientFactory.java | 3 --- .../client/impl/KinesisFirehoseClientIAMProfileOptimizedImpl.java | 4 ++-- .../org/apache/camel/component/aws2/kinesis/Kinesis2Component.java | 3 ++- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java index 716f4971033..5da329f05a9 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java +++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2Configuration.java @@ -67,10 +67,10 @@ public class KinesisFirehose2Configuration implements Cloneable { "static credentials to be passed in.") private boolean useDefaultCredentialsProvider; @UriParam(label = "common", defaultValue = "false", - description = "Set whether the Kinesis Firehose client should expect to load credentials through a profile credentials provider.") + description = "Set whether the Kinesis Firehose 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 void setAmazonKinesisFirehoseClient(FirehoseClient client) { diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/KinesisFirehoseClientFactory.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/KinesisFirehoseClientFactory.java index 14ae5d06759..8d0c8ea6de5 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/KinesisFirehoseClientFactory.java +++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/KinesisFirehoseClientFactory.java @@ -20,9 +20,6 @@ import org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration; import org.apache.camel.component.aws2.firehose.client.impl.KinesisFirehoseClientIAMOptimizedImpl; import org.apache.camel.component.aws2.firehose.client.impl.KinesisFirehoseClientIAMProfileOptimizedImpl; import org.apache.camel.component.aws2.firehose.client.impl.KinesisFirehoseClientStandardImpl; -import org.apache.camel.component.aws2.kinesis.client.impl.KinesisClientIAMOptimizedImpl; -import org.apache.camel.component.aws2.kinesis.client.impl.KinesisClientIAMProfileOptimizedImpl; -import org.apache.camel.component.aws2.kinesis.client.impl.KinesisClientStandardImpl; /** * Factory class to return the correct type of AWS Kinesis client. diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMProfileOptimizedImpl.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMProfileOptimizedImpl.java index bd6b43774c2..b0fbdc52e70 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMProfileOptimizedImpl.java +++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMProfileOptimizedImpl.java @@ -16,6 +16,8 @@ */ package org.apache.camel.component.aws2.firehose.client.impl; +import java.net.URI; + import org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration; import org.apache.camel.component.aws2.firehose.client.KinesisFirehoseInternalClient; import org.apache.camel.util.ObjectHelper; @@ -31,8 +33,6 @@ import software.amazon.awssdk.services.firehose.FirehoseClient; import software.amazon.awssdk.services.firehose.FirehoseClientBuilder; import software.amazon.awssdk.utils.AttributeMap; -import java.net.URI; - /** * Manage an AWS Kinesis Firehose 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) 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 8901c8192b0..bafcbad30cc 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.isUseProfileCredentialsProvider() + if (!configuration.isUseDefaultCredentialsProvider() && !configuration.isUseProfileCredentialsProvider() + && !configuration.isUseProfileCredentialsProvider() && configuration.getAmazonKinesisClient() == null && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) { throw new IllegalArgumentException(
