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 0b5ef59ea85009d32831773c379fca7ae151b3d5 Author: Andrea Cosentino <[email protected]> AuthorDate: Thu May 27 09:20:59 2021 +0200 CAMEL-16465 - Camel-AWS: Add useDefaultCredentialProvider option to all the components - STS Component --- .../camel/component/aws2/sts/STS2Component.java | 4 +- .../camel/component/aws2/sts/STS2Endpoint.java | 44 ++-------------------- 2 files changed, 6 insertions(+), 42 deletions(-) diff --git a/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Component.java b/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Component.java index 6392f2e..b9f1f42 100644 --- a/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Component.java +++ b/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Component.java @@ -52,9 +52,9 @@ public class STS2Component extends DefaultComponent { STS2Configuration configuration = this.configuration != null ? this.configuration.copy() : new STS2Configuration(); STS2Endpoint endpoint = new STS2Endpoint(uri, this, configuration); setProperties(endpoint, parameters); - if (configuration.getStsClient() == null + if (!configuration.isUseDefaultCredentialsProvider() && configuration.getStsClient() == null && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) { - throw new IllegalArgumentException("Amazon STS client or accessKey and secretKey must be specified"); + throw new IllegalArgumentException("useDefaultCredentialsProvider is set to false, Amazon STS client or accessKey and secretKey must be specified"); } return endpoint; diff --git a/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Endpoint.java b/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Endpoint.java index 636f67d..fdab986 100644 --- a/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Endpoint.java +++ b/components/camel-aws/camel-aws2-sts/src/main/java/org/apache/camel/component/aws2/sts/STS2Endpoint.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.sts.client.STS2ClientFactory; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.support.DefaultEndpoint; @@ -71,7 +72,9 @@ public class STS2Endpoint extends DefaultEndpoint { public void doStart() throws Exception { super.doStart(); - stsClient = configuration.getStsClient() != null ? configuration.getStsClient() : createStsClient(); + stsClient = configuration.getStsClient() != null + ? configuration.getStsClient() + : STS2ClientFactory.getStsClient(configuration).getStsClient(); } @Override @@ -91,43 +94,4 @@ public class STS2Endpoint extends DefaultEndpoint { public StsClient getStsClient() { return stsClient; } - - StsClient createStsClient() { - StsClient client = null; - StsClientBuilder clientBuilder = StsClient.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.isTrustAllCertificates()) { - SdkHttpClient ahc = ApacheHttpClient.builder().buildWithDefaults( - AttributeMap.builder().put(SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES, Boolean.TRUE).build()); - clientBuilder.httpClient(ahc); - } - client = clientBuilder.build(); - return client; - } }
