This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 22786-2 in repository https://gitbox.apache.org/repos/asf/camel.git
commit f51b990b716798b56643af133965ab838cc98af7 Author: Andrea Cosentino <[email protected]> AuthorDate: Mon Dec 15 15:00:37 2025 +0100 CAMEL-22786 - Camel-AWS: Extract common logic for clients instantiation in a separated module - AWS Lambda Signed-off-by: Andrea Cosentino <[email protected]> --- components/camel-aws/camel-aws2-lambda/pom.xml | 4 + .../aws2/lambda/Lambda2Configuration.java | 5 +- .../component/aws2/lambda/Lambda2Endpoint.java | 2 +- .../aws2/lambda/client/Lambda2ClientFactory.java | 28 ++---- .../aws2/lambda/client/Lambda2InternalClient.java | 32 ------ .../impl/Lambda2ClientIAMProfileOptimizedImpl.java | 93 ----------------- .../client/impl/Lambda2ClientOptimizedImpl.java | 93 ----------------- .../client/impl/Lambda2ClientSessionTokenImpl.java | 111 --------------------- .../client/impl/Lambda2ClientStandardImpl.java | 109 -------------------- .../aws2/lambda/LambdaClientFactoryTest.java | 45 ++++----- 10 files changed, 40 insertions(+), 482 deletions(-) diff --git a/components/camel-aws/camel-aws2-lambda/pom.xml b/components/camel-aws/camel-aws2-lambda/pom.xml index 064e307ec5b4..f8c98448b7c5 100644 --- a/components/camel-aws/camel-aws2-lambda/pom.xml +++ b/components/camel-aws/camel-aws2-lambda/pom.xml @@ -38,6 +38,10 @@ </properties> <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-aws-common</artifactId> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-support</artifactId> diff --git a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Configuration.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Configuration.java index 06032b7cbd73..8b067e01aefe 100644 --- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Configuration.java +++ b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Configuration.java @@ -17,6 +17,7 @@ package org.apache.camel.component.aws2.lambda; 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; @@ -24,7 +25,7 @@ import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.services.lambda.LambdaClient; @UriParams -public class Lambda2Configuration implements Cloneable { +public class Lambda2Configuration implements Cloneable, AwsCommonConfiguration { @UriParam(defaultValue = "invokeFunction") private Lambda2Operations operation = Lambda2Operations.invokeFunction; @@ -215,7 +216,7 @@ public class Lambda2Configuration implements Cloneable { this.useDefaultCredentialsProvider = useDefaultCredentialsProvider; } - public Boolean isUseDefaultCredentialsProvider() { + public boolean isUseDefaultCredentialsProvider() { return useDefaultCredentialsProvider; } diff --git a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Endpoint.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Endpoint.java index de4afe2afe6c..f7469271ef6d 100644 --- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Endpoint.java +++ b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/Lambda2Endpoint.java @@ -79,7 +79,7 @@ public class Lambda2Endpoint extends DefaultEndpoint implements EndpointServiceL super.doStart(); awsLambdaClient = configuration.getAwsLambdaClient() != null ? configuration.getAwsLambdaClient() - : Lambda2ClientFactory.getLambdaClient(configuration).getLambdaClient(); + : Lambda2ClientFactory.getLambdaClient(configuration); } @Override diff --git a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/Lambda2ClientFactory.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/Lambda2ClientFactory.java index 810092b3b4db..d11e6b05f599 100644 --- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/Lambda2ClientFactory.java +++ b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/Lambda2ClientFactory.java @@ -16,14 +16,12 @@ */ package org.apache.camel.component.aws2.lambda.client; +import org.apache.camel.component.aws.common.AwsClientBuilderUtil; import org.apache.camel.component.aws2.lambda.Lambda2Configuration; -import org.apache.camel.component.aws2.lambda.client.impl.Lambda2ClientIAMProfileOptimizedImpl; -import org.apache.camel.component.aws2.lambda.client.impl.Lambda2ClientOptimizedImpl; -import org.apache.camel.component.aws2.lambda.client.impl.Lambda2ClientSessionTokenImpl; -import org.apache.camel.component.aws2.lambda.client.impl.Lambda2ClientStandardImpl; +import software.amazon.awssdk.services.lambda.LambdaClient; /** - * Factory class to return the correct type of AWS Lambda client. + * Factory class to create AWS Lambda clients using common configuration. */ public final class Lambda2ClientFactory { @@ -31,20 +29,14 @@ public final class Lambda2ClientFactory { } /** - * Return the correct AWS Lambda client (based on remote vs local). + * Create a Lambda client based on configuration. * - * @param configuration configuration - * @return LambdaClient + * @param configuration The Lambda configuration + * @return Configured LambdaClient */ - public static Lambda2InternalClient getLambdaClient(Lambda2Configuration configuration) { - if (Boolean.TRUE.equals(configuration.isUseDefaultCredentialsProvider())) { - return new Lambda2ClientOptimizedImpl(configuration); - } else if (Boolean.TRUE.equals(configuration.isUseProfileCredentialsProvider())) { - return new Lambda2ClientIAMProfileOptimizedImpl(configuration); - } else if (Boolean.TRUE.equals(configuration.isUseSessionCredentials())) { - return new Lambda2ClientSessionTokenImpl(configuration); - } else { - return new Lambda2ClientStandardImpl(configuration); - } + public static LambdaClient getLambdaClient(Lambda2Configuration configuration) { + return AwsClientBuilderUtil.buildClient( + configuration, + LambdaClient::builder); } } diff --git a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/Lambda2InternalClient.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/Lambda2InternalClient.java deleted file mode 100644 index eb662dbc72fe..000000000000 --- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/Lambda2InternalClient.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.lambda.client; - -import software.amazon.awssdk.services.lambda.LambdaClient; - -/** - * Manage the required actions of an Lambda client for either local or remote. - */ -public interface Lambda2InternalClient { - - /** - * Returns an Lambda client after a factory method determines which one to return. - * - * @return LambdaClient LambdaClient - */ - LambdaClient getLambdaClient(); -} diff --git a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientIAMProfileOptimizedImpl.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientIAMProfileOptimizedImpl.java deleted file mode 100644 index 8ab02725b2b5..000000000000 --- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientIAMProfileOptimizedImpl.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.lambda.client.impl; - -import java.net.URI; - -import org.apache.camel.component.aws2.lambda.Lambda2Configuration; -import org.apache.camel.component.aws2.lambda.client.Lambda2InternalClient; -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.lambda.LambdaClient; -import software.amazon.awssdk.services.lambda.LambdaClientBuilder; -import software.amazon.awssdk.utils.AttributeMap; - -/** - * Manage an AWS Lambda client for all users to use. This implementation is for local instances to use a static and - * solid credential set. - */ -public class Lambda2ClientIAMProfileOptimizedImpl implements Lambda2InternalClient { - private static final Logger LOG = LoggerFactory.getLogger(Lambda2ClientIAMProfileOptimizedImpl.class); - private Lambda2Configuration configuration; - - /** - * Constructor that uses the config file. - */ - public Lambda2ClientIAMProfileOptimizedImpl(Lambda2Configuration configuration) { - LOG.trace("Creating an AWS Lambda manager using profile credentials."); - this.configuration = configuration; - } - - @Override - public LambdaClient getLambdaClient() { - LambdaClient client = null; - LambdaClientBuilder clientBuilder = LambdaClient.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-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientOptimizedImpl.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientOptimizedImpl.java deleted file mode 100644 index 1e626f6bb4a4..000000000000 --- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientOptimizedImpl.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.lambda.client.impl; - -import java.net.URI; - -import org.apache.camel.component.aws2.lambda.Lambda2Configuration; -import org.apache.camel.component.aws2.lambda.client.Lambda2InternalClient; -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.lambda.LambdaClient; -import software.amazon.awssdk.services.lambda.LambdaClientBuilder; -import software.amazon.awssdk.utils.AttributeMap; - -/** - * Manage an AWS Lambda 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 Lambda2ClientOptimizedImpl implements Lambda2InternalClient { - private static final Logger LOG = LoggerFactory.getLogger(Lambda2ClientOptimizedImpl.class); - private Lambda2Configuration configuration; - - /** - * Constructor that uses the config file. - */ - public Lambda2ClientOptimizedImpl(Lambda2Configuration configuration) { - LOG.trace("Creating an AWS Lambda client for an ec2 instance with IAM temporary credentials (normal for ec2s)."); - this.configuration = configuration; - } - - /** - * Getting the Lambda aws client that is used. - * - * @return Lambda Client. - */ - @Override - public LambdaClient getLambdaClient() { - LambdaClient client = null; - LambdaClientBuilder clientBuilder = LambdaClient.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-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientSessionTokenImpl.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientSessionTokenImpl.java deleted file mode 100644 index 96c69bbcb594..000000000000 --- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientSessionTokenImpl.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.lambda.client.impl; - -import java.net.URI; - -import org.apache.camel.component.aws2.lambda.Lambda2Configuration; -import org.apache.camel.component.aws2.lambda.client.Lambda2InternalClient; -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.lambda.LambdaClient; -import software.amazon.awssdk.services.lambda.LambdaClientBuilder; -import software.amazon.awssdk.utils.AttributeMap; - -/** - * Manage an AWS Lambda client for all users to use. This implementation is for local instances to use a static and - * solid credential set. - */ -public class Lambda2ClientSessionTokenImpl implements Lambda2InternalClient { - private static final Logger LOG = LoggerFactory.getLogger(Lambda2ClientSessionTokenImpl.class); - private Lambda2Configuration configuration; - - /** - * Constructor that uses the config file. - */ - public Lambda2ClientSessionTokenImpl(Lambda2Configuration configuration) { - LOG.trace("Creating an AWS Lambda manager using static credentials."); - this.configuration = configuration; - } - - /** - * Getting the Lambda AWS client that is used. - * - * @return Amazon Lambda Client. - */ - @Override - public LambdaClient getLambdaClient() { - LambdaClient client = null; - LambdaClientBuilder clientBuilder = LambdaClient.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-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientStandardImpl.java b/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientStandardImpl.java deleted file mode 100644 index f16f06f49253..000000000000 --- a/components/camel-aws/camel-aws2-lambda/src/main/java/org/apache/camel/component/aws2/lambda/client/impl/Lambda2ClientStandardImpl.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.lambda.client.impl; - -import java.net.URI; - -import org.apache.camel.component.aws2.lambda.Lambda2Configuration; -import org.apache.camel.component.aws2.lambda.client.Lambda2InternalClient; -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.lambda.LambdaClient; -import software.amazon.awssdk.services.lambda.LambdaClientBuilder; -import software.amazon.awssdk.utils.AttributeMap; - -/** - * Manage an AWS Lambda client for all users to use. This implementation is for local instances to use a static and - * solid credential set. - */ -public class Lambda2ClientStandardImpl implements Lambda2InternalClient { - private static final Logger LOG = LoggerFactory.getLogger(Lambda2ClientStandardImpl.class); - private Lambda2Configuration configuration; - - /** - * Constructor that uses the config file. - */ - public Lambda2ClientStandardImpl(Lambda2Configuration configuration) { - LOG.trace("Creating an AWS Lambda manager using static credentials."); - this.configuration = configuration; - } - - /** - * Getting the Lambda AWS client that is used. - * - * @return Amazon Lambda Client. - */ - @Override - public LambdaClient getLambdaClient() { - LambdaClient client = null; - LambdaClientBuilder clientBuilder = LambdaClient.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-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaClientFactoryTest.java b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaClientFactoryTest.java index 08db3694bff7..1e7cd73c5e68 100644 --- a/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaClientFactoryTest.java +++ b/components/camel-aws/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/LambdaClientFactoryTest.java @@ -17,44 +17,43 @@ package org.apache.camel.component.aws2.lambda; import org.apache.camel.component.aws2.lambda.client.Lambda2ClientFactory; -import org.apache.camel.component.aws2.lambda.client.Lambda2InternalClient; -import org.apache.camel.component.aws2.lambda.client.impl.Lambda2ClientOptimizedImpl; -import org.apache.camel.component.aws2.lambda.client.impl.Lambda2ClientSessionTokenImpl; -import org.apache.camel.component.aws2.lambda.client.impl.Lambda2ClientStandardImpl; import org.junit.jupiter.api.Test; +import software.amazon.awssdk.services.lambda.LambdaClient; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class LambdaClientFactoryTest { @Test - public void getStandardLambdaClientDefault() { + public void getLambdaClientWithDefaultCredentials() { Lambda2Configuration lambda2Configuration = new Lambda2Configuration(); - Lambda2InternalClient lambdaClient = Lambda2ClientFactory.getLambdaClient(lambda2Configuration); - assertTrue(lambdaClient instanceof Lambda2ClientStandardImpl); + lambda2Configuration.setUseDefaultCredentialsProvider(true); + lambda2Configuration.setRegion("eu-west-1"); + LambdaClient lambdaClient = Lambda2ClientFactory.getLambdaClient(lambda2Configuration); + assertNotNull(lambdaClient); + lambdaClient.close(); } @Test - public void getStandardLambdaClient() { + public void getLambdaClientWithStaticCredentials() { Lambda2Configuration lambda2Configuration = new Lambda2Configuration(); - lambda2Configuration.setUseDefaultCredentialsProvider(false); - Lambda2InternalClient lambdaClient = Lambda2ClientFactory.getLambdaClient(lambda2Configuration); - assertTrue(lambdaClient instanceof Lambda2ClientStandardImpl); + lambda2Configuration.setAccessKey("testAccessKey"); + lambda2Configuration.setSecretKey("testSecretKey"); + lambda2Configuration.setRegion("eu-west-1"); + LambdaClient lambdaClient = Lambda2ClientFactory.getLambdaClient(lambda2Configuration); + assertNotNull(lambdaClient); + lambdaClient.close(); } @Test - public void getIAMOptimizedLambdaClient() { + public void getLambdaClientWithEndpointOverride() { Lambda2Configuration lambda2Configuration = new Lambda2Configuration(); lambda2Configuration.setUseDefaultCredentialsProvider(true); - Lambda2InternalClient lambdaClient = Lambda2ClientFactory.getLambdaClient(lambda2Configuration); - assertTrue(lambdaClient instanceof Lambda2ClientOptimizedImpl); - } - - @Test - public void getSessionTokenLambdaClient() { - Lambda2Configuration lambda2Configuration = new Lambda2Configuration(); - lambda2Configuration.setUseSessionCredentials(true); - Lambda2InternalClient lambdaClient = Lambda2ClientFactory.getLambdaClient(lambda2Configuration); - assertTrue(lambdaClient instanceof Lambda2ClientSessionTokenImpl); + lambda2Configuration.setRegion("eu-west-1"); + lambda2Configuration.setOverrideEndpoint(true); + lambda2Configuration.setUriEndpointOverride("http://localhost:4566";); + LambdaClient lambdaClient = Lambda2ClientFactory.getLambdaClient(lambda2Configuration); + assertNotNull(lambdaClient); + lambdaClient.close(); } }
