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 ca1fc1690b677e7eb8b52c55a3ab5f1f80b9ff97
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu May 13 08:09:20 2021 +0200
CAMEL-16465 - Camel-AWS: Add useDefaultCredentialProvider option to all the
components - EKS Component
---
.../component/aws2/eks/EKS2Configuration.java | 13 +++
.../aws2/eks/client/EKS2ClientFactory.java | 41 ++++++++
.../aws2/eks/client/EKS2InternalClient.java | 32 +++++++
.../client/impl/EKS2ClientIAMOptimizedImpl.java | 88 +++++++++++++++++
.../eks/client/impl/EKS2ClientStandardImpl.java | 104 +++++++++++++++++++++
5 files changed, 278 insertions(+)
diff --git
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Configuration.java
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Configuration.java
index be6d7e3..013305b 100644
---
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Configuration.java
+++
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Configuration.java
@@ -56,6 +56,8 @@ public class EKS2Configuration implements Cloneable {
private boolean overrideEndpoint;
@UriParam
private String uriEndpointOverride;
+ @UriParam(defaultValue = "false")
+ private boolean useDefaultCredentialsProvider;
public EksClient getEksClient() {
return eksClient;
@@ -191,6 +193,17 @@ public class EKS2Configuration implements Cloneable {
this.uriEndpointOverride = uriEndpointOverride;
}
+ /**
+ * Set whether the EKS 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) {
+ this.useDefaultCredentialsProvider = useDefaultCredentialsProvider;
+ }
+
+ public Boolean isUseDefaultCredentialsProvider() {
+ return useDefaultCredentialsProvider;
+ }
// *************************************************
//
// *************************************************
diff --git
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/EKS2ClientFactory.java
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/EKS2ClientFactory.java
new file mode 100644
index 0000000..1bf69c0
--- /dev/null
+++
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/EKS2ClientFactory.java
@@ -0,0 +1,41 @@
+/*
+ * 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.eks.client;
+
+import org.apache.camel.component.aws2.eks.EKS2Configuration;
+import
org.apache.camel.component.aws2.eks.client.impl.EKS2ClientIAMOptimizedImpl;
+import org.apache.camel.component.aws2.eks.client.impl.EKS2ClientStandardImpl;
+
+/**
+ * Factory class to return the correct type of AWS EKS client.
+ */
+public final class EKS2ClientFactory {
+
+ private EKS2ClientFactory() {
+ }
+
+ /**
+ * Return the correct AWS EKS client (based on remote vs local).
+ *
+ * @param configuration configuration
+ * @return EKSClient
+ */
+ public static EKS2InternalClient getEcsClient(EKS2Configuration
configuration) {
+ return configuration.isUseDefaultCredentialsProvider()
+ ? new EKS2ClientIAMOptimizedImpl(configuration) : new
EKS2ClientStandardImpl(configuration);
+ }
+}
diff --git
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/EKS2InternalClient.java
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/EKS2InternalClient.java
new file mode 100644
index 0000000..acf4820
--- /dev/null
+++
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/EKS2InternalClient.java
@@ -0,0 +1,32 @@
+/*
+ * 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.eks.client;
+
+import software.amazon.awssdk.services.eks.EksClient;
+
+/**
+ * Manage the required actions of an EKS client for either local or remote.
+ */
+public interface EKS2InternalClient {
+
+ /**
+ * Returns an EKS client after a factory method determines which one to
return.
+ *
+ * @return EksClient EksClient
+ */
+ EksClient getEksClient();
+}
diff --git
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientIAMOptimizedImpl.java
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientIAMOptimizedImpl.java
new file mode 100644
index 0000000..f482338
--- /dev/null
+++
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientIAMOptimizedImpl.java
@@ -0,0 +1,88 @@
+/*
+ * 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.eks.client.impl;
+
+import org.apache.camel.component.aws2.eks.EKS2Configuration;
+import org.apache.camel.component.aws2.eks.client.EKS2InternalClient;
+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.eks.EksClient;
+import software.amazon.awssdk.services.eks.EksClientBuilder;
+import software.amazon.awssdk.utils.AttributeMap;
+
+import java.net.URI;
+
+/**
+ * Manage an AWS EKS 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 EKS2ClientIAMOptimizedImpl implements EKS2InternalClient {
+ private static final Logger LOG =
LoggerFactory.getLogger(EKS2ClientIAMOptimizedImpl.class);
+ private EKS2Configuration configuration;
+
+ /**
+ * Constructor that uses the config file.
+ */
+ public EKS2ClientIAMOptimizedImpl(EKS2Configuration configuration) {
+ LOG.trace("Creating an AWS EKS client for an ec2 instance with IAM
temporary credentials (normal for ec2s).");
+ this.configuration = configuration;
+ }
+
+ /**
+ * Getting the EKS aws client that is used.
+ *
+ * @return EcsClient Client.
+ */
+ @Override
+ public EksClient getEksClient() {
+ EksClient client = null;
+ EksClientBuilder clientBuilder = EksClient.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()) {
+ SdkHttpClient ahc =
ApacheHttpClient.builder().buildWithDefaults(AttributeMap
+ .builder()
+ .put(
+ SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES,
+ Boolean.TRUE)
+ .build());
+ clientBuilder.httpClient(ahc);
+ }
+ client = clientBuilder.build();
+ return client;
+ }
+}
diff --git
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientStandardImpl.java
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientStandardImpl.java
new file mode 100644
index 0000000..fc35914
--- /dev/null
+++
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/client/impl/EKS2ClientStandardImpl.java
@@ -0,0 +1,104 @@
+/*
+ * 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.eks.client.impl;
+
+import org.apache.camel.component.aws2.eks.EKS2Configuration;
+import org.apache.camel.component.aws2.eks.client.EKS2InternalClient;
+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.eks.EksClient;
+import software.amazon.awssdk.services.eks.EksClientBuilder;
+import software.amazon.awssdk.utils.AttributeMap;
+
+import java.net.URI;
+
+/**
+ * Manage an AWS EKS client for all users to use. This implementation is for
local instances to use a static and solid
+ * credential set.
+ */
+public class EKS2ClientStandardImpl implements EKS2InternalClient {
+ private static final Logger LOG =
LoggerFactory.getLogger(EKS2ClientStandardImpl.class);
+ private EKS2Configuration configuration;
+
+ /**
+ * Constructor that uses the config file.
+ */
+ public EKS2ClientStandardImpl(EKS2Configuration configuration) {
+ LOG.trace("Creating an AWS EKS manager using static credentials.");
+ this.configuration = configuration;
+ }
+
+ /**
+ * Getting the EKS AWS client that is used.
+ *
+ * @return Amazon EKS Client.
+ */
+ @Override
+ public EksClient getEksClient() {
+ EksClient client = null;
+ EksClientBuilder clientBuilder = EksClient.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;
+ }
+}
