This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 48dc01623c6 Regen
48dc01623c6 is described below
commit 48dc01623c6b5947b7acb96f36412e6e301f3ddd
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Jan 18 07:23:09 2024 +0100
Regen
---
.../springboot/catalog/components/aws2-s3.json | 16 ++++++++-----
.../springboot/catalog/components/jsonata.json | 2 +-
.../src/main/docs/aws2-s3.json | 13 +++++++++++
.../springboot/AWS2S3ComponentConfiguration.java | 26 ++++++++++++++++++++++
4 files changed, 50 insertions(+), 7 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
index 4ba1701a788..f414e7263fd 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
@@ -77,9 +77,11 @@
"accessKey": { "index": 51, "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
"profileCredentialsName": { "index": 52, "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.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "If using a profile
credentials provider this parameter will set the profile name" },
"secretKey": { "index": 53, "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" },
- "trustAllCertificates": { "index": 54, "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.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" },
- "useDefaultCredentialsProvider": { "index": 55, "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to
load cr [...]
- "useProfileCredentialsProvider": { "index": 56, "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to
load cr [...]
+ "sessionToken": { "index": 54, "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Amazon AWS Session Token used when the user
needs to assume a IAM role" },
+ "trustAllCertificates": { "index": 55, "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.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" },
+ "useDefaultCredentialsProvider": { "index": 56, "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to
load cr [...]
+ "useProfileCredentialsProvider": { "index": 57, "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to
load cr [...]
+ "useSessionCredentials": { "index": 58, "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.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "Set whether the S3
client should expect to use Session Credentials. [...]
},
"headers": {
"CamelAwsS3BucketName": { "index": 0, "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The bucket Name which this object will be stored or
which will be used for the current operation or in which this object is
contained.", "constantName":
"org.apache.camel.component.aws2.s3.AWS2S3Constants#BUCKET_NAME" },
@@ -185,8 +187,10 @@
"accessKey": { "index": 68, "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
"profileCredentialsName": { "index": 69, "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.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "If using a profile
credentials provider this parameter will set the profile name" },
"secretKey": { "index": 70, "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" },
- "trustAllCertificates": { "index": 71, "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.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" },
- "useDefaultCredentialsProvider": { "index": 72, "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to
load c [...]
- "useProfileCredentialsProvider": { "index": 73, "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to
load c [...]
+ "sessionToken": { "index": 71, "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Amazon AWS Session Token used when the user
needs to assume a IAM role" },
+ "trustAllCertificates": { "index": 72, "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.s3.AWS2S3Configuration",
"configurationField": "configuration", "description": "If we want to trust all
certificates in case of overriding the endpoint" },
+ "useDefaultCredentialsProvider": { "index": 73, "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to
load c [...]
+ "useProfileCredentialsProvider": { "index": 74, "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to
load c [...]
+ "useSessionCredentials": { "index": 75, "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.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Set whether the S3 client should expect to use
Session Credentials [...]
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jsonata.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jsonata.json
index 13e2538cc94..ce315b8360f 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jsonata.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jsonata.json
@@ -20,7 +20,7 @@
"consumerOnly": false,
"producerOnly": true,
"lenientProperties": false,
- "remote": true
+ "remote": false
},
"componentProperties": {
"lazyStartProducer": { "index": 0, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
diff --git
a/components-starter/camel-aws2-s3-starter/src/main/docs/aws2-s3.json
b/components-starter/camel-aws2-s3-starter/src/main/docs/aws2-s3.json
index 644f79b563a..c34773a60c0 100644
--- a/components-starter/camel-aws2-s3-starter/src/main/docs/aws2-s3.json
+++ b/components-starter/camel-aws2-s3-starter/src/main/docs/aws2-s3.json
@@ -327,6 +327,12 @@
"description": "Amazon AWS Secret Key",
"sourceType":
"org.apache.camel.component.aws2.s3.springboot.AWS2S3ComponentConfiguration"
},
+ {
+ "name": "camel.component.aws2-s3.session-token",
+ "type": "java.lang.String",
+ "description": "Amazon AWS Session Token used when the user needs to
assume a IAM role",
+ "sourceType":
"org.apache.camel.component.aws2.s3.springboot.AWS2S3ComponentConfiguration"
+ },
{
"name": "camel.component.aws2-s3.storage-class",
"type": "java.lang.String",
@@ -393,6 +399,13 @@
"description": "Define if SSE S3 must be used or not",
"sourceType":
"org.apache.camel.component.aws2.s3.springboot.AWS2S3ComponentConfiguration",
"defaultValue": false
+ },
+ {
+ "name": "camel.component.aws2-s3.use-session-credentials",
+ "type": "java.lang.Boolean",
+ "description": "Set whether the S3 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 S3.",
+ "sourceType":
"org.apache.camel.component.aws2.s3.springboot.AWS2S3ComponentConfiguration",
+ "defaultValue": false
}
],
"hints": []
diff --git
a/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
b/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
index 96811fbe090..f0585d0021a 100644
---
a/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
+++
b/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
@@ -339,6 +339,10 @@ public class AWS2S3ComponentConfiguration
* Amazon AWS Secret Key
*/
private String secretKey;
+ /**
+ * Amazon AWS Session Token used when the user needs to assume a IAM role
+ */
+ private String sessionToken;
/**
* If we want to trust all certificates in case of overriding the endpoint
*/
@@ -353,6 +357,12 @@ public class AWS2S3ComponentConfiguration
* profile credentials provider.
*/
private Boolean useProfileCredentialsProvider = false;
+ /**
+ * Set whether the S3 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 S3.
+ */
+ private Boolean useSessionCredentials = false;
public Boolean getAutoCreateBucket() {
return autoCreateBucket;
@@ -786,6 +796,14 @@ public class AWS2S3ComponentConfiguration
this.secretKey = secretKey;
}
+ public String getSessionToken() {
+ return sessionToken;
+ }
+
+ public void setSessionToken(String sessionToken) {
+ this.sessionToken = sessionToken;
+ }
+
public Boolean getTrustAllCertificates() {
return trustAllCertificates;
}
@@ -811,4 +829,12 @@ public class AWS2S3ComponentConfiguration
Boolean useProfileCredentialsProvider) {
this.useProfileCredentialsProvider = useProfileCredentialsProvider;
}
+
+ public Boolean getUseSessionCredentials() {
+ return useSessionCredentials;
+ }
+
+ public void setUseSessionCredentials(Boolean useSessionCredentials) {
+ this.useSessionCredentials = useSessionCredentials;
+ }
}
\ No newline at end of file
