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 09:31:24 UTC
[camel] branch master updated (3d805f79 -> 74b7b77)
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 3d805f79 camel-16400: removed duplicate entries for maven-failsafe-plugin (#5438)
new cd0debc AWS2-Kinesis component does not recognize or use proxy-host and proxy-port when default credentials provider is in use
new 74b7b77 AWS2-Kinesis 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:
.../impl/KinesisFirehoseClientIAMOptimizedImpl.java | 16 +---------------
.../client/impl/KinesisClientIAMOptimizedImpl.java | 16 +---------------
2 files changed, 2 insertions(+), 30 deletions(-)
[camel] 02/02: AWS2-Kinesis 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 74b7b77f3a91df0489bcd3ed55ea4fcfb1680469
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Apr 20 11:30:32 2021 +0200
AWS2-Kinesis component does not recognize or use proxy-host and proxy-port when default credentials provider is in use
---
.../aws2/firehose/client/impl/KinesisFirehoseClientIAMOptimizedImpl.java | 1 -
.../aws2/kinesis/client/impl/KinesisClientIAMOptimizedImpl.java | 1 -
2 files changed, 2 deletions(-)
diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMOptimizedImpl.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMOptimizedImpl.java
index 00af2cf..7b49d16 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMOptimizedImpl.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMOptimizedImpl.java
@@ -23,7 +23,6 @@ import org.apache.camel.component.aws2.firehose.client.KinesisFirehoseInternalCl
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;
diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMOptimizedImpl.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMOptimizedImpl.java
index 58f145d..5a91149 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMOptimizedImpl.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMOptimizedImpl.java
@@ -23,7 +23,6 @@ import org.apache.camel.component.aws2.kinesis.client.KinesisInternalClient;
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-Kinesis 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 cd0debccc5c93771d32b9966a9fdadc48137fc4c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Apr 20 11:28:20 2021 +0200
AWS2-Kinesis component does not recognize or use proxy-host and proxy-port when default credentials provider is in use
---
.../impl/KinesisFirehoseClientIAMOptimizedImpl.java | 15 +--------------
.../client/impl/KinesisClientIAMOptimizedImpl.java | 15 +--------------
2 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMOptimizedImpl.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMOptimizedImpl.java
index 6e5f7bc..00af2cf 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMOptimizedImpl.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/firehose/client/impl/KinesisFirehoseClientIAMOptimizedImpl.java
@@ -68,20 +68,7 @@ public class KinesisFirehoseClientIAMOptimizedImpl implements KinesisFirehoseInt
+ configuration.getProxyPort());
proxyConfig.endpoint(proxyEndpoint);
httpClientBuilder = ApacheHttpClient.builder().proxyConfiguration(proxyConfig.build());
- isClientConfigFound = true;
- }
- 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);
- }
+ clientBuilder = clientBuilder.httpClientBuilder(httpClientBuilder);
}
if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
clientBuilder = clientBuilder.region(Region.of(configuration.getRegion()));
diff --git a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMOptimizedImpl.java b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMOptimizedImpl.java
index 94f290a..58f145d 100644
--- a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMOptimizedImpl.java
+++ b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/client/impl/KinesisClientIAMOptimizedImpl.java
@@ -67,20 +67,7 @@ public class KinesisClientIAMOptimizedImpl implements KinesisInternalClient {
+ configuration.getProxyPort());
proxyConfig.endpoint(proxyEndpoint);
httpClientBuilder = ApacheHttpClient.builder().proxyConfiguration(proxyConfig.build());
- isClientConfigFound = true;
- }
- 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);
- }
+ clientBuilder = clientBuilder.httpClientBuilder(httpClientBuilder);
}
if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
clientBuilder = clientBuilder.region(Region.of(configuration.getRegion()));