[camel] 01/02: AWS2-SQS component does not recognize or use proxy-host and proxy-port when default credentials provider is in use

[acosentino]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 71364bca6b3acb18b2b9100641d2bd0bb004646f
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Tue Apr 20 09:20:14 2021 +0200

    AWS2-SQS component does not recognize or use proxy-host and proxy-port when 
default credentials provider is in use
---
 .../aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java     | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git 
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java
 
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java
index 2d2adcb..81e59b1 100644
--- 
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java
+++ 
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java
@@ -67,22 +67,8 @@ public class Sqs2ClientIAMOptimized implements 
Sqs2InternalClient {
                                            + configuration.getProxyPort());
             proxyConfig.endpoint(proxyEndpoint);
             httpClientBuilder = 
ApacheHttpClient.builder().proxyConfiguration(proxyConfig.build());
-            isClientConfigFound = true;
+            clientBuilder = clientBuilder.httpClientBuilder(httpClientBuilder);
         }
-        if (configuration.getAccessKey() != null && 
configuration.getSecretKey() != null) {
-            DefaultCredentialsProvider cred = 
DefaultCredentialsProvider.create();
-            if (isClientConfigFound) {
-                clientBuilder = 
clientBuilder.httpClientBuilder(httpClientBuilder)
-                        .credentialsProvider(cred);
-            } else {
-                clientBuilder = clientBuilder.credentialsProvider(cred);
-            }
-        } else {
-            if (!isClientConfigFound) {
-                clientBuilder = 
clientBuilder.httpClientBuilder(httpClientBuilder);
-            }
-        }
-
         if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
             clientBuilder = 
clientBuilder.region(Region.of(configuration.getRegion()));
         }