This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new cb14331e53a CAMEL-21905 - Camel-IBM-Secrets-Manager: Implement secret
refresh by using IBM Event Streams as destination of notifications - No need
for refresh period since it will run one time and repeat (#17632)
cb14331e53a is described below
commit cb14331e53af311dbae08d4f30c4be31ded320f0
Author: Andrea Cosentino <[email protected]>
AuthorDate: Tue Apr 1 10:12:50 2025 +0200
CAMEL-21905 - Camel-IBM-Secrets-Manager: Implement secret refresh by using
IBM Event Streams as destination of notifications - No need for refresh period
since it will run one time and repeat (#17632)
Signed-off-by: Andrea Cosentino <[email protected]>
---
.../catalog/main/camel-main-configuration-metadata.json | 1 -
.../camel/vault/IBMSecretsManagerVaultConfiguration.java | 13 -------------
.../main/IBMSecretsManagerVaultConfigurationConfigurer.java | 6 ------
...ecretsManagerVaultConfigurationPropertiesConfigurer.java | 7 -------
.../META-INF/camel-main-configuration-metadata.json | 1 -
core/camel-main/src/main/docs/main.adoc | 3 +--
6 files changed, 1 insertion(+), 30 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 215b956e8ae..a7b979a3db1 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -398,7 +398,6 @@
{ "name": "camel.vault.ibm.eventStreamTopic", "description": "Specify the
topic name for consuming notification on IBM Event Stream", "sourceType":
"org.apache.camel.vault.IBMSecretsManagerVaultConfiguration", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.vault.ibm.eventStreamUsername", "description": "Specify
the username to access IBM Event Stream", "sourceType":
"org.apache.camel.vault.IBMSecretsManagerVaultConfiguration", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.vault.ibm.refreshEnabled", "description": "Whether to
automatically reload Camel upon secrets being updated in IBM.", "sourceType":
"org.apache.camel.vault.IBMSecretsManagerVaultConfiguration", "type":
"boolean", "javaType": "boolean", "defaultValue": "false" },
- { "name": "camel.vault.ibm.refreshPeriod", "description": "The period
(millis) between checking AWS for updated secrets.", "sourceType":
"org.apache.camel.vault.IBMSecretsManagerVaultConfiguration", "type":
"integer", "javaType": "long", "defaultValue": 30000 },
{ "name": "camel.vault.ibm.secrets", "description": "Specify the secret
names (or pattern) to check for updates. Multiple secrets can be separated by
comma.", "sourceType":
"org.apache.camel.vault.IBMSecretsManagerVaultConfiguration", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.vault.ibm.serviceUrl", "description": "Service URL to
access IBM Secrets Manager vault", "sourceType":
"org.apache.camel.vault.IBMSecretsManagerVaultConfiguration", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.vault.ibm.token", "description": "Token to access IBM
Secrets Manager vault", "sourceType":
"org.apache.camel.vault.IBMSecretsManagerVaultConfiguration", "type": "string",
"javaType": "java.lang.String" },
diff --git
a/core/camel-api/src/main/java/org/apache/camel/vault/IBMSecretsManagerVaultConfiguration.java
b/core/camel-api/src/main/java/org/apache/camel/vault/IBMSecretsManagerVaultConfiguration.java
index 3a8c326f5a3..e1ef7fb199b 100644
---
a/core/camel-api/src/main/java/org/apache/camel/vault/IBMSecretsManagerVaultConfiguration.java
+++
b/core/camel-api/src/main/java/org/apache/camel/vault/IBMSecretsManagerVaultConfiguration.java
@@ -29,8 +29,6 @@ public class IBMSecretsManagerVaultConfiguration extends
VaultConfiguration {
private String serviceUrl;
@Metadata
private boolean refreshEnabled;
- @Metadata(defaultValue = "30000")
- private long refreshPeriod = 30000;
@Metadata
private String secrets;
@Metadata
@@ -77,17 +75,6 @@ public class IBMSecretsManagerVaultConfiguration extends
VaultConfiguration {
this.refreshEnabled = refreshEnabled;
}
- public long getRefreshPeriod() {
- return refreshPeriod;
- }
-
- /**
- * The period (millis) between checking AWS for updated secrets.
- */
- public void setRefreshPeriod(long refreshPeriod) {
- this.refreshPeriod = refreshPeriod;
- }
-
public String getSecrets() {
return secrets;
}
diff --git
a/core/camel-main/src/generated/java/org/apache/camel/main/IBMSecretsManagerVaultConfigurationConfigurer.java
b/core/camel-main/src/generated/java/org/apache/camel/main/IBMSecretsManagerVaultConfigurationConfigurer.java
index 7512a316ab2..352ccf43d03 100644
---
a/core/camel-main/src/generated/java/org/apache/camel/main/IBMSecretsManagerVaultConfigurationConfigurer.java
+++
b/core/camel-main/src/generated/java/org/apache/camel/main/IBMSecretsManagerVaultConfigurationConfigurer.java
@@ -49,8 +49,6 @@ public class IBMSecretsManagerVaultConfigurationConfigurer
extends org.apache.ca
case "kubernetesVaultConfiguration":
target.setKubernetesVaultConfiguration(property(camelContext,
org.apache.camel.vault.KubernetesVaultConfiguration.class, value)); return true;
case "refreshenabled":
case "refreshEnabled": target.setRefreshEnabled(property(camelContext,
boolean.class, value)); return true;
- case "refreshperiod":
- case "refreshPeriod": target.setRefreshPeriod(property(camelContext,
long.class, value)); return true;
case "secrets": target.setSecrets(property(camelContext,
java.lang.String.class, value)); return true;
case "serviceurl":
case "serviceUrl": target.setServiceUrl(property(camelContext,
java.lang.String.class, value)); return true;
@@ -88,8 +86,6 @@ public class IBMSecretsManagerVaultConfigurationConfigurer
extends org.apache.ca
case "kubernetesVaultConfiguration": return
org.apache.camel.vault.KubernetesVaultConfiguration.class;
case "refreshenabled":
case "refreshEnabled": return boolean.class;
- case "refreshperiod":
- case "refreshPeriod": return long.class;
case "secrets": return java.lang.String.class;
case "serviceurl":
case "serviceUrl": return java.lang.String.class;
@@ -128,8 +124,6 @@ public class IBMSecretsManagerVaultConfigurationConfigurer
extends org.apache.ca
case "kubernetesVaultConfiguration": return
target.getKubernetesVaultConfiguration();
case "refreshenabled":
case "refreshEnabled": return target.isRefreshEnabled();
- case "refreshperiod":
- case "refreshPeriod": return target.getRefreshPeriod();
case "secrets": return target.getSecrets();
case "serviceurl":
case "serviceUrl": return target.getServiceUrl();
diff --git
a/core/camel-main/src/generated/java/org/apache/camel/main/IBMSecretsManagerVaultConfigurationPropertiesConfigurer.java
b/core/camel-main/src/generated/java/org/apache/camel/main/IBMSecretsManagerVaultConfigurationPropertiesConfigurer.java
index 0ed7ff077cc..232bfd39def 100644
---
a/core/camel-main/src/generated/java/org/apache/camel/main/IBMSecretsManagerVaultConfigurationPropertiesConfigurer.java
+++
b/core/camel-main/src/generated/java/org/apache/camel/main/IBMSecretsManagerVaultConfigurationPropertiesConfigurer.java
@@ -35,7 +35,6 @@ public class
IBMSecretsManagerVaultConfigurationPropertiesConfigurer extends org
map.put("KubernetesConfigMapVaultConfiguration",
org.apache.camel.vault.KubernetesConfigMapVaultConfiguration.class);
map.put("KubernetesVaultConfiguration",
org.apache.camel.vault.KubernetesVaultConfiguration.class);
map.put("RefreshEnabled", boolean.class);
- map.put("RefreshPeriod", long.class);
map.put("Secrets", java.lang.String.class);
map.put("ServiceUrl", java.lang.String.class);
map.put("Token", java.lang.String.class);
@@ -72,8 +71,6 @@ public class
IBMSecretsManagerVaultConfigurationPropertiesConfigurer extends org
case "kubernetesVaultConfiguration":
target.setKubernetesVaultConfiguration(property(camelContext,
org.apache.camel.vault.KubernetesVaultConfiguration.class, value)); return true;
case "refreshenabled":
case "refreshEnabled": target.setRefreshEnabled(property(camelContext,
boolean.class, value)); return true;
- case "refreshperiod":
- case "refreshPeriod": target.setRefreshPeriod(property(camelContext,
long.class, value)); return true;
case "secrets": target.setSecrets(property(camelContext,
java.lang.String.class, value)); return true;
case "serviceurl":
case "serviceUrl": target.setServiceUrl(property(camelContext,
java.lang.String.class, value)); return true;
@@ -116,8 +113,6 @@ public class
IBMSecretsManagerVaultConfigurationPropertiesConfigurer extends org
case "kubernetesVaultConfiguration": return
org.apache.camel.vault.KubernetesVaultConfiguration.class;
case "refreshenabled":
case "refreshEnabled": return boolean.class;
- case "refreshperiod":
- case "refreshPeriod": return long.class;
case "secrets": return java.lang.String.class;
case "serviceurl":
case "serviceUrl": return java.lang.String.class;
@@ -156,8 +151,6 @@ public class
IBMSecretsManagerVaultConfigurationPropertiesConfigurer extends org
case "kubernetesVaultConfiguration": return
target.getKubernetesVaultConfiguration();
case "refreshenabled":
case "refreshEnabled": return target.isRefreshEnabled();
- case "refreshperiod":
- case "refreshPeriod": return target.getRefreshPeriod();
case "secrets": return target.getSecrets();
case "serviceurl":
case "serviceUrl": return target.getServiceUrl();
diff --git
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
index 215b956e8ae..a7b979a3db1 100644
---
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
+++
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
@@ -398,7 +398,6 @@
{ "name": "camel.vault.ibm.eventStreamTopic", "description": "Specify the
topic name for consuming notification on IBM Event Stream", "sourceType":
"org.apache.camel.vault.IBMSecretsManagerVaultConfiguration", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.vault.ibm.eventStreamUsername", "description": "Specify
the username to access IBM Event Stream", "sourceType":
"org.apache.camel.vault.IBMSecretsManagerVaultConfiguration", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.vault.ibm.refreshEnabled", "description": "Whether to
automatically reload Camel upon secrets being updated in IBM.", "sourceType":
"org.apache.camel.vault.IBMSecretsManagerVaultConfiguration", "type":
"boolean", "javaType": "boolean", "defaultValue": "false" },
- { "name": "camel.vault.ibm.refreshPeriod", "description": "The period
(millis) between checking AWS for updated secrets.", "sourceType":
"org.apache.camel.vault.IBMSecretsManagerVaultConfiguration", "type":
"integer", "javaType": "long", "defaultValue": 30000 },
{ "name": "camel.vault.ibm.secrets", "description": "Specify the secret
names (or pattern) to check for updates. Multiple secrets can be separated by
comma.", "sourceType":
"org.apache.camel.vault.IBMSecretsManagerVaultConfiguration", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.vault.ibm.serviceUrl", "description": "Service URL to
access IBM Secrets Manager vault", "sourceType":
"org.apache.camel.vault.IBMSecretsManagerVaultConfiguration", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.vault.ibm.token", "description": "Token to access IBM
Secrets Manager vault", "sourceType":
"org.apache.camel.vault.IBMSecretsManagerVaultConfiguration", "type": "string",
"javaType": "java.lang.String" },
diff --git a/core/camel-main/src/main/docs/main.adoc
b/core/camel-main/src/main/docs/main.adoc
index 5a058fd5029..44817f23212 100644
--- a/core/camel-main/src/main/docs/main.adoc
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -469,7 +469,7 @@ The camel.vault.hashicorp supports 6 options, which are
listed below.
=== Camel IBM Secrets Manager Vault configurations
-The camel.vault.ibm supports 10 options, which are listed below.
+The camel.vault.ibm supports 9 options, which are listed below.
[width="100%",cols="2,5,^1,2",options="header"]
|===
@@ -480,7 +480,6 @@ The camel.vault.ibm supports 10 options, which are listed
below.
| *camel.vault.ibm.eventStream{zwsp}Topic* | Specify the topic name for
consuming notification on IBM Event Stream | | String
| *camel.vault.ibm.eventStream{zwsp}Username* | Specify the username to access
IBM Event Stream | | String
| *camel.vault.ibm.refreshEnabled* | Whether to automatically reload Camel
upon secrets being updated in IBM. | false | boolean
-| *camel.vault.ibm.refreshPeriod* | The period (millis) between checking AWS
for updated secrets. | 30000 | long
| *camel.vault.ibm.secrets* | Specify the secret names (or pattern) to check
for updates. Multiple secrets can be separated by comma. | | String
| *camel.vault.ibm.serviceUrl* | Service URL to access IBM Secrets Manager
vault | | String
| *camel.vault.ibm.token* | Token to access IBM Secrets Manager vault | |
String