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 165ee44ccd8 CAMEL-20281 - Camel-AWS Components: Make it possible to
use AwsSessionCredentials to support temporary credentials - AWS CW (#13006)
165ee44ccd8 is described below
commit 165ee44ccd8a459af51c6912ba1db1bcb2f07634
Author: Andrea Cosentino <[email protected]>
AuthorDate: Mon Feb 5 11:55:32 2024 +0100
CAMEL-20281 - Camel-AWS Components: Make it possible to use
AwsSessionCredentials to support temporary credentials - AWS CW (#13006)
Signed-off-by: Andrea Cosentino <[email protected]>
---
.../apache/camel/catalog/components/aws2-cw.json | 16 +--
.../component/aws2/cw/Cw2ComponentConfigurer.java | 12 +++
.../component/aws2/cw/Cw2EndpointConfigurer.java | 12 +++
.../component/aws2/cw/Cw2EndpointUriFactory.java | 7 +-
.../apache/camel/component/aws2/cw/aws2-cw.json | 16 +--
.../camel/component/aws2/cw/Cw2Component.java | 3 +-
.../camel/component/aws2/cw/Cw2Configuration.java | 27 +++++
.../component/aws2/cw/client/Cw2ClientFactory.java | 3 +
.../cw/client/impl/Cw2ClientSessionTokenImpl.java | 111 +++++++++++++++++++++
.../component/aws2/cw/Cw2ClientFactoryTest.java | 15 ++-
10 files changed, 204 insertions(+), 18 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-cw.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-cw.json
index 909c8c51dbd..b01e1404b66 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-cw.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-cw.json
@@ -42,9 +42,11 @@
"accessKey": { "index": 16, "kind": "property", "displayName": "Access
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
"profileCredentialsName": { "index": 17, "kind": "property",
"displayName": "Profile Credentials Name", "group": "security", "label":
"security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration",
"configurationField": "configuration", "description": "If using a profile
credentials provider this parameter will set the profile name" },
"secretKey": { "index": 18, "kind": "property", "displayName": "Secret
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" },
- "trustAllCertificates": { "index": 19, "kind": "property", "displayName":
"Trust All Certificates", "group": "security", "label": "security", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" },
- "useDefaultCredentialsProvider": { "index": 20, "kind": "property",
"displayName": "Use Default Credentials Provider", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to
load crede [...]
- "useProfileCredentialsProvider": { "index": 21, "kind": "property",
"displayName": "Use Profile Credentials Provider", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the Cloudwatch client should
expect to lo [...]
+ "sessionToken": { "index": 19, "kind": "property", "displayName": "Session
Token", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Session Token used when the user
needs to assume a IAM role" },
+ "trustAllCertificates": { "index": 20, "kind": "property", "displayName":
"Trust All Certificates", "group": "security", "label": "security", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" },
+ "useDefaultCredentialsProvider": { "index": 21, "kind": "property",
"displayName": "Use Default Credentials Provider", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to
load crede [...]
+ "useProfileCredentialsProvider": { "index": 22, "kind": "property",
"displayName": "Use Profile Credentials Provider", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the Cloudwatch client should
expect to lo [...]
+ "useSessionCredentials": { "index": 23, "kind": "property", "displayName":
"Use Session Credentials", "group": "security", "label": "security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration",
"configurationField": "configuration", "description": "Set whether the
CloudWatch client should expect to use Session Credent [...]
},
"headers": {
"CamelAwsCwMetricNamespace": { "index": 0, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The Amazon CW metric namespace.",
"constantName":
"org.apache.camel.component.aws2.cw.Cw2Constants#METRIC_NAMESPACE" },
@@ -73,8 +75,10 @@
"accessKey": { "index": 13, "kind": "parameter", "displayName": "Access
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
"profileCredentialsName": { "index": 14, "kind": "parameter",
"displayName": "Profile Credentials Name", "group": "security", "label":
"security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration",
"configurationField": "configuration", "description": "If using a profile
credentials provider this parameter will set the profile name" },
"secretKey": { "index": 15, "kind": "parameter", "displayName": "Secret
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" },
- "trustAllCertificates": { "index": 16, "kind": "parameter", "displayName":
"Trust All Certificates", "group": "security", "label": "security", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" },
- "useDefaultCredentialsProvider": { "index": 17, "kind": "parameter",
"displayName": "Use Default Credentials Provider", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to
load cred [...]
- "useProfileCredentialsProvider": { "index": 18, "kind": "parameter",
"displayName": "Use Profile Credentials Provider", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the Cloudwatch client should
expect to l [...]
+ "sessionToken": { "index": 16, "kind": "parameter", "displayName":
"Session Token", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Session Token used when the user
needs to assume a IAM role" },
+ "trustAllCertificates": { "index": 17, "kind": "parameter", "displayName":
"Trust All Certificates", "group": "security", "label": "security", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" },
+ "useDefaultCredentialsProvider": { "index": 18, "kind": "parameter",
"displayName": "Use Default Credentials Provider", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to
load cred [...]
+ "useProfileCredentialsProvider": { "index": 19, "kind": "parameter",
"displayName": "Use Profile Credentials Provider", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the Cloudwatch client should
expect to l [...]
+ "useSessionCredentials": { "index": 20, "kind": "parameter",
"displayName": "Use Session Credentials", "group": "security", "label":
"security", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the CloudWatch client should
expect to use Session Creden [...]
}
}
diff --git
a/components/camel-aws/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2ComponentConfigurer.java
b/components/camel-aws/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2ComponentConfigurer.java
index f82013d0685..6f01cca443c 100644
---
a/components/camel-aws/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2ComponentConfigurer.java
+++
b/components/camel-aws/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2ComponentConfigurer.java
@@ -55,6 +55,8 @@ public class Cw2ComponentConfigurer extends
PropertyConfigurerSupport implements
case "region":
getOrCreateConfiguration(target).setRegion(property(camelContext,
java.lang.String.class, value)); return true;
case "secretkey":
case "secretKey":
getOrCreateConfiguration(target).setSecretKey(property(camelContext,
java.lang.String.class, value)); return true;
+ case "sessiontoken":
+ case "sessionToken":
getOrCreateConfiguration(target).setSessionToken(property(camelContext,
java.lang.String.class, value)); return true;
case "timestamp":
getOrCreateConfiguration(target).setTimestamp(property(camelContext,
java.time.Instant.class, value)); return true;
case "trustallcertificates":
case "trustAllCertificates":
getOrCreateConfiguration(target).setTrustAllCertificates(property(camelContext,
boolean.class, value)); return true;
@@ -65,6 +67,8 @@ public class Cw2ComponentConfigurer extends
PropertyConfigurerSupport implements
case "useDefaultCredentialsProvider":
getOrCreateConfiguration(target).setUseDefaultCredentialsProvider(property(camelContext,
boolean.class, value)); return true;
case "useprofilecredentialsprovider":
case "useProfileCredentialsProvider":
getOrCreateConfiguration(target).setUseProfileCredentialsProvider(property(camelContext,
boolean.class, value)); return true;
+ case "usesessioncredentials":
+ case "useSessionCredentials":
getOrCreateConfiguration(target).setUseSessionCredentials(property(camelContext,
boolean.class, value)); return true;
case "value":
getOrCreateConfiguration(target).setValue(property(camelContext,
java.lang.Double.class, value)); return true;
default: return false;
}
@@ -105,6 +109,8 @@ public class Cw2ComponentConfigurer extends
PropertyConfigurerSupport implements
case "region": return java.lang.String.class;
case "secretkey":
case "secretKey": return java.lang.String.class;
+ case "sessiontoken":
+ case "sessionToken": return java.lang.String.class;
case "timestamp": return java.time.Instant.class;
case "trustallcertificates":
case "trustAllCertificates": return boolean.class;
@@ -115,6 +121,8 @@ public class Cw2ComponentConfigurer extends
PropertyConfigurerSupport implements
case "useDefaultCredentialsProvider": return boolean.class;
case "useprofilecredentialsprovider":
case "useProfileCredentialsProvider": return boolean.class;
+ case "usesessioncredentials":
+ case "useSessionCredentials": return boolean.class;
case "value": return java.lang.Double.class;
default: return null;
}
@@ -151,6 +159,8 @@ public class Cw2ComponentConfigurer extends
PropertyConfigurerSupport implements
case "region": return getOrCreateConfiguration(target).getRegion();
case "secretkey":
case "secretKey": return
getOrCreateConfiguration(target).getSecretKey();
+ case "sessiontoken":
+ case "sessionToken": return
getOrCreateConfiguration(target).getSessionToken();
case "timestamp": return
getOrCreateConfiguration(target).getTimestamp();
case "trustallcertificates":
case "trustAllCertificates": return
getOrCreateConfiguration(target).isTrustAllCertificates();
@@ -161,6 +171,8 @@ public class Cw2ComponentConfigurer extends
PropertyConfigurerSupport implements
case "useDefaultCredentialsProvider": return
getOrCreateConfiguration(target).isUseDefaultCredentialsProvider();
case "useprofilecredentialsprovider":
case "useProfileCredentialsProvider": return
getOrCreateConfiguration(target).isUseProfileCredentialsProvider();
+ case "usesessioncredentials":
+ case "useSessionCredentials": return
getOrCreateConfiguration(target).isUseSessionCredentials();
case "value": return getOrCreateConfiguration(target).getValue();
default: return null;
}
diff --git
a/components/camel-aws/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointConfigurer.java
b/components/camel-aws/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointConfigurer.java
index 6462288de8d..14fdc9aa95b 100644
---
a/components/camel-aws/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointConfigurer.java
+++
b/components/camel-aws/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointConfigurer.java
@@ -41,6 +41,8 @@ public class Cw2EndpointConfigurer extends
PropertyConfigurerSupport implements
case "region":
target.getConfiguration().setRegion(property(camelContext,
java.lang.String.class, value)); return true;
case "secretkey":
case "secretKey":
target.getConfiguration().setSecretKey(property(camelContext,
java.lang.String.class, value)); return true;
+ case "sessiontoken":
+ case "sessionToken":
target.getConfiguration().setSessionToken(property(camelContext,
java.lang.String.class, value)); return true;
case "timestamp":
target.getConfiguration().setTimestamp(property(camelContext,
java.time.Instant.class, value)); return true;
case "trustallcertificates":
case "trustAllCertificates":
target.getConfiguration().setTrustAllCertificates(property(camelContext,
boolean.class, value)); return true;
@@ -51,6 +53,8 @@ public class Cw2EndpointConfigurer extends
PropertyConfigurerSupport implements
case "useDefaultCredentialsProvider":
target.getConfiguration().setUseDefaultCredentialsProvider(property(camelContext,
boolean.class, value)); return true;
case "useprofilecredentialsprovider":
case "useProfileCredentialsProvider":
target.getConfiguration().setUseProfileCredentialsProvider(property(camelContext,
boolean.class, value)); return true;
+ case "usesessioncredentials":
+ case "useSessionCredentials":
target.getConfiguration().setUseSessionCredentials(property(camelContext,
boolean.class, value)); return true;
case "value":
target.getConfiguration().setValue(property(camelContext,
java.lang.Double.class, value)); return true;
default: return false;
}
@@ -84,6 +88,8 @@ public class Cw2EndpointConfigurer extends
PropertyConfigurerSupport implements
case "region": return java.lang.String.class;
case "secretkey":
case "secretKey": return java.lang.String.class;
+ case "sessiontoken":
+ case "sessionToken": return java.lang.String.class;
case "timestamp": return java.time.Instant.class;
case "trustallcertificates":
case "trustAllCertificates": return boolean.class;
@@ -94,6 +100,8 @@ public class Cw2EndpointConfigurer extends
PropertyConfigurerSupport implements
case "useDefaultCredentialsProvider": return boolean.class;
case "useprofilecredentialsprovider":
case "useProfileCredentialsProvider": return boolean.class;
+ case "usesessioncredentials":
+ case "useSessionCredentials": return boolean.class;
case "value": return java.lang.Double.class;
default: return null;
}
@@ -123,6 +131,8 @@ public class Cw2EndpointConfigurer extends
PropertyConfigurerSupport implements
case "region": return target.getConfiguration().getRegion();
case "secretkey":
case "secretKey": return target.getConfiguration().getSecretKey();
+ case "sessiontoken":
+ case "sessionToken": return
target.getConfiguration().getSessionToken();
case "timestamp": return target.getConfiguration().getTimestamp();
case "trustallcertificates":
case "trustAllCertificates": return
target.getConfiguration().isTrustAllCertificates();
@@ -133,6 +143,8 @@ public class Cw2EndpointConfigurer extends
PropertyConfigurerSupport implements
case "useDefaultCredentialsProvider": return
target.getConfiguration().isUseDefaultCredentialsProvider();
case "useprofilecredentialsprovider":
case "useProfileCredentialsProvider": return
target.getConfiguration().isUseProfileCredentialsProvider();
+ case "usesessioncredentials":
+ case "useSessionCredentials": return
target.getConfiguration().isUseSessionCredentials();
case "value": return target.getConfiguration().getValue();
default: return null;
}
diff --git
a/components/camel-aws/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriFactory.java
b/components/camel-aws/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriFactory.java
index 8447535a105..5d7f4be70c0 100644
---
a/components/camel-aws/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriFactory.java
+++
b/components/camel-aws/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriFactory.java
@@ -21,7 +21,7 @@ public class Cw2EndpointUriFactory extends
org.apache.camel.support.component.En
private static final Set<String> SECRET_PROPERTY_NAMES;
private static final Set<String> MULTI_VALUE_PREFIXES;
static {
- Set<String> props = new HashSet<>(19);
+ Set<String> props = new HashSet<>(21);
props.add("accessKey");
props.add("amazonCwClient");
props.add("lazyStartProducer");
@@ -34,17 +34,20 @@ public class Cw2EndpointUriFactory extends
org.apache.camel.support.component.En
props.add("proxyProtocol");
props.add("region");
props.add("secretKey");
+ props.add("sessionToken");
props.add("timestamp");
props.add("trustAllCertificates");
props.add("unit");
props.add("uriEndpointOverride");
props.add("useDefaultCredentialsProvider");
props.add("useProfileCredentialsProvider");
+ props.add("useSessionCredentials");
props.add("value");
PROPERTY_NAMES = Collections.unmodifiableSet(props);
- Set<String> secretProps = new HashSet<>(2);
+ Set<String> secretProps = new HashSet<>(3);
secretProps.add("accessKey");
secretProps.add("secretKey");
+ secretProps.add("sessionToken");
SECRET_PROPERTY_NAMES = Collections.unmodifiableSet(secretProps);
MULTI_VALUE_PREFIXES = Collections.emptySet();
}
diff --git
a/components/camel-aws/camel-aws2-cw/src/generated/resources/org/apache/camel/component/aws2/cw/aws2-cw.json
b/components/camel-aws/camel-aws2-cw/src/generated/resources/org/apache/camel/component/aws2/cw/aws2-cw.json
index 909c8c51dbd..b01e1404b66 100644
---
a/components/camel-aws/camel-aws2-cw/src/generated/resources/org/apache/camel/component/aws2/cw/aws2-cw.json
+++
b/components/camel-aws/camel-aws2-cw/src/generated/resources/org/apache/camel/component/aws2/cw/aws2-cw.json
@@ -42,9 +42,11 @@
"accessKey": { "index": 16, "kind": "property", "displayName": "Access
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
"profileCredentialsName": { "index": 17, "kind": "property",
"displayName": "Profile Credentials Name", "group": "security", "label":
"security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration",
"configurationField": "configuration", "description": "If using a profile
credentials provider this parameter will set the profile name" },
"secretKey": { "index": 18, "kind": "property", "displayName": "Secret
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" },
- "trustAllCertificates": { "index": 19, "kind": "property", "displayName":
"Trust All Certificates", "group": "security", "label": "security", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" },
- "useDefaultCredentialsProvider": { "index": 20, "kind": "property",
"displayName": "Use Default Credentials Provider", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to
load crede [...]
- "useProfileCredentialsProvider": { "index": 21, "kind": "property",
"displayName": "Use Profile Credentials Provider", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the Cloudwatch client should
expect to lo [...]
+ "sessionToken": { "index": 19, "kind": "property", "displayName": "Session
Token", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Session Token used when the user
needs to assume a IAM role" },
+ "trustAllCertificates": { "index": 20, "kind": "property", "displayName":
"Trust All Certificates", "group": "security", "label": "security", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" },
+ "useDefaultCredentialsProvider": { "index": 21, "kind": "property",
"displayName": "Use Default Credentials Provider", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to
load crede [...]
+ "useProfileCredentialsProvider": { "index": 22, "kind": "property",
"displayName": "Use Profile Credentials Provider", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the Cloudwatch client should
expect to lo [...]
+ "useSessionCredentials": { "index": 23, "kind": "property", "displayName":
"Use Session Credentials", "group": "security", "label": "security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration",
"configurationField": "configuration", "description": "Set whether the
CloudWatch client should expect to use Session Credent [...]
},
"headers": {
"CamelAwsCwMetricNamespace": { "index": 0, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The Amazon CW metric namespace.",
"constantName":
"org.apache.camel.component.aws2.cw.Cw2Constants#METRIC_NAMESPACE" },
@@ -73,8 +75,10 @@
"accessKey": { "index": 13, "kind": "parameter", "displayName": "Access
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
"profileCredentialsName": { "index": 14, "kind": "parameter",
"displayName": "Profile Credentials Name", "group": "security", "label":
"security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration",
"configurationField": "configuration", "description": "If using a profile
credentials provider this parameter will set the profile name" },
"secretKey": { "index": 15, "kind": "parameter", "displayName": "Secret
Key", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" },
- "trustAllCertificates": { "index": 16, "kind": "parameter", "displayName":
"Trust All Certificates", "group": "security", "label": "security", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" },
- "useDefaultCredentialsProvider": { "index": 17, "kind": "parameter",
"displayName": "Use Default Credentials Provider", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to
load cred [...]
- "useProfileCredentialsProvider": { "index": 18, "kind": "parameter",
"displayName": "Use Profile Credentials Provider", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the Cloudwatch client should
expect to l [...]
+ "sessionToken": { "index": 16, "kind": "parameter", "displayName":
"Session Token", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Session Token used when the user
needs to assume a IAM role" },
+ "trustAllCertificates": { "index": 17, "kind": "parameter", "displayName":
"Trust All Certificates", "group": "security", "label": "security", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.cw.Cw2Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" },
+ "useDefaultCredentialsProvider": { "index": 18, "kind": "parameter",
"displayName": "Use Default Credentials Provider", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to
load cred [...]
+ "useProfileCredentialsProvider": { "index": 19, "kind": "parameter",
"displayName": "Use Profile Credentials Provider", "group": "security",
"label": "security", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the Cloudwatch client should
expect to l [...]
+ "useSessionCredentials": { "index": 20, "kind": "parameter",
"displayName": "Use Session Credentials", "group": "security", "label":
"security", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.aws2.cw.Cw2Configuration", "configurationField":
"configuration", "description": "Set whether the CloudWatch client should
expect to use Session Creden [...]
}
}
diff --git
a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Component.java
b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Component.java
index 30f66f49fd8..e1282f43ed7 100644
---
a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Component.java
+++
b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Component.java
@@ -57,10 +57,11 @@ public class Cw2Component extends HealthCheckComponent {
if
(Boolean.FALSE.equals(configuration.isUseDefaultCredentialsProvider())
&&
Boolean.FALSE.equals(configuration.isUseProfileCredentialsProvider())
+ &&
Boolean.FALSE.equals(configuration.isUseSessionCredentials())
&& configuration.getAmazonCwClient() == null
&& (configuration.getAccessKey() == null ||
configuration.getSecretKey() == null)) {
throw new IllegalArgumentException(
- "useDefaultCredentialsProvider is set to false,
useProfileCredentialsProvider is set to false, AmazonCwClient or accessKey and
secretKey must be specified");
+ "useDefaultCredentialsProvider is set to false,
useProfileCredentialsProvider is set to false, useSessionCredentials is set to
false, AmazonCwClient or accessKey and secretKey must be specified");
}
return endpoint;
diff --git
a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Configuration.java
b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Configuration.java
index d9e0145b70a..be772d53482 100644
---
a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Configuration.java
+++
b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/Cw2Configuration.java
@@ -39,6 +39,8 @@ public class Cw2Configuration implements Cloneable {
private String accessKey;
@UriParam(label = "security", secret = true)
private String secretKey;
+ @UriParam(label = "security", secret = true)
+ private String sessionToken;
@UriParam
private String name;
@UriParam
@@ -66,6 +68,8 @@ public class Cw2Configuration implements Cloneable {
@UriParam(label = "security")
private boolean useProfileCredentialsProvider;
@UriParam(label = "security")
+ private boolean useSessionCredentials;
+ @UriParam(label = "security")
private String profileCredentialsName;
public String getAccessKey() {
@@ -90,6 +94,17 @@ public class Cw2Configuration implements Cloneable {
this.secretKey = secretKey;
}
+ public String getSessionToken() {
+ return sessionToken;
+ }
+
+ /**
+ * Amazon AWS Session Token used when the user needs to assume a IAM role
+ */
+ public void setSessionToken(String sessionToken) {
+ this.sessionToken = sessionToken;
+ }
+
public String getName() {
return name;
}
@@ -258,6 +273,18 @@ public class Cw2Configuration implements Cloneable {
this.useProfileCredentialsProvider = useProfileCredentialsProvider;
}
+ public boolean isUseSessionCredentials() {
+ return useSessionCredentials;
+ }
+
+ /**
+ * Set whether the CloudWatch client should expect to use Session
Credentials. This is useful in situation in which
+ * the user needs to assume a IAM role for doing operations in CloudWatch.
+ */
+ public void setUseSessionCredentials(boolean useSessionCredentials) {
+ this.useSessionCredentials = useSessionCredentials;
+ }
+
public String getProfileCredentialsName() {
return profileCredentialsName;
}
diff --git
a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/Cw2ClientFactory.java
b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/Cw2ClientFactory.java
index cf2abffa32a..dff69031e27 100644
---
a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/Cw2ClientFactory.java
+++
b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/Cw2ClientFactory.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.aws2.cw.client;
import org.apache.camel.component.aws2.cw.Cw2Configuration;
import
org.apache.camel.component.aws2.cw.client.impl.Cw2ClientIAMOptimizedImpl;
import
org.apache.camel.component.aws2.cw.client.impl.Cw2ClientIAMProfileOptimizedImpl;
+import
org.apache.camel.component.aws2.cw.client.impl.Cw2ClientSessionTokenImpl;
import org.apache.camel.component.aws2.cw.client.impl.Cw2ClientStandardImpl;
/**
@@ -40,6 +41,8 @@ public final class Cw2ClientFactory {
return new Cw2ClientIAMOptimizedImpl(configuration);
} else if
(Boolean.TRUE.equals(configuration.isUseProfileCredentialsProvider())) {
return new Cw2ClientIAMProfileOptimizedImpl(configuration);
+ } else if
(Boolean.TRUE.equals(configuration.isUseSessionCredentials())) {
+ return new Cw2ClientSessionTokenImpl(configuration);
} else {
return new Cw2ClientStandardImpl(configuration);
}
diff --git
a/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/impl/Cw2ClientSessionTokenImpl.java
b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/impl/Cw2ClientSessionTokenImpl.java
new file mode 100644
index 00000000000..2abf3e57f69
--- /dev/null
+++
b/components/camel-aws/camel-aws2-cw/src/main/java/org/apache/camel/component/aws2/cw/client/impl/Cw2ClientSessionTokenImpl.java
@@ -0,0 +1,111 @@
+/*
+ * 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.cw.client.impl;
+
+import java.net.URI;
+
+import org.apache.camel.component.aws2.cw.Cw2Configuration;
+import org.apache.camel.component.aws2.cw.client.Cw2InternalClient;
+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.cloudwatch.CloudWatchClient;
+import software.amazon.awssdk.services.cloudwatch.CloudWatchClientBuilder;
+import software.amazon.awssdk.utils.AttributeMap;
+
+/**
+ * Manage an AWS Cloud Watch client for all users to use. This implementation
is for local instances to use a static and
+ * solid credential set.
+ */
+public class Cw2ClientSessionTokenImpl implements Cw2InternalClient {
+ private static final Logger LOG =
LoggerFactory.getLogger(Cw2ClientStandardImpl.class);
+ private Cw2Configuration configuration;
+
+ /**
+ * Constructor that uses the config file.
+ */
+ public Cw2ClientSessionTokenImpl(Cw2Configuration configuration) {
+ LOG.trace("Creating an AWS CloudWatch manager using static
credentials.");
+ this.configuration = configuration;
+ }
+
+ /**
+ * Getting the Cloud Watch AWS client that is used.
+ *
+ * @return Amazon Cloud Watch Client.
+ */
+ @Override
+ public CloudWatchClient getCloudWatchClient() {
+ CloudWatchClient client = null;
+ CloudWatchClientBuilder clientBuilder = CloudWatchClient.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-cw/src/test/java/org/apache/camel/component/aws2/cw/Cw2ClientFactoryTest.java
b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/Cw2ClientFactoryTest.java
index cb05c0b0caf..e70e8b60216 100644
---
a/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/Cw2ClientFactoryTest.java
+++
b/components/camel-aws/camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/Cw2ClientFactoryTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.aws2.cw;
import org.apache.camel.component.aws2.cw.client.Cw2ClientFactory;
import org.apache.camel.component.aws2.cw.client.Cw2InternalClient;
import
org.apache.camel.component.aws2.cw.client.impl.Cw2ClientIAMOptimizedImpl;
+import
org.apache.camel.component.aws2.cw.client.impl.Cw2ClientSessionTokenImpl;
import org.apache.camel.component.aws2.cw.client.impl.Cw2ClientStandardImpl;
import org.junit.jupiter.api.Test;
@@ -27,14 +28,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class Cw2ClientFactoryTest {
@Test
- public void getStandardS3ClientDefault() {
+ public void getStandardCWClientDefault() {
Cw2Configuration cw2Configuration = new Cw2Configuration();
Cw2InternalClient cwClient =
Cw2ClientFactory.getCloudWatchClient(cw2Configuration);
assertTrue(cwClient instanceof Cw2ClientStandardImpl);
}
@Test
- public void getStandardS3Client() {
+ public void getStandardCWClient() {
Cw2Configuration cw2Configuration = new Cw2Configuration();
cw2Configuration.setUseDefaultCredentialsProvider(false);
Cw2InternalClient cwClient =
Cw2ClientFactory.getCloudWatchClient(cw2Configuration);
@@ -42,10 +43,18 @@ public class Cw2ClientFactoryTest {
}
@Test
- public void getIAMOptimizedS3Client() {
+ public void getIAMOptimizedCWClient() {
Cw2Configuration cw2Configuration = new Cw2Configuration();
cw2Configuration.setUseDefaultCredentialsProvider(true);
Cw2InternalClient cwClient =
Cw2ClientFactory.getCloudWatchClient(cw2Configuration);
assertTrue(cwClient instanceof Cw2ClientIAMOptimizedImpl);
}
+
+ @Test
+ public void getSessionTokenCwClient() {
+ Cw2Configuration cw2Configuration = new Cw2Configuration();
+ cw2Configuration.setUseSessionCredentials(true);
+ Cw2InternalClient cwClient =
Cw2ClientFactory.getCloudWatchClient(cw2Configuration);
+ assertTrue(cwClient instanceof Cw2ClientSessionTokenImpl);
+ }
}
