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
The following commit(s) were added to refs/heads/main by this push: new 65c77f3196e Regen for commit 4e6a6e88f4fc328b55a30a04cb9097d40037a9ec 65c77f3196e is described below commit 65c77f3196ea67a1c805110be325d673d25e8e76 Author: orpiske <orpi...@users.noreply.github.com> AuthorDate: Tue Jun 13 12:45:46 2023 +0000 Regen for commit 4e6a6e88f4fc328b55a30a04cb9097d40037a9ec Signed-off-by: GitHub <nore...@github.com> --- .../java/org/apache/camel/component/aws2/ec2/AWS2EC2Component.java | 4 +++- .../org/apache/camel/component/aws2/ec2/AWS2EC2Configuration.java | 1 - .../aws2/ec2/client/impl/AWS2EC2ClientIAMProfileOptimizedImpl.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Component.java b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Component.java index 592426e595b..70e1937fb67 100644 --- a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Component.java +++ b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Component.java @@ -48,7 +48,9 @@ public class AWS2EC2Component extends DefaultComponent { = this.configuration != null ? this.configuration.copy() : new AWS2EC2Configuration(); AWS2EC2Endpoint endpoint = new AWS2EC2Endpoint(uri, this, configuration); setProperties(endpoint, parameters); - if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider()) && Boolean.FALSE.equals(configuration.isUseProfileCredentialsProvider()) && configuration.getAmazonEc2Client() == null + if (Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider()) + && Boolean.FALSE.equals(configuration.isUseProfileCredentialsProvider()) + && configuration.getAmazonEc2Client() == null && (configuration.getAccessKey() == null || configuration.getSecretKey() == null)) { throw new IllegalArgumentException( "useDefaultCredentialsProvider is set to false, useProfileCredentialsProvider is set to false, amazonEC2Client or accessKey and secretKey must be specified"); diff --git a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Configuration.java b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Configuration.java index 7d26cf8e1b5..bcc2db1bb99 100644 --- a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Configuration.java +++ b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Configuration.java @@ -211,7 +211,6 @@ public class AWS2EC2Configuration implements Cloneable { return useDefaultCredentialsProvider; } - public boolean isUseProfileCredentialsProvider() { return useProfileCredentialsProvider; } diff --git a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/client/impl/AWS2EC2ClientIAMProfileOptimizedImpl.java b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/client/impl/AWS2EC2ClientIAMProfileOptimizedImpl.java index b4efae4e967..3ee7b8ee837 100644 --- a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/client/impl/AWS2EC2ClientIAMProfileOptimizedImpl.java +++ b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/client/impl/AWS2EC2ClientIAMProfileOptimizedImpl.java @@ -16,6 +16,8 @@ */ package org.apache.camel.component.aws2.ec2.client.impl; +import java.net.URI; + import org.apache.camel.component.aws2.ec2.AWS2EC2Configuration; import org.apache.camel.component.aws2.ec2.client.AWS2EC2InternalClient; import org.apache.camel.util.ObjectHelper; @@ -31,8 +33,6 @@ import software.amazon.awssdk.services.ec2.Ec2Client; import software.amazon.awssdk.services.ec2.Ec2ClientBuilder; import software.amazon.awssdk.utils.AttributeMap; -import java.net.URI; - /** * Manage an AWS EC2 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)