This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch CAMEL-19906 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1799819c9f11f229c89aac5c8303ab75a4f5e3a5 Author: Andrea Cosentino <[email protected]> AuthorDate: Fri Sep 22 11:49:26 2023 +0200 CAMEL-19906 - Camel-Jbang: No need to have specific application properties exports for Secret Refresh features Signed-off-by: Andrea Cosentino <[email protected]> --- .../dsl/jbang/core/commands/ExportBaseCommand.java | 50 ---------------------- .../dsl/jbang/core/commands/ExportCamelMain.java | 25 ----------- .../dsl/jbang/core/commands/ExportQuarkus.java | 21 --------- .../dsl/jbang/core/commands/ExportSpringBoot.java | 25 ----------- 4 files changed, 121 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java index 01426fea74f..31e4b613da8 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java @@ -524,7 +524,6 @@ abstract class ExportBaseCommand extends CamelCommand { RuntimeUtil.loadProperties(prop2, profile); } prop2.putAll(prop); - prepareApplicationProperties(prop2); for (Map.Entry<Object, Object> entry : prop.entrySet()) { String key = entry.getKey().toString(); @@ -797,55 +796,6 @@ abstract class ExportBaseCommand extends CamelCommand { } } - protected void exportAwsSecretsRefreshProp(Properties properties) { - properties.setProperty("camel.vault.aws.accessKey", "<accessKey>"); - properties.setProperty("camel.vault.aws.secretKey", "<secretKey>"); - properties.setProperty("camel.vault.aws.region", "<region>"); - properties.setProperty("camel.vault.aws.useDefaultCredentialProvider", "<useDefaultCredentialProvider>"); - properties.setProperty("camel.vault.aws.refreshEnabled", "true"); - properties.setProperty("camel.vault.aws.refreshPeriod", "30000"); - properties.setProperty("camel.vault.aws.secrets", "<secrets>"); - if (runtime.equalsIgnoreCase("spring-boot")) { - properties.setProperty("camel.springboot.context-reload-enabled", "true"); - } else { - properties.setProperty("camel.main.context-reload-enabled", "true"); - } - } - - protected void exportGcpSecretsRefreshProp(Properties properties) { - properties.setProperty("camel.vault.gcp.serviceAccountKey", "<serviceAccountKey>"); - properties.setProperty("camel.vault.gcp.projectId", "<projectId>"); - properties.setProperty("camel.vault.gcp.useDefaultInstance", "<useDefaultInstance>"); - properties.setProperty("camel.vault.gcp.refreshEnabled", "true"); - properties.setProperty("camel.vault.aws.refreshPeriod", "30000"); - properties.setProperty("camel.vault.gcp.secrets", "<secrets>"); - properties.setProperty("camel.vault.gcp.subscriptionName", "<subscriptionName>"); - if (runtime.equalsIgnoreCase("spring-boot")) { - properties.setProperty("camel.springboot.context-reload-enabled", "true"); - } else { - properties.setProperty("camel.main.context-reload-enabled", "true"); - } - } - - protected void exportAzureSecretsRefreshProp(Properties properties) { - properties.setProperty("camel.vault.azure.tenantId", "<tenantId>"); - properties.setProperty("camel.vault.azure.clientId", "<clientId>"); - properties.setProperty("camel.vault.azure.clientSecret", "<clientSecret>"); - properties.setProperty("camel.vault.azure.vaultName", "<vaultName>"); - properties.setProperty("camel.vault.azure.refreshEnabled", "true"); - properties.setProperty("camel.vault.azure.refreshPeriod", "30000"); - properties.setProperty("camel.vault.azure.secrets", "<secrets>"); - properties.setProperty("camel.vault.azure.eventhubConnectionString", "<eventhubConnectionString>"); - properties.setProperty("camel.vault.azure.blobAccountName", "<blobAccountName>"); - properties.setProperty("camel.vault.azure.blobContainerName", "<blobContainerName>"); - properties.setProperty("camel.vault.azure.blobAccessKey", "<blobAccessKey>"); - if (runtime.equalsIgnoreCase("spring-boot")) { - properties.setProperty("camel.springboot.context-reload-enabled", "true"); - } else { - properties.setProperty("camel.main.context-reload-enabled", "true"); - } - } - protected List<String> getSecretProviders() { if (secretsRefreshProviders != null) { List<String> providers = Pattern.compile("\\,") diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java index 9c5d9df7e6d..1b1d7079f01 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java @@ -346,29 +346,4 @@ class ExportCamelMain extends Export { is = ExportCamelMain.class.getResourceAsStream("/assembly/runner.xml"); safeCopy(is, new File(srcResourcesDir, "assembly/runner.xml")); } - - @Override - protected void prepareApplicationProperties(Properties properties) { - if (secretsRefresh) { - if (secretsRefreshProviders != null) { - List<String> providers = getSecretProviders(); - - for (String provider : providers) { - switch (provider) { - case "aws": - exportAwsSecretsRefreshProp(properties); - break; - case "gcp": - exportGcpSecretsRefreshProp(properties); - break; - case "azure": - exportAzureSecretsRefreshProp(properties); - break; - default: - break; - } - } - } - } - } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java index c525ff3a1a2..14babc4717b 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java @@ -190,27 +190,6 @@ class ExportQuarkus extends Export { properties.setProperty("camel.main.routes-include-pattern", routes); } } - if (secretsRefresh) { - if (secretsRefreshProviders != null) { - List<String> providers = getSecretProviders(); - - for (String provider : providers) { - switch (provider) { - case "aws": - exportAwsSecretsRefreshProp(properties); - break; - case "gcp": - exportGcpSecretsRefreshProp(properties); - break; - case "azure": - exportAzureSecretsRefreshProp(properties); - break; - default: - break; - } - } - } - } } private static String removeScheme(String s) { diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java index 64a8eed6758..4555cb9cf6d 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java @@ -444,31 +444,6 @@ class ExportSpringBoot extends Export { } } - @Override - protected void prepareApplicationProperties(Properties properties) { - if (secretsRefresh) { - if (secretsRefreshProviders != null) { - List<String> providers = getSecretProviders(); - - for (String provider : providers) { - switch (provider) { - case "aws": - exportAwsSecretsRefreshProp(properties); - break; - case "gcp": - exportGcpSecretsRefreshProp(properties); - break; - case "azure": - exportAzureSecretsRefreshProp(properties); - break; - default: - break; - } - } - } - } - } - @Override protected String applicationPropertyLine(String key, String value) { // camel.main.x should be renamed to camel.springboot.x
