This is an automated email from the ASF dual-hosted git repository.
oscerd 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 0177bb8c700a CAMEL-24471: camel-ibm-secrets-manager - fix producer
header descriptions and endpoint credential validation (CAMEL-24472) (#25650)
0177bb8c700a is described below
commit 0177bb8c700aa17fa68710876ba8d84400f0c004
Author: Andrea Cosentino <[email protected]>
AuthorDate: Tue Aug 25 13:33:15 2026 +0200
CAMEL-24471: camel-ibm-secrets-manager - fix producer header descriptions
and endpoint credential validation (CAMEL-24472) (#25650)
* CAMEL-24471: camel-ibm-secrets-manager - correct copy-pasted producer
header descriptions
The SecretId header was documented as "Set the desired secret version as
header." (a copy of the SecretVersion header) even though the producer
reads it
as the secret id for the get and delete operations. The SecretName header
said
"...secret path..." which is likewise misleading. Describe both headers
accurately.
Co-Authored-By: Claude Opus 4.8 <[email protected]>
Signed-off-by: Andrea Cosentino <[email protected]>
* CAMEL-24472: camel-ibm-secrets-manager - reject a half-configured
endpoint when service URL or token is missing
createEndpoint() validated the credentials with && so the "Service URL and
Token
must be specified" exception only fired when both were missing; an endpoint
configured with just one of them passed validation and failed later with a
less
clear error. Use || so the check fires when either one is missing.
Co-Authored-By: Claude Opus 4.8 <[email protected]>
Signed-off-by: Andrea Cosentino <[email protected]>
* CAMEL-24471: regenerate catalog and endpoint-DSL descriptors for the
header description change
The corrected producer header descriptions changed the component metadata,
so
the aggregated catalog JSON and the endpoint DSL factory javadoc must be
regenerated to stay in sync. Fixes the CI "uncommitted changes" check.
Co-Authored-By: Claude Opus 4.8 <[email protected]>
Signed-off-by: Andrea Cosentino <[email protected]>
---------
Signed-off-by: Andrea Cosentino <[email protected]>
Co-authored-by: Claude Opus 4.8 <[email protected]>
---
.../org/apache/camel/catalog/components/ibm-secrets-manager.json | 4 ++--
.../camel/component/ibm/secrets/manager/ibm-secrets-manager.json | 4 ++--
.../component/ibm/secrets/manager/IBMSecretsManagerComponent.java | 2 +-
.../component/ibm/secrets/manager/IBMSecretsManagerConstants.java | 4 ++--
.../builder/endpoint/dsl/IBMSecretsManagerEndpointBuilderFactory.java | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ibm-secrets-manager.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ibm-secrets-manager.json
index f01e7c9dab2e..913ea70affea 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ibm-secrets-manager.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ibm-secrets-manager.json
@@ -29,9 +29,9 @@
},
"headers": {
"CamelIbmSecretsManagerProducerOperation": { "index": 0, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Overrides the desired operation to be
used in the producer.", "constantName":
"org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants#OPERATION"
},
- "CamelIbmSecretsManagerSecretName": { "index": 1, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Set the desired secret path as
header.", "constantName":
"org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants#SECRET_NAME"
},
+ "CamelIbmSecretsManagerSecretName": { "index": 1, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Set the desired secret name as
header.", "constantName":
"org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants#SECRET_NAME"
},
"CamelIbmSecretsManagerSecretVersion": { "index": 2, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Set the desired secret version as
header.", "constantName":
"org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants#SECRET_VERSION"
},
- "CamelIbmSecretsManagerSecretId": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Set the desired secret version as
header.", "constantName":
"org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants#SECRET_ID"
},
+ "CamelIbmSecretsManagerSecretId": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Set the desired secret ID as header.",
"constantName":
"org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants#SECRET_ID"
},
"CamelIbmSecretsManagerSecretPayload": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Set the secret payload for update
operation.", "constantName":
"org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants#SECRET_PAYLOAD"
},
"CamelIbmSecretsManagerSecretData": { "index": 5, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "java.util.Map", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "Set the secret data (Map)
for KV secret update operation.", "constantName":
"org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants#SECRET_DATA"
}
},
diff --git
a/components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/org/apache/camel/component/ibm/secrets/manager/ibm-secrets-manager.json
b/components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/org/apache/camel/component/ibm/secrets/manager/ibm-secrets-manager.json
index f01e7c9dab2e..913ea70affea 100644
---
a/components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/org/apache/camel/component/ibm/secrets/manager/ibm-secrets-manager.json
+++
b/components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/org/apache/camel/component/ibm/secrets/manager/ibm-secrets-manager.json
@@ -29,9 +29,9 @@
},
"headers": {
"CamelIbmSecretsManagerProducerOperation": { "index": 0, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Overrides the desired operation to be
used in the producer.", "constantName":
"org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants#OPERATION"
},
- "CamelIbmSecretsManagerSecretName": { "index": 1, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Set the desired secret path as
header.", "constantName":
"org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants#SECRET_NAME"
},
+ "CamelIbmSecretsManagerSecretName": { "index": 1, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Set the desired secret name as
header.", "constantName":
"org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants#SECRET_NAME"
},
"CamelIbmSecretsManagerSecretVersion": { "index": 2, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Set the desired secret version as
header.", "constantName":
"org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants#SECRET_VERSION"
},
- "CamelIbmSecretsManagerSecretId": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Set the desired secret version as
header.", "constantName":
"org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants#SECRET_ID"
},
+ "CamelIbmSecretsManagerSecretId": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Set the desired secret ID as header.",
"constantName":
"org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants#SECRET_ID"
},
"CamelIbmSecretsManagerSecretPayload": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Set the secret payload for update
operation.", "constantName":
"org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants#SECRET_PAYLOAD"
},
"CamelIbmSecretsManagerSecretData": { "index": 5, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "java.util.Map", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "Set the secret data (Map)
for KV secret update operation.", "constantName":
"org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConstants#SECRET_DATA"
}
},
diff --git
a/components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerComponent.java
b/components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerComponent.java
index fdc9bd70d8ae..bd0bbf9984b6 100644
---
a/components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerComponent.java
+++
b/components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerComponent.java
@@ -49,7 +49,7 @@ public class IBMSecretsManagerComponent extends
DefaultComponent {
setProperties(endpoint, parameters);
if (epConfiguration.getServiceUrl() == null
- && epConfiguration.getToken() == null) {
+ || epConfiguration.getToken() == null) {
throw new IllegalArgumentException(
"Service URL and Token must be specified");
}
diff --git
a/components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerConstants.java
b/components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerConstants.java
index bb234368408b..5e37036c4fbe 100644
---
a/components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerConstants.java
+++
b/components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerConstants.java
@@ -27,7 +27,7 @@ public final class IBMSecretsManagerConstants {
public static final String OPERATION = HEADER_PREFIX + "ProducerOperation";
// headers set by the producer only
- @Metadata(label = "producer", description = "Set the desired secret path
as header.",
+ @Metadata(label = "producer", description = "Set the desired secret name
as header.",
javaType = "String")
public static final String SECRET_NAME = HEADER_PREFIX + "SecretName";
@@ -37,7 +37,7 @@ public final class IBMSecretsManagerConstants {
public static final String SECRET_VERSION = HEADER_PREFIX +
"SecretVersion";
// headers set by the producer only
- @Metadata(label = "producer", description = "Set the desired secret
version as header.",
+ @Metadata(label = "producer", description = "Set the desired secret ID as
header.",
javaType = "String")
public static final String SECRET_ID = HEADER_PREFIX + "SecretId";
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IBMSecretsManagerEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IBMSecretsManagerEndpointBuilderFactory.java
index c66e79b13ce5..aebbd79e9c6f 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IBMSecretsManagerEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IBMSecretsManagerEndpointBuilderFactory.java
@@ -242,7 +242,7 @@ public interface IBMSecretsManagerEndpointBuilderFactory {
return "CamelIbmSecretsManagerProducerOperation";
}
/**
- * Set the desired secret path as header.
+ * Set the desired secret name as header.
*
* The option is a: {@code String} type.
*
@@ -267,7 +267,7 @@ public interface IBMSecretsManagerEndpointBuilderFactory {
return "CamelIbmSecretsManagerSecretVersion";
}
/**
- * Set the desired secret version as header.
+ * Set the desired secret ID as header.
*
* The option is a: {@code String} type.
*
