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.git
The following commit(s) were added to refs/heads/main by this push:
new 5035a684d09d CAMEL-24363: camel-aws - iam doStop, eks catalog
defaultValue, parameter-store value header (#25389)
5035a684d09d is described below
commit 5035a684d09d4ae4241b4d8c9d065aac42857767
Author: Andrea Cosentino <[email protected]>
AuthorDate: Thu Aug 6 20:55:17 2026 +0200
CAMEL-24363: camel-aws - iam doStop, eks catalog defaultValue,
parameter-store value header (#25389)
* CAMEL-24363: camel-aws - iam endpoint doStop, eks catalog defaultValue,
parameter-store value header
Three small independent fixes found during the camel-aws review:
- IAM2Endpoint.doStop() now calls super.doStop(). Every other aws2 endpoint
(including the paired KMS2Endpoint) calls it; IAM was the only one
skipping
the base ScheduledPollEndpoint/DefaultEndpoint stop logic.
- EKS2Configuration.profileCredentialsName had a copy-pasted
@UriParam(defaultValue = "false") on a String option, which polluted the
generated catalog with a misleading default. It now matches ECS
(@UriParam(label = "security")) and the catalog is regenerated.
- ParameterStoreProducer.putParameter now honors the documented
CamelAwsParameterStoreValue header when present (falling back to the
message
body), so the advertised producer header is no longer a no-op. Adds a
test.
Co-Authored-By: Claude Opus 4.8 <[email protected]>
Signed-off-by: Andrea Cosentino <[email protected]>
* chore: regen catalog and dsl for aws2-eks
Co-Authored-By: Claude Opus 4.6 <[email protected]>
Signed-off-by: Claus Ibsen <[email protected]>
---------
Signed-off-by: Andrea Cosentino <[email protected]>
Signed-off-by: Claus Ibsen <[email protected]>
Co-authored-by: Claude Opus 4.8 <[email protected]>
Co-authored-by: Claus Ibsen <[email protected]>
---
.../apache/camel/catalog/components/aws2-eks.json | 48 ++++++++---------
.../camel-aws/camel-aws-parameter-store/pom.xml | 5 ++
.../aws/parameterstore/ParameterStoreProducer.java | 5 +-
.../parameterstore/ParameterStoreProducerTest.java | 63 ++++++++++++++++++++++
.../apache/camel/component/aws2/eks/aws2-eks.json | 48 ++++++++---------
.../component/aws2/eks/EKS2Configuration.java | 2 +-
.../camel/component/aws2/iam/IAM2Endpoint.java | 1 +
.../dsl/Aws2EksComponentBuilderFactory.java | 36 ++++++-------
.../endpoint/dsl/EKS2EndpointBuilderFactory.java | 31 ++++++-----
9 files changed, 154 insertions(+), 85 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-eks.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-eks.json
index 52d088a354f5..dd98a342712f 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-eks.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-eks.json
@@ -29,19 +29,19 @@
"operation": { "index": 2, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "enum", "javaType":
"org.apache.camel.component.aws2.eks.EKS2Operations", "enum": [ "listClusters",
"describeCluster", "createCluster", "deleteCluster" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.eks.EKS2Configuration",
"configurationField": "configuration", [...]
"overrideEndpoint": { "index": 3, "kind": "property", "displayName":
"Override Endpoint", "group": "producer", "label": "", "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 the need for overriding the endpoint. This
option needs to be used in combination wi [...]
"pojoRequest": { "index": 4, "kind": "property", "displayName": "Pojo
Request", "group": "producer", "label": "", "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 use a POJO request as body or
not" },
- "profileCredentialsName": { "index": 5, "kind": "property", "displayName":
"Profile Credentials Name", "group": "producer", "label": "", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "false",
"configurationClass": "org.apache.camel.component.aws2.eks.EKS2Configuration",
"configurationField": "configuration", "description": "If using a profile
credentials provider, this parameter will set [...]
- "region": { "index": 6, "kind": "property", "displayName": "Region",
"group": "producer", "label": "", "required": false, "type": "enum",
"javaType": "java.lang.String", "enum": [ "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",
"eu-isoe-west-1", "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-north [...]
- "uriEndpointOverride": { "index": 7, "kind": "property", "displayName":
"Uri Endpoint Override", "group": "producer", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpoi [...]
- "useDefaultCredentialsProvider": { "index": 8, "kind": "property",
"displayName": "Use Default Credentials Provider", "group": "producer",
"label": "", "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
load credentials [...]
- "useProfileCredentialsProvider": { "index": 9, "kind": "property",
"displayName": "Use Profile Credentials Provider", "group": "producer",
"label": "", "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
load credentials [...]
- "autowiredEnabled": { "index": 10, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching [...]
- "eksClient": { "index": 11, "kind": "property", "displayName": "Eks
Client", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "software.amazon.awssdk.services.eks.EksClient",
"deprecated": false, "deprecationNote": "", "autowired": true, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.eks.EKS2Configuration",
"configurationField": "configuration", "description": "To use an existing
configured AWS EKS client" },
- "healthCheckConsumerEnabled": { "index": 12, "kind": "property",
"displayName": "Health Check Consumer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all consumer based health checks
from this component" },
- "healthCheckProducerEnabled": { "index": 13, "kind": "property",
"displayName": "Health Check Producer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all producer based health checks
from this component. Notice: Camel has by default disabled all producer based
health-checks. You can turn on produce [...]
- "proxyHost": { "index": 14, "kind": "property", "displayName": "Proxy
Host", "group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "To define a proxy host when instantiating the
EKS client" },
- "proxyPort": { "index": 15, "kind": "property", "displayName": "Proxy
Port", "group": "proxy", "label": "proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "To define a proxy port when instantiating the
EKS client" },
- "proxyProtocol": { "index": 16, "kind": "property", "displayName": "Proxy
Protocol", "group": "proxy", "label": "proxy", "required": false, "type":
"enum", "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 in [...]
- "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, "security": "secret", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
+ "region": { "index": 5, "kind": "property", "displayName": "Region",
"group": "producer", "label": "", "required": false, "type": "enum",
"javaType": "java.lang.String", "enum": [ "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",
"eu-isoe-west-1", "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-north [...]
+ "uriEndpointOverride": { "index": 6, "kind": "property", "displayName":
"Uri Endpoint Override", "group": "producer", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpoi [...]
+ "useDefaultCredentialsProvider": { "index": 7, "kind": "property",
"displayName": "Use Default Credentials Provider", "group": "producer",
"label": "", "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
load credentials [...]
+ "useProfileCredentialsProvider": { "index": 8, "kind": "property",
"displayName": "Use Profile Credentials Provider", "group": "producer",
"label": "", "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
load credentials [...]
+ "autowiredEnabled": { "index": 9, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
+ "eksClient": { "index": 10, "kind": "property", "displayName": "Eks
Client", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "software.amazon.awssdk.services.eks.EksClient",
"deprecated": false, "deprecationNote": "", "autowired": true, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.eks.EKS2Configuration",
"configurationField": "configuration", "description": "To use an existing
configured AWS EKS client" },
+ "healthCheckConsumerEnabled": { "index": 11, "kind": "property",
"displayName": "Health Check Consumer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all consumer based health checks
from this component" },
+ "healthCheckProducerEnabled": { "index": 12, "kind": "property",
"displayName": "Health Check Producer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all producer based health checks
from this component. Notice: Camel has by default disabled all producer based
health-checks. You can turn on produce [...]
+ "proxyHost": { "index": 13, "kind": "property", "displayName": "Proxy
Host", "group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "To define a proxy host when instantiating the
EKS client" },
+ "proxyPort": { "index": 14, "kind": "property", "displayName": "Proxy
Port", "group": "proxy", "label": "proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "To define a proxy port when instantiating the
EKS client" },
+ "proxyProtocol": { "index": 15, "kind": "property", "displayName": "Proxy
Protocol", "group": "proxy", "label": "proxy", "required": false, "type":
"enum", "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 in [...]
+ "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, "security": "secret", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "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.eks.EKS2Configuration",
"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, "security": "secret", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" },
"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, "security": "secret", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Session Token used when the user
needs to assume an 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, "security": "insecure:ssl",
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "If we want to trust all certificates in ca
[...]
@@ -63,17 +63,17 @@
"operation": { "index": 1, "kind": "parameter", "displayName":
"Operation", "group": "producer", "label": "", "required": true, "type":
"enum", "javaType": "org.apache.camel.component.aws2.eks.EKS2Operations",
"enum": [ "listClusters", "describeCluster", "createCluster", "deleteCluster"
], "deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration" [...]
"overrideEndpoint": { "index": 2, "kind": "parameter", "displayName":
"Override Endpoint", "group": "producer", "label": "", "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 the need for overriding the endpoint. This
option needs to be used in combination w [...]
"pojoRequest": { "index": 3, "kind": "parameter", "displayName": "Pojo
Request", "group": "producer", "label": "", "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 use a POJO request as body or
not" },
- "profileCredentialsName": { "index": 4, "kind": "parameter",
"displayName": "Profile Credentials Name", "group": "producer", "label": "",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"false", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "If using a profile credentials provider, this
parameter will set [...]
- "region": { "index": 5, "kind": "parameter", "displayName": "Region",
"group": "producer", "label": "", "required": false, "type": "enum",
"javaType": "java.lang.String", "enum": [ "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",
"eu-isoe-west-1", "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-nort [...]
- "uriEndpointOverride": { "index": 6, "kind": "parameter", "displayName":
"Uri Endpoint Override", "group": "producer", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpo [...]
- "useDefaultCredentialsProvider": { "index": 7, "kind": "parameter",
"displayName": "Use Default Credentials Provider", "group": "producer",
"label": "", "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
load credential [...]
- "useProfileCredentialsProvider": { "index": 8, "kind": "parameter",
"displayName": "Use Profile Credentials Provider", "group": "producer",
"label": "", "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
load credential [...]
- "lazyStartProducer": { "index": 9, "kind": "parameter", "displayName":
"Lazy Start Producer", "group": "producer (advanced)", "label":
"producer,advanced", "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 produc [...]
- "eksClient": { "index": 10, "kind": "parameter", "displayName": "Eks
Client", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "software.amazon.awssdk.services.eks.EksClient",
"deprecated": false, "deprecationNote": "", "autowired": true, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.eks.EKS2Configuration",
"configurationField": "configuration", "description": "To use an existing
configured AWS EKS client" },
- "proxyHost": { "index": 11, "kind": "parameter", "displayName": "Proxy
Host", "group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "To define a proxy host when instantiating the
EKS client" },
- "proxyPort": { "index": 12, "kind": "parameter", "displayName": "Proxy
Port", "group": "proxy", "label": "proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "To define a proxy port when instantiating the
EKS client" },
- "proxyProtocol": { "index": 13, "kind": "parameter", "displayName": "Proxy
Protocol", "group": "proxy", "label": "proxy", "required": false, "type":
"enum", "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 i [...]
- "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, "security": "secret", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
+ "region": { "index": 4, "kind": "parameter", "displayName": "Region",
"group": "producer", "label": "", "required": false, "type": "enum",
"javaType": "java.lang.String", "enum": [ "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",
"eu-isoe-west-1", "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-nort [...]
+ "uriEndpointOverride": { "index": 5, "kind": "parameter", "displayName":
"Uri Endpoint Override", "group": "producer", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpo [...]
+ "useDefaultCredentialsProvider": { "index": 6, "kind": "parameter",
"displayName": "Use Default Credentials Provider", "group": "producer",
"label": "", "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
load credential [...]
+ "useProfileCredentialsProvider": { "index": 7, "kind": "parameter",
"displayName": "Use Profile Credentials Provider", "group": "producer",
"label": "", "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
load credential [...]
+ "lazyStartProducer": { "index": 8, "kind": "parameter", "displayName":
"Lazy Start Producer", "group": "producer (advanced)", "label":
"producer,advanced", "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 produc [...]
+ "eksClient": { "index": 9, "kind": "parameter", "displayName": "Eks
Client", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "software.amazon.awssdk.services.eks.EksClient",
"deprecated": false, "deprecationNote": "", "autowired": true, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.eks.EKS2Configuration",
"configurationField": "configuration", "description": "To use an existing
configured AWS EKS client" },
+ "proxyHost": { "index": 10, "kind": "parameter", "displayName": "Proxy
Host", "group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "To define a proxy host when instantiating the
EKS client" },
+ "proxyPort": { "index": 11, "kind": "parameter", "displayName": "Proxy
Port", "group": "proxy", "label": "proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "To define a proxy port when instantiating the
EKS client" },
+ "proxyProtocol": { "index": 12, "kind": "parameter", "displayName": "Proxy
Protocol", "group": "proxy", "label": "proxy", "required": false, "type":
"enum", "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 i [...]
+ "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, "security": "secret", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "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.eks.EKS2Configuration",
"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, "security": "secret", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" },
"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, "security": "secret", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Session Token used when the user
needs to assume an 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, "security": "insecure:ssl",
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "If we want to trust all certificates in c [...]
diff --git a/components/camel-aws/camel-aws-parameter-store/pom.xml
b/components/camel-aws/camel-aws-parameter-store/pom.xml
index 5d8de6a29774..f79ceaea5a7a 100644
--- a/components/camel-aws/camel-aws-parameter-store/pom.xml
+++ b/components/camel-aws/camel-aws-parameter-store/pom.xml
@@ -72,6 +72,11 @@
<artifactId>camel-test-spring-junit6</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- test infra -->
<dependency>
diff --git
a/components/camel-aws/camel-aws-parameter-store/src/main/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducer.java
b/components/camel-aws/camel-aws-parameter-store/src/main/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducer.java
index cfa2fa6e8184..da85aca4e2d0 100644
---
a/components/camel-aws/camel-aws-parameter-store/src/main/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducer.java
+++
b/components/camel-aws/camel-aws-parameter-store/src/main/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducer.java
@@ -244,7 +244,10 @@ public class ParameterStoreProducer extends
DefaultProducer {
} else {
throw new IllegalArgumentException("Parameter Name must be
specified");
}
- String payload = exchange.getIn().getMandatoryBody(String.class);
+ String payload =
exchange.getIn().getHeader(ParameterStoreConstants.PARAMETER_VALUE,
String.class);
+ if (ObjectHelper.isEmpty(payload)) {
+ payload = exchange.getIn().getMandatoryBody(String.class);
+ }
builder.value(payload);
if
(ObjectHelper.isNotEmpty(exchange.getIn().getHeader(ParameterStoreConstants.PARAMETER_TYPE)))
{
String type =
exchange.getIn().getHeader(ParameterStoreConstants.PARAMETER_TYPE,
String.class);
diff --git
a/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducerTest.java
b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducerTest.java
new file mode 100644
index 000000000000..74e80a9f9516
--- /dev/null
+++
b/components/camel-aws/camel-aws-parameter-store/src/test/java/org/apache/camel/component/aws/parameterstore/ParameterStoreProducerTest.java
@@ -0,0 +1,63 @@
+/*
+ * 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.parameterstore;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.support.DefaultExchange;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mockito;
+import software.amazon.awssdk.services.ssm.SsmClient;
+import software.amazon.awssdk.services.ssm.model.PutParameterRequest;
+import software.amazon.awssdk.services.ssm.model.PutParameterResponse;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+class ParameterStoreProducerTest {
+
+ @Test
+ void putParameterHonorsTheValueHeader() throws Exception {
+ try (DefaultCamelContext context = new DefaultCamelContext()) {
+ SsmClient client = Mockito.mock(SsmClient.class);
+ ArgumentCaptor<PutParameterRequest> captor =
ArgumentCaptor.forClass(PutParameterRequest.class);
+
when(client.putParameter(captor.capture())).thenReturn(PutParameterResponse.builder().build());
+
+ ParameterStoreConfiguration configuration = new
ParameterStoreConfiguration();
+ configuration.setSsmClient(client);
+ ParameterStoreEndpoint endpoint
+ = new ParameterStoreEndpoint("aws-parameter-store://test",
null, configuration);
+ endpoint.setCamelContext(context);
+ endpoint.start();
+
+ ParameterStoreProducer producer = new
ParameterStoreProducer(endpoint);
+
+ Exchange exchange = new DefaultExchange(context);
+ exchange.getIn().setHeader(ParameterStoreConstants.OPERATION,
ParameterStoreOperations.putParameter);
+ exchange.getIn().setHeader(ParameterStoreConstants.PARAMETER_NAME,
"myParam");
+
exchange.getIn().setHeader(ParameterStoreConstants.PARAMETER_VALUE,
"valueFromHeader");
+ exchange.getIn().setBody("valueFromBody");
+
+ producer.process(exchange);
+
+ // the CamelAwsParameterStoreValue header used to be ignored (the
value always came from the body);
+ // it must now be honored when present
+ assertThat(captor.getValue().value()).isEqualTo("valueFromHeader");
+ }
+ }
+}
diff --git
a/components/camel-aws/camel-aws2-eks/src/generated/resources/META-INF/org/apache/camel/component/aws2/eks/aws2-eks.json
b/components/camel-aws/camel-aws2-eks/src/generated/resources/META-INF/org/apache/camel/component/aws2/eks/aws2-eks.json
index 52d088a354f5..dd98a342712f 100644
---
a/components/camel-aws/camel-aws2-eks/src/generated/resources/META-INF/org/apache/camel/component/aws2/eks/aws2-eks.json
+++
b/components/camel-aws/camel-aws2-eks/src/generated/resources/META-INF/org/apache/camel/component/aws2/eks/aws2-eks.json
@@ -29,19 +29,19 @@
"operation": { "index": 2, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "enum", "javaType":
"org.apache.camel.component.aws2.eks.EKS2Operations", "enum": [ "listClusters",
"describeCluster", "createCluster", "deleteCluster" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.eks.EKS2Configuration",
"configurationField": "configuration", [...]
"overrideEndpoint": { "index": 3, "kind": "property", "displayName":
"Override Endpoint", "group": "producer", "label": "", "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 the need for overriding the endpoint. This
option needs to be used in combination wi [...]
"pojoRequest": { "index": 4, "kind": "property", "displayName": "Pojo
Request", "group": "producer", "label": "", "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 use a POJO request as body or
not" },
- "profileCredentialsName": { "index": 5, "kind": "property", "displayName":
"Profile Credentials Name", "group": "producer", "label": "", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "false",
"configurationClass": "org.apache.camel.component.aws2.eks.EKS2Configuration",
"configurationField": "configuration", "description": "If using a profile
credentials provider, this parameter will set [...]
- "region": { "index": 6, "kind": "property", "displayName": "Region",
"group": "producer", "label": "", "required": false, "type": "enum",
"javaType": "java.lang.String", "enum": [ "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",
"eu-isoe-west-1", "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-north [...]
- "uriEndpointOverride": { "index": 7, "kind": "property", "displayName":
"Uri Endpoint Override", "group": "producer", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpoi [...]
- "useDefaultCredentialsProvider": { "index": 8, "kind": "property",
"displayName": "Use Default Credentials Provider", "group": "producer",
"label": "", "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
load credentials [...]
- "useProfileCredentialsProvider": { "index": 9, "kind": "property",
"displayName": "Use Profile Credentials Provider", "group": "producer",
"label": "", "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
load credentials [...]
- "autowiredEnabled": { "index": 10, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching [...]
- "eksClient": { "index": 11, "kind": "property", "displayName": "Eks
Client", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "software.amazon.awssdk.services.eks.EksClient",
"deprecated": false, "deprecationNote": "", "autowired": true, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.eks.EKS2Configuration",
"configurationField": "configuration", "description": "To use an existing
configured AWS EKS client" },
- "healthCheckConsumerEnabled": { "index": 12, "kind": "property",
"displayName": "Health Check Consumer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all consumer based health checks
from this component" },
- "healthCheckProducerEnabled": { "index": 13, "kind": "property",
"displayName": "Health Check Producer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all producer based health checks
from this component. Notice: Camel has by default disabled all producer based
health-checks. You can turn on produce [...]
- "proxyHost": { "index": 14, "kind": "property", "displayName": "Proxy
Host", "group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "To define a proxy host when instantiating the
EKS client" },
- "proxyPort": { "index": 15, "kind": "property", "displayName": "Proxy
Port", "group": "proxy", "label": "proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "To define a proxy port when instantiating the
EKS client" },
- "proxyProtocol": { "index": 16, "kind": "property", "displayName": "Proxy
Protocol", "group": "proxy", "label": "proxy", "required": false, "type":
"enum", "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 in [...]
- "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, "security": "secret", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
+ "region": { "index": 5, "kind": "property", "displayName": "Region",
"group": "producer", "label": "", "required": false, "type": "enum",
"javaType": "java.lang.String", "enum": [ "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",
"eu-isoe-west-1", "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-north [...]
+ "uriEndpointOverride": { "index": 6, "kind": "property", "displayName":
"Uri Endpoint Override", "group": "producer", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpoi [...]
+ "useDefaultCredentialsProvider": { "index": 7, "kind": "property",
"displayName": "Use Default Credentials Provider", "group": "producer",
"label": "", "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
load credentials [...]
+ "useProfileCredentialsProvider": { "index": 8, "kind": "property",
"displayName": "Use Profile Credentials Provider", "group": "producer",
"label": "", "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
load credentials [...]
+ "autowiredEnabled": { "index": 9, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
+ "eksClient": { "index": 10, "kind": "property", "displayName": "Eks
Client", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "software.amazon.awssdk.services.eks.EksClient",
"deprecated": false, "deprecationNote": "", "autowired": true, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.eks.EKS2Configuration",
"configurationField": "configuration", "description": "To use an existing
configured AWS EKS client" },
+ "healthCheckConsumerEnabled": { "index": 11, "kind": "property",
"displayName": "Health Check Consumer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all consumer based health checks
from this component" },
+ "healthCheckProducerEnabled": { "index": 12, "kind": "property",
"displayName": "Health Check Producer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all producer based health checks
from this component. Notice: Camel has by default disabled all producer based
health-checks. You can turn on produce [...]
+ "proxyHost": { "index": 13, "kind": "property", "displayName": "Proxy
Host", "group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "To define a proxy host when instantiating the
EKS client" },
+ "proxyPort": { "index": 14, "kind": "property", "displayName": "Proxy
Port", "group": "proxy", "label": "proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "To define a proxy port when instantiating the
EKS client" },
+ "proxyProtocol": { "index": 15, "kind": "property", "displayName": "Proxy
Protocol", "group": "proxy", "label": "proxy", "required": false, "type":
"enum", "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 in [...]
+ "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, "security": "secret", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "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.eks.EKS2Configuration",
"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, "security": "secret", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" },
"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, "security": "secret", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Session Token used when the user
needs to assume an 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, "security": "insecure:ssl",
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "If we want to trust all certificates in ca
[...]
@@ -63,17 +63,17 @@
"operation": { "index": 1, "kind": "parameter", "displayName":
"Operation", "group": "producer", "label": "", "required": true, "type":
"enum", "javaType": "org.apache.camel.component.aws2.eks.EKS2Operations",
"enum": [ "listClusters", "describeCluster", "createCluster", "deleteCluster"
], "deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration" [...]
"overrideEndpoint": { "index": 2, "kind": "parameter", "displayName":
"Override Endpoint", "group": "producer", "label": "", "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 the need for overriding the endpoint. This
option needs to be used in combination w [...]
"pojoRequest": { "index": 3, "kind": "parameter", "displayName": "Pojo
Request", "group": "producer", "label": "", "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 use a POJO request as body or
not" },
- "profileCredentialsName": { "index": 4, "kind": "parameter",
"displayName": "Profile Credentials Name", "group": "producer", "label": "",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"false", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "If using a profile credentials provider, this
parameter will set [...]
- "region": { "index": 5, "kind": "parameter", "displayName": "Region",
"group": "producer", "label": "", "required": false, "type": "enum",
"javaType": "java.lang.String", "enum": [ "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",
"eu-isoe-west-1", "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-nort [...]
- "uriEndpointOverride": { "index": 6, "kind": "parameter", "displayName":
"Uri Endpoint Override", "group": "producer", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpo [...]
- "useDefaultCredentialsProvider": { "index": 7, "kind": "parameter",
"displayName": "Use Default Credentials Provider", "group": "producer",
"label": "", "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
load credential [...]
- "useProfileCredentialsProvider": { "index": 8, "kind": "parameter",
"displayName": "Use Profile Credentials Provider", "group": "producer",
"label": "", "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
load credential [...]
- "lazyStartProducer": { "index": 9, "kind": "parameter", "displayName":
"Lazy Start Producer", "group": "producer (advanced)", "label":
"producer,advanced", "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 produc [...]
- "eksClient": { "index": 10, "kind": "parameter", "displayName": "Eks
Client", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "software.amazon.awssdk.services.eks.EksClient",
"deprecated": false, "deprecationNote": "", "autowired": true, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.eks.EKS2Configuration",
"configurationField": "configuration", "description": "To use an existing
configured AWS EKS client" },
- "proxyHost": { "index": 11, "kind": "parameter", "displayName": "Proxy
Host", "group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "To define a proxy host when instantiating the
EKS client" },
- "proxyPort": { "index": 12, "kind": "parameter", "displayName": "Proxy
Port", "group": "proxy", "label": "proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "To define a proxy port when instantiating the
EKS client" },
- "proxyProtocol": { "index": 13, "kind": "parameter", "displayName": "Proxy
Protocol", "group": "proxy", "label": "proxy", "required": false, "type":
"enum", "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 i [...]
- "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, "security": "secret", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
+ "region": { "index": 4, "kind": "parameter", "displayName": "Region",
"group": "producer", "label": "", "required": false, "type": "enum",
"javaType": "java.lang.String", "enum": [ "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",
"eu-isoe-west-1", "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-nort [...]
+ "uriEndpointOverride": { "index": 5, "kind": "parameter", "displayName":
"Uri Endpoint Override", "group": "producer", "label": "", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpo [...]
+ "useDefaultCredentialsProvider": { "index": 6, "kind": "parameter",
"displayName": "Use Default Credentials Provider", "group": "producer",
"label": "", "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
load credential [...]
+ "useProfileCredentialsProvider": { "index": 7, "kind": "parameter",
"displayName": "Use Profile Credentials Provider", "group": "producer",
"label": "", "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
load credential [...]
+ "lazyStartProducer": { "index": 8, "kind": "parameter", "displayName":
"Lazy Start Producer", "group": "producer (advanced)", "label":
"producer,advanced", "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 produc [...]
+ "eksClient": { "index": 9, "kind": "parameter", "displayName": "Eks
Client", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "software.amazon.awssdk.services.eks.EksClient",
"deprecated": false, "deprecationNote": "", "autowired": true, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.eks.EKS2Configuration",
"configurationField": "configuration", "description": "To use an existing
configured AWS EKS client" },
+ "proxyHost": { "index": 10, "kind": "parameter", "displayName": "Proxy
Host", "group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "To define a proxy host when instantiating the
EKS client" },
+ "proxyPort": { "index": 11, "kind": "parameter", "displayName": "Proxy
Port", "group": "proxy", "label": "proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "To define a proxy port when instantiating the
EKS client" },
+ "proxyProtocol": { "index": 12, "kind": "parameter", "displayName": "Proxy
Protocol", "group": "proxy", "label": "proxy", "required": false, "type":
"enum", "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 i [...]
+ "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, "security": "secret", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "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.eks.EKS2Configuration",
"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, "security": "secret", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" },
"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, "security": "secret", "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Session Token used when the user
needs to assume an 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, "security": "insecure:ssl",
"defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.eks.EKS2Configuration", "configurationField":
"configuration", "description": "If we want to trust all certificates in c [...]
diff --git
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Configuration.java
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Configuration.java
index 478bb0e9299b..da7d61db1df8 100644
---
a/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Configuration.java
+++
b/components/camel-aws/camel-aws2-eks/src/main/java/org/apache/camel/component/aws2/eks/EKS2Configuration.java
@@ -65,7 +65,7 @@ public class EKS2Configuration implements Cloneable,
AwsCommonConfiguration {
private boolean useProfileCredentialsProvider;
@UriParam(label = "security")
private boolean useSessionCredentials;
- @UriParam(defaultValue = "false")
+ @UriParam(label = "security")
private String profileCredentialsName;
public EksClient getEksClient() {
diff --git
a/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2Endpoint.java
b/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2Endpoint.java
index 17e2d5aa1530..eaf8cf3e1524 100644
---
a/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2Endpoint.java
+++
b/components/camel-aws/camel-aws2-iam/src/main/java/org/apache/camel/component/aws2/iam/IAM2Endpoint.java
@@ -78,6 +78,7 @@ public class IAM2Endpoint extends ScheduledPollEndpoint
implements EndpointServi
iamClient.close();
}
}
+ super.doStop();
}
public IAM2Configuration getConfiguration() {
diff --git
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2EksComponentBuilderFactory.java
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2EksComponentBuilderFactory.java
index d0653ad1367f..c790507fb8ac 100644
---
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2EksComponentBuilderFactory.java
+++
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2EksComponentBuilderFactory.java
@@ -142,24 +142,6 @@ public interface Aws2EksComponentBuilderFactory {
return this;
}
-
- /**
- * If using a profile credentials provider, this parameter will set the
- * profile name.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Default: false
- * Group: producer
- *
- * @param profileCredentialsName the value to set
- * @return the dsl builder
- */
- default Aws2EksComponentBuilder
profileCredentialsName(java.lang.String profileCredentialsName) {
- doSetProperty("profileCredentialsName", profileCredentialsName);
- return this;
- }
-
/**
* The region in which EKS client needs to work. When using this
* parameter, the configuration will expect the lowercase name of the
@@ -370,6 +352,22 @@ public interface Aws2EksComponentBuilderFactory {
return this;
}
+ /**
+ * If using a profile credentials provider, this parameter will set the
+ * profile name.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: security
+ *
+ * @param profileCredentialsName the value to set
+ * @return the dsl builder
+ */
+ default Aws2EksComponentBuilder
profileCredentialsName(java.lang.String profileCredentialsName) {
+ doSetProperty("profileCredentialsName", profileCredentialsName);
+ return this;
+ }
+
/**
* Amazon AWS Secret Key.
*
@@ -463,7 +461,6 @@ public interface Aws2EksComponentBuilderFactory {
case "operation": getOrCreateConfiguration((EKS2Component)
component).setOperation((org.apache.camel.component.aws2.eks.EKS2Operations)
value); return true;
case "overrideEndpoint": getOrCreateConfiguration((EKS2Component)
component).setOverrideEndpoint((boolean) value); return true;
case "pojoRequest": getOrCreateConfiguration((EKS2Component)
component).setPojoRequest((boolean) value); return true;
- case "profileCredentialsName":
getOrCreateConfiguration((EKS2Component)
component).setProfileCredentialsName((java.lang.String) value); return true;
case "region": getOrCreateConfiguration((EKS2Component)
component).setRegion((java.lang.String) value); return true;
case "uriEndpointOverride":
getOrCreateConfiguration((EKS2Component)
component).setUriEndpointOverride((java.lang.String) value); return true;
case "useDefaultCredentialsProvider":
getOrCreateConfiguration((EKS2Component)
component).setUseDefaultCredentialsProvider((boolean) value); return true;
@@ -476,6 +473,7 @@ public interface Aws2EksComponentBuilderFactory {
case "proxyPort": getOrCreateConfiguration((EKS2Component)
component).setProxyPort((java.lang.Integer) value); return true;
case "proxyProtocol": getOrCreateConfiguration((EKS2Component)
component).setProxyProtocol((software.amazon.awssdk.core.Protocol) value);
return true;
case "accessKey": getOrCreateConfiguration((EKS2Component)
component).setAccessKey((java.lang.String) value); return true;
+ case "profileCredentialsName":
getOrCreateConfiguration((EKS2Component)
component).setProfileCredentialsName((java.lang.String) value); return true;
case "secretKey": getOrCreateConfiguration((EKS2Component)
component).setSecretKey((java.lang.String) value); return true;
case "sessionToken": getOrCreateConfiguration((EKS2Component)
component).setSessionToken((java.lang.String) value); return true;
case "trustAllCertificates":
getOrCreateConfiguration((EKS2Component)
component).setTrustAllCertificates((boolean) value); return true;
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
index 0d8ea433ccad..b6d3ab9964fa 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
@@ -138,22 +138,6 @@ public interface EKS2EndpointBuilderFactory {
doSetProperty("pojoRequest", pojoRequest);
return this;
}
- /**
- * If using a profile credentials provider, this parameter will set the
- * profile name.
- *
- * The option is a: <code>java.lang.String</code> type.
- *
- * Default: false
- * Group: producer
- *
- * @param profileCredentialsName the value to set
- * @return the dsl builder
- */
- default EKS2EndpointBuilder profileCredentialsName(String
profileCredentialsName) {
- doSetProperty("profileCredentialsName", profileCredentialsName);
- return this;
- }
/**
* The region in which EKS client needs to work. When using this
* parameter, the configuration will expect the lowercase name of the
@@ -341,6 +325,21 @@ public interface EKS2EndpointBuilderFactory {
doSetProperty("accessKey", accessKey);
return this;
}
+ /**
+ * If using a profile credentials provider, this parameter will set the
+ * profile name.
+ *
+ * The option is a: <code>java.lang.String</code> type.
+ *
+ * Group: security
+ *
+ * @param profileCredentialsName the value to set
+ * @return the dsl builder
+ */
+ default EKS2EndpointBuilder profileCredentialsName(String
profileCredentialsName) {
+ doSetProperty("profileCredentialsName", profileCredentialsName);
+ return this;
+ }
/**
* Amazon AWS Secret Key.
*
