This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch CAMEL-21767 in repository https://gitbox.apache.org/repos/asf/camel.git
commit f9e37abefd9f3affc43b9c22466fd697c184ac7f Author: Andrea Cosentino <[email protected]> AuthorDate: Thu Feb 20 12:34:55 2025 +0100 CAMEL-21767 - Camel-IBM-Secrets-manager: Add more type of secrets for create secret operation Signed-off-by: Andrea Cosentino <[email protected]> --- .../catalog/components/ibm-secrets-manager.json | 2 +- .../ibm/secrets/manager/ibm-secrets-manager.json | 2 +- .../main/docs/ibm-secrets-manager-component.adoc | 3 +- .../manager/IBMSecretsManagerOperation.java | 1 + .../secrets/manager/IBMSecretsManagerProducer.java | 37 +++++++++++++++++++++- 5 files changed, 41 insertions(+), 4 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 c5f1b490144..22d88cdb6d6 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 @@ -35,7 +35,7 @@ }, "properties": { "label": { "index": 0, "kind": "path", "displayName": "Label", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConfiguration", "configurationField": "configuration", "description": "Logical name" }, - "operation": { "index": 1, "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerOperation", "enum": [ "createArbitrarySecret", "getSecret", "deleteSecret" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConfiguration", "configurationFie [...] + "operation": { "index": 1, "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerOperation", "enum": [ "createArbitrarySecret", "createKVSecret", "getSecret", "deleteSecret" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConfiguration", [...] "serviceUrl": { "index": 2, "kind": "parameter", "displayName": "Service Url", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConfiguration", "configurationField": "configuration", "description": "Service URL for IBM Secrets Manager" }, "lazyStartProducer": { "index": 3, "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 [...] "token": { "index": 4, "kind": "parameter", "displayName": "Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConfiguration", "configurationField": "configuration", "description": "IBM Cloud API Token for IBM Secrets Manager" } diff --git a/components/camel-ibm-secrets-manager/src/generated/resources/META-INF/org/apache/camel/component/ibm/secrets/manager/ibm-secrets-manager.json b/components/camel-ibm-secrets-manager/src/generated/resources/META-INF/org/apache/camel/component/ibm/secrets/manager/ibm-secrets-manager.json index c5f1b490144..22d88cdb6d6 100644 --- a/components/camel-ibm-secrets-manager/src/generated/resources/META-INF/org/apache/camel/component/ibm/secrets/manager/ibm-secrets-manager.json +++ b/components/camel-ibm-secrets-manager/src/generated/resources/META-INF/org/apache/camel/component/ibm/secrets/manager/ibm-secrets-manager.json @@ -35,7 +35,7 @@ }, "properties": { "label": { "index": 0, "kind": "path", "displayName": "Label", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConfiguration", "configurationField": "configuration", "description": "Logical name" }, - "operation": { "index": 1, "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerOperation", "enum": [ "createArbitrarySecret", "getSecret", "deleteSecret" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConfiguration", "configurationFie [...] + "operation": { "index": 1, "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerOperation", "enum": [ "createArbitrarySecret", "createKVSecret", "getSecret", "deleteSecret" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConfiguration", [...] "serviceUrl": { "index": 2, "kind": "parameter", "displayName": "Service Url", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConfiguration", "configurationField": "configuration", "description": "Service URL for IBM Secrets Manager" }, "lazyStartProducer": { "index": 3, "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 [...] "token": { "index": 4, "kind": "parameter", "displayName": "Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.ibm.secrets.manager.IBMSecretsManagerConfiguration", "configurationField": "configuration", "description": "IBM Cloud API Token for IBM Secrets Manager" } diff --git a/components/camel-ibm-secrets-manager/src/main/docs/ibm-secrets-manager-component.adoc b/components/camel-ibm-secrets-manager/src/main/docs/ibm-secrets-manager-component.adoc index bc40de95abf..5921c3991dc 100644 --- a/components/camel-ibm-secrets-manager/src/main/docs/ibm-secrets-manager-component.adoc +++ b/components/camel-ibm-secrets-manager/src/main/docs/ibm-secrets-manager-component.adoc @@ -51,7 +51,8 @@ include::partial$component-endpoint-headers.adoc[] The component supports operations at the producer level. Specifically, it provides the following functionalities: -* `createSecret` +* `createArbitrarySecret` +* `createKVSecret` * `getSecret` * `deleteSecret` diff --git a/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerOperation.java b/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerOperation.java index 51f0e7dfd76..546daaee3f3 100644 --- a/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerOperation.java +++ b/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerOperation.java @@ -18,6 +18,7 @@ package org.apache.camel.component.ibm.secrets.manager; public enum IBMSecretsManagerOperation { createArbitrarySecret, + createKVSecret, getSecret, deleteSecret } diff --git a/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerProducer.java b/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerProducer.java index 652e4760f84..526e0430ab8 100644 --- a/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerProducer.java +++ b/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerProducer.java @@ -16,6 +16,8 @@ */ package org.apache.camel.component.ibm.secrets.manager; +import java.util.Map; + import com.ibm.cloud.sdk.core.http.Response; import com.ibm.cloud.secrets_manager_sdk.secrets_manager.v2.model.*; import org.apache.camel.Endpoint; @@ -35,6 +37,9 @@ public class IBMSecretsManagerProducer extends DefaultProducer { case createArbitrarySecret: createArbitratySecret(exchange); break; + case createKVSecret: + createKVSecret(exchange); + break; case getSecret: getSecret(exchange); break; @@ -66,6 +71,26 @@ public class IBMSecretsManagerProducer extends DefaultProducer { exchange.getMessage().setBody(createResp.getResult().getId()); } + private void createKVSecret(Exchange exchange) { + KVSecretPrototype.Builder kvSecretResourceBuilder = new KVSecretPrototype.Builder(); + if (ObjectHelper.isNotEmpty(exchange.getMessage().getHeader(IBMSecretsManagerConstants.SECRET_NAME, String.class))) { + kvSecretResourceBuilder + .name(exchange.getMessage().getHeader(IBMSecretsManagerConstants.SECRET_NAME, String.class)); + } else { + throw new IllegalArgumentException("Secret Name must be specified"); + } + kvSecretResourceBuilder.data(exchange.getMessage().getBody(Map.class)); + kvSecretResourceBuilder.secretType(KVSecretPrototype.SecretType.KV); + KVSecretPrototype kvSecretResource = kvSecretResourceBuilder.build(); + + CreateSecretOptions createSecretOptions = new CreateSecretOptions.Builder() + .secretPrototype(kvSecretResource) + .build(); + Response<Secret> createResp = getEndpoint().getSecretManager().createSecret(createSecretOptions).execute(); + + exchange.getMessage().setBody(createResp.getResult().getId()); + } + private void getSecret(Exchange exchange) { GetSecretOptions.Builder getSecretOptionsBuilder = new GetSecretOptions.Builder(); if (ObjectHelper.isNotEmpty(exchange.getMessage().getHeader(IBMSecretsManagerConstants.SECRET_ID, String.class))) { @@ -75,7 +100,17 @@ public class IBMSecretsManagerProducer extends DefaultProducer { } Response<Secret> getResp = getEndpoint().getSecretManager().getSecret(getSecretOptionsBuilder.build()).execute(); - exchange.getMessage().setBody(getResp.getResult().getPayload()); + String secretType = getResp.getResult().getSecretType(); + switch (secretType) { + case "arbitrary": + exchange.getMessage().setBody(getResp.getResult().getPayload()); + break; + case "kv": + exchange.getMessage().setBody(getResp.getResult().getData()); + break; + default: + throw new IllegalArgumentException("Unsupported Secret Type"); + } } private void deleteSecret(Exchange exchange) {
