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 64d854433bb38b4c869eadb758bdd53c32ef140a Author: Andrea Cosentino <[email protected]> AuthorDate: Tue Dec 16 13:56:46 2025 +0100 CAMEL-22786 - Camel-AWS: Extract common logic for clients instantiation in a separated module - AWS KMS Signed-off-by: Andrea Cosentino <[email protected]> --- components/camel-aws/camel-aws2-kms/pom.xml | 4 + .../component/aws2/kms/KMS2Configuration.java | 9 +- .../camel/component/aws2/kms/KMS2Endpoint.java | 2 +- .../aws2/kms/client/KMS2ClientFactory.java | 28 ++---- .../aws2/kms/client/KMS2InternalClient.java | 32 ------ .../kms/client/impl/KMS2ClientOptimizedImpl.java | 93 ----------------- .../impl/KMS2ClientProfileOptimizedImpl.java | 98 ------------------ .../client/impl/KMS2ClientSessionTokenImpl.java | 111 --------------------- .../kms/client/impl/KMS2ClientStandardImpl.java | 109 -------------------- .../component/aws2/kms/KMSClientFactoryTest.java | 53 +++++----- 10 files changed, 47 insertions(+), 492 deletions(-) diff --git a/components/camel-aws/camel-aws2-kms/pom.xml b/components/camel-aws/camel-aws2-kms/pom.xml index 8fb74096fa4b..0e1335b48ed6 100644 --- a/components/camel-aws/camel-aws2-kms/pom.xml +++ b/components/camel-aws/camel-aws2-kms/pom.xml @@ -42,6 +42,10 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-support</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-aws-common</artifactId> + </dependency> <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>kms</artifactId> diff --git a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Configuration.java b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Configuration.java index 4d9b494e6d2c..a0535f46c0fa 100644 --- a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Configuration.java +++ b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/KMS2Configuration.java @@ -17,6 +17,7 @@ package org.apache.camel.component.aws2.kms; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.component.aws.common.AwsCommonConfiguration; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriParams; @@ -25,7 +26,7 @@ import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.services.kms.KmsClient; @UriParams -public class KMS2Configuration implements Cloneable { +public class KMS2Configuration implements Cloneable, AwsCommonConfiguration { @UriPath(description = "Logical name") @Metadata(required = true) @@ -216,14 +217,16 @@ public class KMS2Configuration implements Cloneable { * Set whether the KMS client should expect to load credentials through a default credentials provider or to expect * static credentials to be passed in. */ - public void setUseDefaultCredentialsProvider(Boolean useDefaultCredentialsProvider) { + public void setUseDefaultCredentialsProvider(boolean useDefaultCredentialsProvider) { this.useDefaultCredentialsProvider = useDefaultCredentialsProvider; } - public Boolean isUseDefaultCredentialsProvider() { + @Override + public boolean isUseDefaultCredentialsProvider() { return useDefaultCredentialsProvider; } + @Override public boolean isUseProfileCredentialsProvider() { return useProfileCredentialsProvider; } 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 db44a94c1c32..8a111b4e40e2 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 @@ -63,7 +63,7 @@ public class KMS2Endpoint extends ScheduledPollEndpoint implements EndpointServi kmsClient = configuration.getKmsClient() != null ? configuration.getKmsClient() - : KMS2ClientFactory.getKmsClient(configuration).getKmsClient(); + : KMS2ClientFactory.getKmsClient(configuration); } @Override diff --git a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/KMS2ClientFactory.java b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/KMS2ClientFactory.java index 3ea8a699ab57..dffceba3a4b2 100644 --- a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/KMS2ClientFactory.java +++ b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/KMS2ClientFactory.java @@ -16,14 +16,12 @@ */ package org.apache.camel.component.aws2.kms.client; +import org.apache.camel.component.aws.common.AwsClientBuilderUtil; import org.apache.camel.component.aws2.kms.KMS2Configuration; -import org.apache.camel.component.aws2.kms.client.impl.KMS2ClientOptimizedImpl; -import org.apache.camel.component.aws2.kms.client.impl.KMS2ClientProfileOptimizedImpl; -import org.apache.camel.component.aws2.kms.client.impl.KMS2ClientSessionTokenImpl; -import org.apache.camel.component.aws2.kms.client.impl.KMS2ClientStandardImpl; +import software.amazon.awssdk.services.kms.KmsClient; /** - * Factory class to return the correct type of AWS KMS client. + * Factory class to create AWS KMS clients using common configuration. */ public final class KMS2ClientFactory { @@ -31,20 +29,14 @@ public final class KMS2ClientFactory { } /** - * Return the correct AWS KMS client (based on remote vs local). + * Create a KMS client based on configuration. * - * @param configuration configuration - * @return KMSClient + * @param configuration The KMS configuration + * @return Configured KmsClient */ - public static KMS2InternalClient getKmsClient(KMS2Configuration configuration) { - if (Boolean.TRUE.equals(configuration.isUseDefaultCredentialsProvider())) { - return new KMS2ClientOptimizedImpl(configuration); - } else if (Boolean.TRUE.equals(configuration.isUseProfileCredentialsProvider())) { - return new KMS2ClientProfileOptimizedImpl(configuration); - } else if (Boolean.TRUE.equals(configuration.isUseSessionCredentials())) { - return new KMS2ClientSessionTokenImpl(configuration); - } else { - return new KMS2ClientStandardImpl(configuration); - } + public static KmsClient getKmsClient(KMS2Configuration configuration) { + return AwsClientBuilderUtil.buildClient( + configuration, + KmsClient::builder); } } diff --git a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/KMS2InternalClient.java b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/KMS2InternalClient.java deleted file mode 100644 index 51b832abfa74..000000000000 --- a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/KMS2InternalClient.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.aws2.kms.client; - -import software.amazon.awssdk.services.kms.KmsClient; - -/** - * Manage the required actions of an KMS client for either local or remote. - */ -public interface KMS2InternalClient { - - /** - * Returns an KMS client after a factory method determines which one to return. - * - * @return KmsClient KmsClient - */ - KmsClient getKmsClient(); -} diff --git a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientOptimizedImpl.java b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientOptimizedImpl.java deleted file mode 100644 index c5248688f193..000000000000 --- a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientOptimizedImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.aws2.kms.client.impl; - -import java.net.URI; - -import org.apache.camel.component.aws2.kms.KMS2Configuration; -import org.apache.camel.component.aws2.kms.client.KMS2InternalClient; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import software.amazon.awssdk.http.SdkHttpClient; -import software.amazon.awssdk.http.SdkHttpConfigurationOption; -import software.amazon.awssdk.http.apache.ApacheHttpClient; -import software.amazon.awssdk.http.apache.ProxyConfiguration; -import software.amazon.awssdk.regions.Region; -import software.amazon.awssdk.services.kms.KmsClient; -import software.amazon.awssdk.services.kms.KmsClientBuilder; -import software.amazon.awssdk.utils.AttributeMap; - -/** - * Manage an AWS KMS client for all users to use (enabling temporary creds). This implementation is for remote instances - * to manage the credentials on their own (eliminating credential rotations) - */ -public class KMS2ClientOptimizedImpl implements KMS2InternalClient { - private static final Logger LOG = LoggerFactory.getLogger(KMS2ClientOptimizedImpl.class); - private KMS2Configuration configuration; - - /** - * Constructor that uses the config file. - */ - public KMS2ClientOptimizedImpl(KMS2Configuration configuration) { - LOG.trace("Creating an AWS KMS client for an ec2 instance with IAM temporary credentials (normal for ec2s)."); - this.configuration = configuration; - } - - /** - * Getting the KMS aws client that is used. - * - * @return KMS Client. - */ - @Override - public KmsClient getKmsClient() { - KmsClient client = null; - KmsClientBuilder clientBuilder = KmsClient.builder(); - ProxyConfiguration.Builder proxyConfig = null; - ApacheHttpClient.Builder httpClientBuilder = null; - 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()); - 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()) { - if (httpClientBuilder == null) { - httpClientBuilder = ApacheHttpClient.builder(); - } - SdkHttpClient ahc = httpClientBuilder.buildWithDefaults(AttributeMap - .builder() - .put( - SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES, - Boolean.TRUE) - .build()); - // set created http client to use instead of builder - clientBuilder.httpClient(ahc); - clientBuilder.httpClientBuilder(null); - } - client = clientBuilder.build(); - return client; - } -} diff --git a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientProfileOptimizedImpl.java b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientProfileOptimizedImpl.java deleted file mode 100644 index 7f434cb762bb..000000000000 --- a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientProfileOptimizedImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.aws2.kms.client.impl; - -import java.net.URI; - -import org.apache.camel.component.aws2.kms.KMS2Configuration; -import org.apache.camel.component.aws2.kms.client.KMS2InternalClient; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider; -import software.amazon.awssdk.http.SdkHttpClient; -import software.amazon.awssdk.http.SdkHttpConfigurationOption; -import software.amazon.awssdk.http.apache.ApacheHttpClient; -import software.amazon.awssdk.http.apache.ProxyConfiguration; -import software.amazon.awssdk.regions.Region; -import software.amazon.awssdk.services.kms.KmsClient; -import software.amazon.awssdk.services.kms.KmsClientBuilder; -import software.amazon.awssdk.utils.AttributeMap; - -/** - * Manage an AWS KMS client for all users to use (enabling temporary creds). This implementation is for remote instances - * to manage the credentials on their own (eliminating credential rotations) - */ -public class KMS2ClientProfileOptimizedImpl implements KMS2InternalClient { - private static final Logger LOG = LoggerFactory.getLogger(KMS2ClientProfileOptimizedImpl.class); - private KMS2Configuration configuration; - - /** - * Constructor that uses the config file. - */ - public KMS2ClientProfileOptimizedImpl(KMS2Configuration configuration) { - LOG.trace("Creating an AWS KMS client for an ec2 instance with IAM temporary credentials (normal for ec2s)."); - this.configuration = configuration; - } - - /** - * Getting the KMS aws client that is used. - * - * @return KMS Client. - */ - @Override - public KmsClient getKmsClient() { - KmsClient client = null; - KmsClientBuilder clientBuilder = KmsClient.builder(); - ProxyConfiguration.Builder proxyConfig = null; - ApacheHttpClient.Builder httpClientBuilder = null; - 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()); - clientBuilder = clientBuilder.httpClientBuilder(httpClientBuilder); - } - if (configuration.getProfileCredentialsName() != null) { - clientBuilder = clientBuilder.httpClientBuilder(httpClientBuilder) - .credentialsProvider(ProfileCredentialsProvider.create(configuration.getProfileCredentialsName())); - } - if (ObjectHelper.isNotEmpty(configuration.getRegion())) { - clientBuilder = clientBuilder.region(Region.of(configuration.getRegion())); - } - if (configuration.isOverrideEndpoint()) { - clientBuilder.endpointOverride(URI.create(configuration.getUriEndpointOverride())); - } - if (configuration.isTrustAllCertificates()) { - if (httpClientBuilder == null) { - httpClientBuilder = ApacheHttpClient.builder(); - } - SdkHttpClient ahc = httpClientBuilder.buildWithDefaults(AttributeMap - .builder() - .put( - SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES, - Boolean.TRUE) - .build()); - // set created http client to use instead of builder - clientBuilder.httpClient(ahc); - clientBuilder.httpClientBuilder(null); - } - client = clientBuilder.build(); - return client; - } -} diff --git a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientSessionTokenImpl.java b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientSessionTokenImpl.java deleted file mode 100644 index 9c17d4cef3fc..000000000000 --- a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientSessionTokenImpl.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.aws2.kms.client.impl; - -import java.net.URI; - -import org.apache.camel.component.aws2.kms.KMS2Configuration; -import org.apache.camel.component.aws2.kms.client.KMS2InternalClient; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import software.amazon.awssdk.auth.credentials.AwsSessionCredentials; -import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; -import software.amazon.awssdk.http.SdkHttpClient; -import software.amazon.awssdk.http.SdkHttpConfigurationOption; -import software.amazon.awssdk.http.apache.ApacheHttpClient; -import software.amazon.awssdk.http.apache.ProxyConfiguration; -import software.amazon.awssdk.regions.Region; -import software.amazon.awssdk.services.kms.KmsClient; -import software.amazon.awssdk.services.kms.KmsClientBuilder; -import software.amazon.awssdk.utils.AttributeMap; - -/** - * Manage an AWS KMS client for all users to use. This implementation is for local instances to use a static and solid - * credential set. - */ -public class KMS2ClientSessionTokenImpl implements KMS2InternalClient { - private static final Logger LOG = LoggerFactory.getLogger(KMS2ClientSessionTokenImpl.class); - private KMS2Configuration configuration; - - /** - * Constructor that uses the config file. - */ - public KMS2ClientSessionTokenImpl(KMS2Configuration configuration) { - LOG.trace("Creating an AWS KMS manager using static credentials."); - this.configuration = configuration; - } - - /** - * Getting the KMS AWS client that is used. - * - * @return Amazon KMS Client. - */ - @Override - public KmsClient getKmsClient() { - 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 - && configuration.getSessionToken() != null) { - AwsSessionCredentials cred = AwsSessionCredentials.create(configuration.getAccessKey(), - configuration.getSecretKey(), configuration.getSessionToken()); - 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()) { - if (httpClientBuilder == null) { - httpClientBuilder = ApacheHttpClient.builder(); - } - SdkHttpClient ahc = httpClientBuilder.buildWithDefaults(AttributeMap - .builder() - .put( - SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES, - Boolean.TRUE) - .build()); - // set created http client to use instead of builder - clientBuilder.httpClient(ahc); - clientBuilder.httpClientBuilder(null); - } - client = clientBuilder.build(); - return client; - } -} diff --git a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientStandardImpl.java b/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientStandardImpl.java deleted file mode 100644 index 69959d3601a7..000000000000 --- a/components/camel-aws/camel-aws2-kms/src/main/java/org/apache/camel/component/aws2/kms/client/impl/KMS2ClientStandardImpl.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.aws2.kms.client.impl; - -import java.net.URI; - -import org.apache.camel.component.aws2.kms.KMS2Configuration; -import org.apache.camel.component.aws2.kms.client.KMS2InternalClient; -import org.apache.camel.util.ObjectHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; -import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; -import software.amazon.awssdk.http.SdkHttpClient; -import software.amazon.awssdk.http.SdkHttpConfigurationOption; -import software.amazon.awssdk.http.apache.ApacheHttpClient; -import software.amazon.awssdk.http.apache.ProxyConfiguration; -import software.amazon.awssdk.regions.Region; -import software.amazon.awssdk.services.kms.KmsClient; -import software.amazon.awssdk.services.kms.KmsClientBuilder; -import software.amazon.awssdk.utils.AttributeMap; - -/** - * Manage an AWS KMS client for all users to use. This implementation is for local instances to use a static and solid - * credential set. - */ -public class KMS2ClientStandardImpl implements KMS2InternalClient { - private static final Logger LOG = LoggerFactory.getLogger(KMS2ClientStandardImpl.class); - private KMS2Configuration configuration; - - /** - * Constructor that uses the config file. - */ - public KMS2ClientStandardImpl(KMS2Configuration configuration) { - LOG.trace("Creating an AWS KMS manager using static credentials."); - this.configuration = configuration; - } - - /** - * Getting the KMS AWS client that is used. - * - * @return Amazon KMS Client. - */ - @Override - public KmsClient getKmsClient() { - 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()) { - if (httpClientBuilder == null) { - httpClientBuilder = ApacheHttpClient.builder(); - } - SdkHttpClient ahc = httpClientBuilder.buildWithDefaults(AttributeMap - .builder() - .put( - SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES, - Boolean.TRUE) - .build()); - // set created http client to use instead of builder - clientBuilder.httpClient(ahc); - clientBuilder.httpClientBuilder(null); - } - client = clientBuilder.build(); - return client; - } -} diff --git a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSClientFactoryTest.java b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSClientFactoryTest.java index 597af7a45095..04a882f49324 100644 --- a/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSClientFactoryTest.java +++ b/components/camel-aws/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/KMSClientFactoryTest.java @@ -17,44 +17,43 @@ package org.apache.camel.component.aws2.kms; import org.apache.camel.component.aws2.kms.client.KMS2ClientFactory; -import org.apache.camel.component.aws2.kms.client.KMS2InternalClient; -import org.apache.camel.component.aws2.kms.client.impl.KMS2ClientOptimizedImpl; -import org.apache.camel.component.aws2.kms.client.impl.KMS2ClientSessionTokenImpl; -import org.apache.camel.component.aws2.kms.client.impl.KMS2ClientStandardImpl; import org.junit.jupiter.api.Test; +import software.amazon.awssdk.services.kms.KmsClient; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class KMSClientFactoryTest { @Test - public void getStandardKMSClientDefault() { - KMS2Configuration kms2Configuration = new KMS2Configuration(); - KMS2InternalClient kmsClient = KMS2ClientFactory.getKmsClient(kms2Configuration); - assertTrue(kmsClient instanceof KMS2ClientStandardImpl); + public void getKmsClientWithDefaultCredentials() { + KMS2Configuration configuration = new KMS2Configuration(); + configuration.setUseDefaultCredentialsProvider(true); + configuration.setRegion("eu-west-1"); + KmsClient kmsClient = KMS2ClientFactory.getKmsClient(configuration); + assertNotNull(kmsClient); + kmsClient.close(); } @Test - public void getStandardKMSClient() { - KMS2Configuration kms2Configuration = new KMS2Configuration(); - kms2Configuration.setUseDefaultCredentialsProvider(false); - KMS2InternalClient kmsClient = KMS2ClientFactory.getKmsClient(kms2Configuration); - assertTrue(kmsClient instanceof KMS2ClientStandardImpl); + public void getKmsClientWithStaticCredentials() { + KMS2Configuration configuration = new KMS2Configuration(); + configuration.setAccessKey("testAccessKey"); + configuration.setSecretKey("testSecretKey"); + configuration.setRegion("eu-west-1"); + KmsClient kmsClient = KMS2ClientFactory.getKmsClient(configuration); + assertNotNull(kmsClient); + kmsClient.close(); } @Test - public void getIAMOptimizedKMSClient() { - KMS2Configuration kms2Configuration = new KMS2Configuration(); - kms2Configuration.setUseDefaultCredentialsProvider(true); - KMS2InternalClient kmsClient = KMS2ClientFactory.getKmsClient(kms2Configuration); - assertTrue(kmsClient instanceof KMS2ClientOptimizedImpl); - } - - @Test - public void getSessionTokenKMSClient() { - KMS2Configuration kms2Configuration = new KMS2Configuration(); - kms2Configuration.setUseSessionCredentials(true); - KMS2InternalClient kmsClient = KMS2ClientFactory.getKmsClient(kms2Configuration); - assertTrue(kmsClient instanceof KMS2ClientSessionTokenImpl); + public void getKmsClientWithEndpointOverride() { + KMS2Configuration configuration = new KMS2Configuration(); + configuration.setUseDefaultCredentialsProvider(true); + configuration.setRegion("eu-west-1"); + configuration.setOverrideEndpoint(true); + configuration.setUriEndpointOverride("http://localhost:4566";); + KmsClient kmsClient = KMS2ClientFactory.getKmsClient(configuration); + assertNotNull(kmsClient); + kmsClient.close(); } }
