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 49c30daee0cee5f3d24987b269e57957380299ef Author: Andrea Cosentino <[email protected]> AuthorDate: Tue Mar 21 11:13:49 2023 +0100 CAMEL-19159 - Camel-AWS: Support Profile Credential provider as configuration - AWS SQS Signed-off-by: Andrea Cosentino <[email protected]> --- .../java/org/apache/camel/component/aws2/sqs/Sqs2Component.java | 6 ++++-- .../aws2/sqs/client/impl/Sqs2ClientIAMProfileOptimizedImpl.java | 6 ++---- .../aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsTest.java | 6 +++--- .../org/apache/camel/component/aws2/sqs/SqsClientFactoryTest.java | 1 - 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java index 224e327e74b..2e0336f9e73 100644 --- a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java +++ b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java @@ -64,9 +64,11 @@ public class Sqs2Component extends DefaultComponent { //validation of client has to be done after endpoint initialization (in case that sqs client is autowired) // - covered by SqsDeadletterWithClientRegistryLocalstackIT - if (!configuration.isUseDefaultCredentialsProvider() && !configuration.isUseProfileCredentialsProvider() && configuration.getAmazonSQSClient() == null + if (!configuration.isUseDefaultCredentialsProvider() && !configuration.isUseProfileCredentialsProvider() + && configuration.getAmazonSQSClient() == null && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) { - throw new IllegalArgumentException("useDefaultCredentialsProvider is set to false, useProfileCredentialsProvider is set to false, AmazonSQSClient or accessKey and secretKey must be specified"); + throw new IllegalArgumentException( + "useDefaultCredentialsProvider is set to false, useProfileCredentialsProvider is set to false, AmazonSQSClient or accessKey and secretKey must be specified"); } // Verify that visibilityTimeout is set if extendMessageVisibility is // set to true. diff --git a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMProfileOptimizedImpl.java b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMProfileOptimizedImpl.java index 1ccbc587487..4556e77a791 100644 --- a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMProfileOptimizedImpl.java +++ b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMProfileOptimizedImpl.java @@ -16,15 +16,15 @@ */ package org.apache.camel.component.aws2.sqs.client.impl; +import java.net.URI; + import org.apache.camel.component.aws2.sqs.Sqs2Configuration; import org.apache.camel.component.aws2.sqs.client.Sqs2InternalClient; import org.apache.camel.util.FileUtil; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider; -import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; import software.amazon.awssdk.http.SdkHttpClient; import software.amazon.awssdk.http.SdkHttpConfigurationOption; import software.amazon.awssdk.http.apache.ApacheHttpClient; @@ -34,8 +34,6 @@ import software.amazon.awssdk.services.sqs.SqsClient; import software.amazon.awssdk.services.sqs.SqsClientBuilder; import software.amazon.awssdk.utils.AttributeMap; -import java.net.URI; - /** * Manage an AWS SQS client for all users to use. This implementation is for local instances to use a static and solid * credential set. diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsTest.java index 2dea2b580ea..156f869049d 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheckIAMProfileCredsTest.java @@ -16,6 +16,9 @@ */ package org.apache.camel.component.aws2.sqs; +import java.util.Collection; +import java.util.concurrent.TimeUnit; + import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.health.HealthCheck; @@ -32,9 +35,6 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Collection; -import java.util.concurrent.TimeUnit; - import static org.testcontainers.shaded.org.awaitility.Awaitility.await; public class Sqs2ConsumerHealthCheckIAMProfileCredsTest extends CamelTestSupport { diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsClientFactoryTest.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsClientFactoryTest.java index e9db9f6b3ea..0648749214c 100644 --- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsClientFactoryTest.java +++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsClientFactoryTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.aws2.sqs; - import org.apache.camel.component.aws2.sqs.client.Sqs2ClientFactory; import org.apache.camel.component.aws2.sqs.client.Sqs2InternalClient; import org.apache.camel.component.aws2.sqs.client.impl.Sqs2ClientIAMOptimized;
