You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/04/20 07:26:22 UTC
[camel] branch master updated (a33804c -> d18b28e)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from a33804c XML DSL should include deprecated on EIP model level also.
new 71364bc AWS2-SQS component does not recognize or use proxy-host and proxy-port when default credentials provider is in use
new d18b28e AWS2-SQS component does not recognize or use proxy-host and proxy-port when default credentials provider is in use
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
[camel] 02/02: AWS2-SQS component does not recognize or use
proxy-host and proxy-port when default credentials provider is in use
Posted by ac...@apache.org.
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 d18b28eeeb4894d96495cf7a24645467f2f997c2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Apr 20 09:25:20 2021 +0200
AWS2-SQS component does not recognize or use proxy-host and proxy-port when default credentials provider is in use
---
.../camel/component/aws2/sqs/client/impl/Sqs2ClientIAMOptimized.java | 1 -
1 file changed, 1 deletion(-)
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 81e59b1..205e80f 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
@@ -23,7 +23,6 @@ import org.apache.camel.component.aws2.sqs.client.Sqs2InternalClient;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
import software.amazon.awssdk.http.SdkHttpClient;
import software.amazon.awssdk.http.SdkHttpConfigurationOption;
import software.amazon.awssdk.http.apache.ApacheHttpClient;
[camel] 01/02: AWS2-SQS component does not recognize or use
proxy-host and proxy-port when default credentials provider is in use
Posted by ac...@apache.org.
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 <an...@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()));
}