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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push: new 666b380a221 Regen 666b380a221 is described below commit 666b380a22188b5847451533ef16efca5f7f5096 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Tue Feb 6 11:41:06 2024 +0100 Regen Signed-off-by: Andrea Cosentino <anco...@gmail.com> --- .../springboot/catalog/components/aws2-eks.json | 8 +++++-- .../src/main/docs/aws2-eks.json | 13 +++++++++++ .../eks/springboot/EKS2ComponentConfiguration.java | 26 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-eks.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-eks.json index 90cf40149db..23bbc43a146 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-eks.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-eks.json @@ -42,7 +42,9 @@ "proxyProtocol": { "index": 16, "kind": "property", "displayName": "Proxy Protocol", "group": "proxy", "label": "proxy", "required": false, "type": "object", "javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when [...] "accessKey": { "index": 17, "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.eks.EKS2Configuration", "configurationField": "configuration", "description": "Amazon AWS Access Key" }, "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.eks.EKS2Configuration", "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.eks.EKS2Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" } + "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.eks.EKS2Configuration", "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.eks.EKS2Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" }, + "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.aws2.eks.EKS2Configuration", "configurationField": "configuration", "description": "Set whether the EKS client should expect to use Session Credentials. [...] }, "headers": { "CamelAwsEKSOperation": { "index": 0, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The operation we want to perform", "constantName": "org.apache.camel.component.aws2.eks.EKS2Constants#OPERATION" }, @@ -69,6 +71,8 @@ "proxyProtocol": { "index": 13, "kind": "parameter", "displayName": "Proxy Protocol", "group": "proxy", "label": "proxy", "required": false, "type": "object", "javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when [...] "accessKey": { "index": 14, "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.eks.EKS2Configuration", "configurationField": "configuration", "description": "Amazon AWS Access Key" }, "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.eks.EKS2Configuration", "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.eks.EKS2Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" } + "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.eks.EKS2Configuration", "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.eks.EKS2Configuration", "configurationField": "configuration", "description": "If we want to trust all certificates in case of overriding the endpoint" }, + "useSessionCredentials": { "index": 18, "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.eks.EKS2Configuration", "configurationField": "configuration", "description": "Set whether the EKS client should expect to use Session Credentials [...] } } diff --git a/components-starter/camel-aws2-eks-starter/src/main/docs/aws2-eks.json b/components-starter/camel-aws2-eks-starter/src/main/docs/aws2-eks.json index fde57d8c7df..6982982bbe7 100644 --- a/components-starter/camel-aws2-eks-starter/src/main/docs/aws2-eks.json +++ b/components-starter/camel-aws2-eks-starter/src/main/docs/aws2-eks.json @@ -127,6 +127,12 @@ "description": "Amazon AWS Secret Key", "sourceType": "org.apache.camel.component.aws2.eks.springboot.EKS2ComponentConfiguration" }, + { + "name": "camel.component.aws2-eks.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.eks.springboot.EKS2ComponentConfiguration" + }, { "name": "camel.component.aws2-eks.trust-all-certificates", "type": "java.lang.Boolean", @@ -153,6 +159,13 @@ "description": "Set whether the EKS client should expect to load credentials through a profile credentials provider.", "sourceType": "org.apache.camel.component.aws2.eks.springboot.EKS2ComponentConfiguration", "defaultValue": false + }, + { + "name": "camel.component.aws2-eks.use-session-credentials", + "type": "java.lang.Boolean", + "description": "Set whether the EKS 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 EKS.", + "sourceType": "org.apache.camel.component.aws2.eks.springboot.EKS2ComponentConfiguration", + "defaultValue": false } ], "hints": [] diff --git a/components-starter/camel-aws2-eks-starter/src/main/java/org/apache/camel/component/aws2/eks/springboot/EKS2ComponentConfiguration.java b/components-starter/camel-aws2-eks-starter/src/main/java/org/apache/camel/component/aws2/eks/springboot/EKS2ComponentConfiguration.java index 7415e12e33c..5ba9844220f 100644 --- a/components-starter/camel-aws2-eks-starter/src/main/java/org/apache/camel/component/aws2/eks/springboot/EKS2ComponentConfiguration.java +++ b/components-starter/camel-aws2-eks-starter/src/main/java/org/apache/camel/component/aws2/eks/springboot/EKS2ComponentConfiguration.java @@ -141,10 +141,20 @@ public class EKS2ComponentConfiguration * 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 */ private Boolean trustAllCertificates = false; + /** + * Set whether the EKS 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 EKS. + */ + private Boolean useSessionCredentials = false; public EKS2Configuration getConfiguration() { return configuration; @@ -300,6 +310,14 @@ public class EKS2ComponentConfiguration this.secretKey = secretKey; } + public String getSessionToken() { + return sessionToken; + } + + public void setSessionToken(String sessionToken) { + this.sessionToken = sessionToken; + } + public Boolean getTrustAllCertificates() { return trustAllCertificates; } @@ -307,4 +325,12 @@ public class EKS2ComponentConfiguration public void setTrustAllCertificates(Boolean trustAllCertificates) { this.trustAllCertificates = trustAllCertificates; } + + public Boolean getUseSessionCredentials() { + return useSessionCredentials; + } + + public void setUseSessionCredentials(Boolean useSessionCredentials) { + this.useSessionCredentials = useSessionCredentials; + } } \ No newline at end of file