This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch CAMEL-20281-cloudtrail
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e719ab955a74ad032cd53433929d55d083dbab2e
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri Jan 26 14:14:51 2024 +0100
CAMEL-20281 - Camel-AWS Components: Make it possible to use
AwsSessionCredentials to support temporary credentials - AWS Cloudtrail
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
.../camel/catalog/components/aws-cloudtrail.json | 16 +--
.../cloudtrail/CloudtrailComponentConfigurer.java | 12 +++
.../cloudtrail/CloudtrailEndpointConfigurer.java | 12 +++
.../cloudtrail/CloudtrailEndpointUriFactory.java | 7 +-
.../component/aws/cloudtrail/aws-cloudtrail.json | 16 +--
.../aws/cloudtrail/CloudtrailComponent.java | 3 +-
.../aws/cloudtrail/CloudtrailConfiguration.java | 27 +++++
.../cloudtrail/client/CloudtrailClientFactory.java | 3 +
.../impl/CloudtrailClientSessionTokenImpl.java | 110 +++++++++++++++++++++
.../cloudtrail/CloudtrailClientFactoryTest.java | 9 ++
10 files changed, 200 insertions(+), 15 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-cloudtrail.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-cloudtrail.json
index 57be7d2e3f6..55720d588a0 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-cloudtrail.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws-cloudtrail.json
@@ -40,9 +40,11 @@
"accessKey": { "index": 14, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Amazon AWS Access Key" },
"profileCredentialsName": { "index": 15, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "If using a profile
credentials provider this parameter will set the p [...]
"secretKey": { "index": 16, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Amazon AWS Secret Key" },
- "trustAllCertificates": { "index": 17, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding [...]
- "useDefaultCredentialsProvider": { "index": 18, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
Cloudtrail client shoul [...]
- "useProfileCredentialsProvider": { "index": 19, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
Cloudtrail client shoul [...]
+ "sessionToken": { "index": 17, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Amazon AWS Session Token
used when the user needs to assume a IAM role" },
+ "trustAllCertificates": { "index": 18, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding [...]
+ "useDefaultCredentialsProvider": { "index": 19, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
Cloudtrail client shoul [...]
+ "useProfileCredentialsProvider": { "index": 20, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
Cloudtrail client shoul [...]
+ "useSessionCredentials": { "index": 21, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
CloudTrail client should expect to use S [...]
},
"headers": {
"CamelAwsCloudTrailEventId": { "index": 0, "kind": "header",
"displayName": "", "group": "consumer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The event ID of the cloud trail event
consumed.", "constantName":
"org.apache.camel.component.aws.cloudtrail.CloudtrailConstants#EVENT_ID" },
@@ -83,8 +85,10 @@
"accessKey": { "index": 29, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Amazon AWS Access Key" },
"profileCredentialsName": { "index": 30, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "If using a profile
credentials provider this parameter will set the [...]
"secretKey": { "index": 31, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Amazon AWS Secret Key" },
- "trustAllCertificates": { "index": 32, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overridin [...]
- "useDefaultCredentialsProvider": { "index": 33, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
Cloudtrail client shou [...]
- "useProfileCredentialsProvider": { "index": 34, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
Cloudtrail client shou [...]
+ "sessionToken": { "index": 32, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Amazon AWS Session Token
used when the user needs to assume a IAM role" },
+ "trustAllCertificates": { "index": 33, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overridin [...]
+ "useDefaultCredentialsProvider": { "index": 34, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
Cloudtrail client shou [...]
+ "useProfileCredentialsProvider": { "index": 35, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
Cloudtrail client shou [...]
+ "useSessionCredentials": { "index": 36, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
CloudTrail client should expect to use [...]
}
}
diff --git
a/components/camel-aws/camel-aws-cloudtrail/src/generated/java/org/apache/camel/component/aws/cloudtrail/CloudtrailComponentConfigurer.java
b/components/camel-aws/camel-aws-cloudtrail/src/generated/java/org/apache/camel/component/aws/cloudtrail/CloudtrailComponentConfigurer.java
index c5bd444bda3..225ff33a6a4 100644
---
a/components/camel-aws/camel-aws-cloudtrail/src/generated/java/org/apache/camel/component/aws/cloudtrail/CloudtrailComponentConfigurer.java
+++
b/components/camel-aws/camel-aws-cloudtrail/src/generated/java/org/apache/camel/component/aws/cloudtrail/CloudtrailComponentConfigurer.java
@@ -58,6 +58,8 @@ public class CloudtrailComponentConfigurer extends
PropertyConfigurerSupport imp
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 "trustallcertificates":
case "trustAllCertificates":
getOrCreateConfiguration(target).setTrustAllCertificates(property(camelContext,
boolean.class, value)); return true;
case "uriendpointoverride":
@@ -66,6 +68,8 @@ public class CloudtrailComponentConfigurer extends
PropertyConfigurerSupport imp
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;
default: return false;
}
}
@@ -108,6 +112,8 @@ public class CloudtrailComponentConfigurer extends
PropertyConfigurerSupport imp
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 "trustallcertificates":
case "trustAllCertificates": return boolean.class;
case "uriendpointoverride":
@@ -116,6 +122,8 @@ public class CloudtrailComponentConfigurer extends
PropertyConfigurerSupport imp
case "useDefaultCredentialsProvider": return boolean.class;
case "useprofilecredentialsprovider":
case "useProfileCredentialsProvider": return boolean.class;
+ case "usesessioncredentials":
+ case "useSessionCredentials": return boolean.class;
default: return null;
}
}
@@ -154,6 +162,8 @@ public class CloudtrailComponentConfigurer extends
PropertyConfigurerSupport imp
case "region": return getOrCreateConfiguration(target).getRegion();
case "secretkey":
case "secretKey": return
getOrCreateConfiguration(target).getSecretKey();
+ case "sessiontoken":
+ case "sessionToken": return
getOrCreateConfiguration(target).getSessionToken();
case "trustallcertificates":
case "trustAllCertificates": return
getOrCreateConfiguration(target).isTrustAllCertificates();
case "uriendpointoverride":
@@ -162,6 +172,8 @@ public class CloudtrailComponentConfigurer extends
PropertyConfigurerSupport imp
case "useDefaultCredentialsProvider": return
getOrCreateConfiguration(target).isUseDefaultCredentialsProvider();
case "useprofilecredentialsprovider":
case "useProfileCredentialsProvider": return
getOrCreateConfiguration(target).isUseProfileCredentialsProvider();
+ case "usesessioncredentials":
+ case "useSessionCredentials": return
getOrCreateConfiguration(target).isUseSessionCredentials();
default: return null;
}
}
diff --git
a/components/camel-aws/camel-aws-cloudtrail/src/generated/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpointConfigurer.java
b/components/camel-aws/camel-aws-cloudtrail/src/generated/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpointConfigurer.java
index c574a68de37..1e02fac1012 100644
---
a/components/camel-aws/camel-aws-cloudtrail/src/generated/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpointConfigurer.java
+++
b/components/camel-aws/camel-aws-cloudtrail/src/generated/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpointConfigurer.java
@@ -71,6 +71,8 @@ public class CloudtrailEndpointConfigurer extends
PropertyConfigurerSupport impl
case "secretKey":
target.getConfiguration().setSecretKey(property(camelContext,
java.lang.String.class, value)); return true;
case "sendemptymessagewhenidle":
case "sendEmptyMessageWhenIdle":
target.setSendEmptyMessageWhenIdle(property(camelContext, boolean.class,
value)); return true;
+ case "sessiontoken":
+ case "sessionToken":
target.getConfiguration().setSessionToken(property(camelContext,
java.lang.String.class, value)); return true;
case "startscheduler":
case "startScheduler": target.setStartScheduler(property(camelContext,
boolean.class, value)); return true;
case "timeunit":
@@ -85,6 +87,8 @@ public class CloudtrailEndpointConfigurer extends
PropertyConfigurerSupport impl
case "useFixedDelay": target.setUseFixedDelay(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;
default: return false;
}
}
@@ -147,6 +151,8 @@ public class CloudtrailEndpointConfigurer extends
PropertyConfigurerSupport impl
case "secretKey": return java.lang.String.class;
case "sendemptymessagewhenidle":
case "sendEmptyMessageWhenIdle": return boolean.class;
+ case "sessiontoken":
+ case "sessionToken": return java.lang.String.class;
case "startscheduler":
case "startScheduler": return boolean.class;
case "timeunit":
@@ -161,6 +167,8 @@ public class CloudtrailEndpointConfigurer extends
PropertyConfigurerSupport impl
case "useFixedDelay": return boolean.class;
case "useprofilecredentialsprovider":
case "useProfileCredentialsProvider": return boolean.class;
+ case "usesessioncredentials":
+ case "useSessionCredentials": return boolean.class;
default: return null;
}
}
@@ -219,6 +227,8 @@ public class CloudtrailEndpointConfigurer extends
PropertyConfigurerSupport impl
case "secretKey": return target.getConfiguration().getSecretKey();
case "sendemptymessagewhenidle":
case "sendEmptyMessageWhenIdle": return
target.isSendEmptyMessageWhenIdle();
+ case "sessiontoken":
+ case "sessionToken": return
target.getConfiguration().getSessionToken();
case "startscheduler":
case "startScheduler": return target.isStartScheduler();
case "timeunit":
@@ -233,6 +243,8 @@ public class CloudtrailEndpointConfigurer extends
PropertyConfigurerSupport impl
case "useFixedDelay": return target.isUseFixedDelay();
case "useprofilecredentialsprovider":
case "useProfileCredentialsProvider": return
target.getConfiguration().isUseProfileCredentialsProvider();
+ case "usesessioncredentials":
+ case "useSessionCredentials": return
target.getConfiguration().isUseSessionCredentials();
default: return null;
}
}
diff --git
a/components/camel-aws/camel-aws-cloudtrail/src/generated/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpointUriFactory.java
b/components/camel-aws/camel-aws-cloudtrail/src/generated/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpointUriFactory.java
index 7816073b6bd..89be95395cc 100644
---
a/components/camel-aws/camel-aws-cloudtrail/src/generated/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpointUriFactory.java
+++
b/components/camel-aws/camel-aws-cloudtrail/src/generated/java/org/apache/camel/component/aws/cloudtrail/CloudtrailEndpointUriFactory.java
@@ -21,7 +21,7 @@ public class CloudtrailEndpointUriFactory extends
org.apache.camel.support.compo
private static final Set<String> SECRET_PROPERTY_NAMES;
private static final Set<String> MULTI_VALUE_PREFIXES;
static {
- Set<String> props = new HashSet<>(35);
+ Set<String> props = new HashSet<>(37);
props.add("accessKey");
props.add("backoffErrorThreshold");
props.add("backoffIdleThreshold");
@@ -50,6 +50,7 @@ public class CloudtrailEndpointUriFactory extends
org.apache.camel.support.compo
props.add("schedulerProperties");
props.add("secretKey");
props.add("sendEmptyMessageWhenIdle");
+ props.add("sessionToken");
props.add("startScheduler");
props.add("timeUnit");
props.add("trustAllCertificates");
@@ -57,10 +58,12 @@ public class CloudtrailEndpointUriFactory extends
org.apache.camel.support.compo
props.add("useDefaultCredentialsProvider");
props.add("useFixedDelay");
props.add("useProfileCredentialsProvider");
+ props.add("useSessionCredentials");
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);
Set<String> prefixes = new HashSet<>(1);
prefixes.add("scheduler.");
diff --git
a/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/org/apache/camel/component/aws/cloudtrail/aws-cloudtrail.json
b/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/org/apache/camel/component/aws/cloudtrail/aws-cloudtrail.json
index 57be7d2e3f6..55720d588a0 100644
---
a/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/org/apache/camel/component/aws/cloudtrail/aws-cloudtrail.json
+++
b/components/camel-aws/camel-aws-cloudtrail/src/generated/resources/org/apache/camel/component/aws/cloudtrail/aws-cloudtrail.json
@@ -40,9 +40,11 @@
"accessKey": { "index": 14, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Amazon AWS Access Key" },
"profileCredentialsName": { "index": 15, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "If using a profile
credentials provider this parameter will set the p [...]
"secretKey": { "index": 16, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Amazon AWS Secret Key" },
- "trustAllCertificates": { "index": 17, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding [...]
- "useDefaultCredentialsProvider": { "index": 18, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
Cloudtrail client shoul [...]
- "useProfileCredentialsProvider": { "index": 19, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
Cloudtrail client shoul [...]
+ "sessionToken": { "index": 17, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Amazon AWS Session Token
used when the user needs to assume a IAM role" },
+ "trustAllCertificates": { "index": 18, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding [...]
+ "useDefaultCredentialsProvider": { "index": 19, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
Cloudtrail client shoul [...]
+ "useProfileCredentialsProvider": { "index": 20, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
Cloudtrail client shoul [...]
+ "useSessionCredentials": { "index": 21, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
CloudTrail client should expect to use S [...]
},
"headers": {
"CamelAwsCloudTrailEventId": { "index": 0, "kind": "header",
"displayName": "", "group": "consumer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The event ID of the cloud trail event
consumed.", "constantName":
"org.apache.camel.component.aws.cloudtrail.CloudtrailConstants#EVENT_ID" },
@@ -83,8 +85,10 @@
"accessKey": { "index": 29, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Amazon AWS Access Key" },
"profileCredentialsName": { "index": 30, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "If using a profile
credentials provider this parameter will set the [...]
"secretKey": { "index": 31, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Amazon AWS Secret Key" },
- "trustAllCertificates": { "index": 32, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overridin [...]
- "useDefaultCredentialsProvider": { "index": 33, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
Cloudtrail client shou [...]
- "useProfileCredentialsProvider": { "index": 34, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
Cloudtrail client shou [...]
+ "sessionToken": { "index": 32, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Amazon AWS Session Token
used when the user needs to assume a IAM role" },
+ "trustAllCertificates": { "index": 33, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overridin [...]
+ "useDefaultCredentialsProvider": { "index": 34, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
Cloudtrail client shou [...]
+ "useProfileCredentialsProvider": { "index": 35, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
Cloudtrail client shou [...]
+ "useSessionCredentials": { "index": 36, "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.aws.cloudtrail.CloudtrailConfiguration",
"configurationField": "configuration", "description": "Set whether the
CloudTrail client should expect to use [...]
}
}
diff --git
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailComponent.java
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailComponent.java
index 7c15354244a..7d03f95257a 100644
---
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailComponent.java
+++
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailComponent.java
@@ -46,10 +46,11 @@ public class CloudtrailComponent extends
HealthCheckComponent {
CloudtrailEndpoint endpoint = new CloudtrailEndpoint(uri,
configuration, this);
setProperties(endpoint, parameters);
if (!configuration.isUseDefaultCredentialsProvider() &&
!configuration.isUseProfileCredentialsProvider()
+ && !configuration.isUseSessionCredentials()
&& configuration.getCloudTrailClient() == null
&& (configuration.getAccessKey() == null ||
configuration.getSecretKey() == null)) {
throw new IllegalArgumentException(
- "useDefaultCredentialsProvider is set to false,
useProfileCredentialsProvider is set to false, cloudTrailClient or accessKey
and secretKey must be specified");
+ "useDefaultCredentialsProvider is set to false,
useProfileCredentialsProvider is set to false, useSessionCredentials is set to
false, cloudTrailClient or accessKey and secretKey must be specified");
}
return endpoint;
}
diff --git
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConfiguration.java
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConfiguration.java
index d0c25ce67cc..4dce2dc5f2b 100644
---
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConfiguration.java
+++
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/CloudtrailConfiguration.java
@@ -34,6 +34,11 @@ public class CloudtrailConfiguration implements Cloneable {
private String accessKey;
@UriParam(label = "security", secret = true, description = "Amazon AWS
Secret Key")
private String secretKey;
+
+ @UriParam(label = "security", secret = true,
+ description = "Amazon AWS Session Token used when the user needs
to assume a IAM role")
+ private String sessionToken;
+
@UriParam(enums =
"ap-south-2,ap-south-1,eu-south-1,eu-south-2,us-gov-east-1,me-central-1,il-central-1,ca-central-1,eu-central-1,us-iso-west-1,eu-central-2,us-west-1,us-west-2,af-south-1,eu-north-1,eu-west-3,eu-west-2,eu-west-1,ap-northeast-3,ap-northeast-2,ap-northeast-1,me-south-1,sa-east-1,ap-east-1,cn-north-1,us-gov-west-1,ap-southeast-1,ap-southeast-2,us-iso-east-1,ap-southeast-3,ap-southeast-4,us-east-1,us-east-2,cn-northwest-1,us-isob-east-1,aws-global,aws-cn-global,aws-us-gov
[...]
description = "The region in which Cloudtrail client needs to
work. When using this parameter, the configuration will expect the lowercase
name of the "
+ "region (for example ap-east-1) You'll need to
use the name Region.EU_WEST_1.id()")
@@ -67,6 +72,12 @@ public class CloudtrailConfiguration implements Cloneable {
@UriParam(label = "security",
description = "Set whether the Cloudtrail client should expect
to load credentials through a profile credentials provider.")
private boolean useProfileCredentialsProvider;
+
+ @UriParam(label = "security",
+ description = "Set whether the CloudTrail 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 CloudTrail.")
+ private boolean useSessionCredentials;
@UriParam(label = "security",
description = "If using a profile credentials provider this
parameter will set the profile name.")
private String profileCredentialsName;
@@ -111,6 +122,14 @@ public class CloudtrailConfiguration implements Cloneable {
this.secretKey = secretKey;
}
+ public String getSessionToken() {
+ return sessionToken;
+ }
+
+ public void setSessionToken(String sessionToken) {
+ this.sessionToken = sessionToken;
+ }
+
public String getRegion() {
return region;
}
@@ -191,6 +210,14 @@ public class CloudtrailConfiguration implements Cloneable {
this.useProfileCredentialsProvider = useProfileCredentialsProvider;
}
+ public boolean isUseSessionCredentials() {
+ return useSessionCredentials;
+ }
+
+ public void setUseSessionCredentials(boolean useSessionCredentials) {
+ this.useSessionCredentials = useSessionCredentials;
+ }
+
public String getProfileCredentialsName() {
return profileCredentialsName;
}
diff --git
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/CloudtrailClientFactory.java
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/CloudtrailClientFactory.java
index c3a84425edf..83fed0000fd 100644
---
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/CloudtrailClientFactory.java
+++
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/CloudtrailClientFactory.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.aws.cloudtrail.client;
import org.apache.camel.component.aws.cloudtrail.CloudtrailConfiguration;
import
org.apache.camel.component.aws.cloudtrail.client.impl.CloudtrailClientIAMOptimizedImpl;
import
org.apache.camel.component.aws.cloudtrail.client.impl.CloudtrailClientIAMProfileOptimizedImpl;
+import
org.apache.camel.component.aws.cloudtrail.client.impl.CloudtrailClientSessionTokenImpl;
import
org.apache.camel.component.aws.cloudtrail.client.impl.CloudtrailClientStandardImpl;
/**
@@ -40,6 +41,8 @@ public final class CloudtrailClientFactory {
return new CloudtrailClientIAMOptimizedImpl(configuration);
} else if
(Boolean.TRUE.equals(configuration.isUseProfileCredentialsProvider())) {
return new CloudtrailClientIAMProfileOptimizedImpl(configuration);
+ } else if
(Boolean.TRUE.equals(configuration.isUseSessionCredentials())) {
+ return new CloudtrailClientSessionTokenImpl(configuration);
} else {
return new CloudtrailClientStandardImpl(configuration);
}
diff --git
a/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/impl/CloudtrailClientSessionTokenImpl.java
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/impl/CloudtrailClientSessionTokenImpl.java
new file mode 100644
index 00000000000..9a0128ba3af
--- /dev/null
+++
b/components/camel-aws/camel-aws-cloudtrail/src/main/java/org/apache/camel/component/aws/cloudtrail/client/impl/CloudtrailClientSessionTokenImpl.java
@@ -0,0 +1,110 @@
+/*
+ * 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.aws.cloudtrail.client.impl;
+
+import java.net.URI;
+
+import org.apache.camel.component.aws.cloudtrail.CloudtrailConfiguration;
+import
org.apache.camel.component.aws.cloudtrail.client.CloudtrailInternalClient;
+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.cloudtrail.CloudTrailClient;
+import software.amazon.awssdk.services.cloudtrail.CloudTrailClientBuilder;
+import software.amazon.awssdk.utils.AttributeMap;
+
+/**
+ * Manage an AWS Cloudtrail client for all users to use. This implementation
is for local instances to use a static and
+ * solid credential set.
+ */
+public class CloudtrailClientSessionTokenImpl implements
CloudtrailInternalClient {
+ private static final Logger LOG =
LoggerFactory.getLogger(CloudtrailClientStandardImpl.class);
+ private CloudtrailConfiguration configuration;
+
+ /**
+ * Constructor that uses the config file.
+ */
+ public CloudtrailClientSessionTokenImpl(CloudtrailConfiguration
configuration) {
+ LOG.trace("Creating an AWS Cloudtrail manager using static
credentials.");
+ this.configuration = configuration;
+ }
+
+ /**
+ * Getting the Cloudtrail client that is used.
+ *
+ * @return Amazon Cloudtrail Client.
+ */
+ @Override
+ public CloudTrailClient getCloudtrailClient() {
+ CloudTrailClient client = null;
+ CloudTrailClientBuilder clientBuilder = CloudTrailClient.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) {
+ 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-aws-cloudtrail/src/test/java/org/apache/camel/component/aws/cloudtrail/CloudtrailClientFactoryTest.java
b/components/camel-aws/camel-aws-cloudtrail/src/test/java/org/apache/camel/component/aws/cloudtrail/CloudtrailClientFactoryTest.java
index 027f929b770..4779eee8c13 100644
---
a/components/camel-aws/camel-aws-cloudtrail/src/test/java/org/apache/camel/component/aws/cloudtrail/CloudtrailClientFactoryTest.java
+++
b/components/camel-aws/camel-aws-cloudtrail/src/test/java/org/apache/camel/component/aws/cloudtrail/CloudtrailClientFactoryTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.aws.cloudtrail;
import
org.apache.camel.component.aws.cloudtrail.client.CloudtrailClientFactory;
import
org.apache.camel.component.aws.cloudtrail.client.CloudtrailInternalClient;
import
org.apache.camel.component.aws.cloudtrail.client.impl.CloudtrailClientIAMOptimizedImpl;
+import
org.apache.camel.component.aws.cloudtrail.client.impl.CloudtrailClientSessionTokenImpl;
import
org.apache.camel.component.aws.cloudtrail.client.impl.CloudtrailClientStandardImpl;
import org.junit.jupiter.api.Test;
@@ -48,4 +49,12 @@ public class CloudtrailClientFactoryTest {
CloudtrailInternalClient cloudtrailClient =
CloudtrailClientFactory.getCloudtrailClient(cloudtrailConf);
assertTrue(cloudtrailClient instanceof
CloudtrailClientIAMOptimizedImpl);
}
+
+ @Test
+ public void getIAMSessionTokenCloudtrailClient() {
+ CloudtrailConfiguration cloudtrailConf = new CloudtrailConfiguration();
+ cloudtrailConf.setUseSessionCredentials(true);
+ CloudtrailInternalClient cloudtrailClient =
CloudtrailClientFactory.getCloudtrailClient(cloudtrailConf);
+ assertTrue(cloudtrailClient instanceof
CloudtrailClientSessionTokenImpl);
+ }
}
