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 267fd3c2d6d5305e92687a3c1f86beab01700ef5 Author: Andrea Cosentino <[email protected]> AuthorDate: Fri May 14 07:20:04 2021 +0200 CAMEL-16465 - Camel-AWS: Add useDefaultCredentialProvider option to all the components - KMS Component --- .../camel/component/aws2/kms/KMS2Component.java | 4 +- .../camel/component/aws2/kms/KMS2Endpoint.java | 51 ++-------------------- 2 files changed, 6 insertions(+), 49 deletions(-) diff --git a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Component.java b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Component.java index 8aa7558..6a1fed4 100644 --- a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Component.java +++ b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Component.java @@ -53,9 +53,9 @@ public class KMS2Component extends DefaultComponent { KMS2Endpoint endpoint = new KMS2Endpoint(uri, this, configuration); setProperties(endpoint, parameters); - if (configuration.getKmsClient() == null + if (!configuration.isUseDefaultCredentialsProvider() && configuration.getKmsClient() == null && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) { - throw new IllegalArgumentException("Amazon kms client or accessKey and secretKey must be specified"); + throw new IllegalArgumentException("useDefaultCredentialsProvider is set to false, Amazon kms client or accessKey and secretKey must be specified"); } return endpoint; diff --git a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java index efbaadb..72a266b 100644 --- a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java +++ b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Endpoint.java @@ -23,6 +23,7 @@ import org.apache.camel.Component; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; +import org.apache.camel.component.aws2.kms.client.KMS2ClientFactory; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.support.ScheduledPollEndpoint; @@ -69,7 +70,9 @@ public class KMS2Endpoint extends ScheduledPollEndpoint { public void doStart() throws Exception { super.doStart(); - kmsClient = configuration.getKmsClient() != null ? configuration.getKmsClient() : createKMSClient(); + kmsClient = configuration.getKmsClient() != null + ? configuration.getKmsClient() + : KMS2ClientFactory.getKmsClient(configuration).getKmsClient(); } @Override @@ -89,50 +92,4 @@ public class KMS2Endpoint extends ScheduledPollEndpoint { public KmsClient getKmsClient() { return kmsClient; } - - KmsClient createKMSClient() { - KmsClient client = null; - KmsClientBuilder clientBuilder = KmsClient.builder(); - ProxyConfiguration.Builder proxyConfig = null; - ApacheHttpClient.Builder httpClientBuilder = null; - boolean isClientConfigFound = false; - if (ObjectHelper.isNotEmpty(configuration.getProxyHost()) && ObjectHelper.isNotEmpty(configuration.getProxyPort())) { - proxyConfig = ProxyConfiguration.builder(); - URI proxyEndpoint = URI.create(configuration.getProxyProtocol() + "://" + configuration.getProxyHost() + ":" - + configuration.getProxyPort()); - proxyConfig.endpoint(proxyEndpoint); - httpClientBuilder = ApacheHttpClient.builder().proxyConfiguration(proxyConfig.build()); - isClientConfigFound = true; - } - if (configuration.getAccessKey() != null && configuration.getSecretKey() != null) { - AwsBasicCredentials cred = AwsBasicCredentials.create(configuration.getAccessKey(), configuration.getSecretKey()); - if (isClientConfigFound) { - clientBuilder = clientBuilder.httpClientBuilder(httpClientBuilder) - .credentialsProvider(StaticCredentialsProvider.create(cred)); - } else { - clientBuilder = clientBuilder.credentialsProvider(StaticCredentialsProvider.create(cred)); - } - } else { - if (!isClientConfigFound) { - clientBuilder = clientBuilder.httpClientBuilder(httpClientBuilder); - } - } - if (ObjectHelper.isNotEmpty(configuration.getRegion())) { - clientBuilder = clientBuilder.region(Region.of(configuration.getRegion())); - } - if (configuration.isOverrideEndpoint()) { - clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride())); - } - if (configuration.isTrustAllCertificates()) { - SdkHttpClient ahc = ApacheHttpClient.builder().buildWithDefaults(AttributeMap - .builder() - .put( - SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES, - Boolean.TRUE) - .build()); - clientBuilder.httpClient(ahc); - } - client = clientBuilder.build(); - return client; - } }
