This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch export-secrets in repository https://gitbox.apache.org/repos/asf/camel.git
commit fa14acb76e599a7344e9362058058acadd1cb1c3 Author: Andrea Cosentino <[email protected]> AuthorDate: Tue May 9 11:01:41 2023 +0200 CAMEL-19099 - Camel-Jbang Export: Add a flag to include secret refresh properties in application.properties Signed-off-by: Andrea Cosentino <[email protected]> --- .../apache/camel/dsl/jbang/core/commands/Export.java | 3 ++- .../dsl/jbang/core/commands/ExportBaseCommand.java | 4 ++-- .../dsl/jbang/core/commands/ExportCamelMain.java | 9 ++++----- .../camel/dsl/jbang/core/commands/ExportQuarkus.java | 19 +++++++++---------- .../dsl/jbang/core/commands/ExportSpringBoot.java | 18 +++++++++--------- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java index a5f429b66e6..c2f2aac058c 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java @@ -64,7 +64,8 @@ public class Export extends ExportBaseCommand { this.buildTool = prop.getProperty("camel.jbang.buildTool", this.buildTool); this.secretsRefresh = "true".equals(prop.getProperty("camel.jbang.secretsRefresh", this.secretsRefresh ? "true" : "false")); - this.secretsRefreshProviders = prop.getProperty("camel.jbang.secretsRefreshProviders", this.secretsRefreshProviders); + this.secretsRefreshProviders + = prop.getProperty("camel.jbang.secretsRefreshProviders", this.secretsRefreshProviders); } if (runtime == null) { 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 a2054c9c956..ad651ef82bd 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 @@ -164,7 +164,8 @@ abstract class ExportBaseCommand extends CamelCommand { @CommandLine.Option(names = { "--secrets-refresh" }, defaultValue = "false", description = "Enabling secrets refresh") protected boolean secretsRefresh; - @CommandLine.Option(names = { "--secrets-refresh-providers" }, description = "Comma separated list of providers in the set AWS, GCP and Azure, to use in combination with --secrets-refresh option") + @CommandLine.Option(names = { "--secrets-refresh-providers" }, + description = "Comma separated list of providers in the set AWS, GCP and Azure, to use in combination with --secrets-refresh option") protected String secretsRefreshProviders; public ExportBaseCommand(CamelJBangMain main) { @@ -734,7 +735,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>"); 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 92c143e1492..533dd72ff72 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 @@ -200,8 +200,7 @@ class ExportCamelMain extends Export { if (secretsRefresh) { if (secretsRefreshProviders != null) { List<String> providers = getSecretProviders(); - for (String provider : providers - ) { + for (String provider : providers) { switch (provider) { case "AWS": sb.append(" <dependency>\n"); @@ -212,7 +211,8 @@ class ExportCamelMain extends Export { case "GCP": sb.append(" <dependency>\n"); sb.append(" <groupId>").append("org.apache.camel").append("</groupId>\n"); - sb.append(" <artifactId>").append("camel-google-secret-manager").append("</artifactId>\n"); + sb.append(" <artifactId>").append("camel-google-secret-manager") + .append("</artifactId>\n"); sb.append(" </dependency>\n"); break; case "Azure": @@ -284,8 +284,7 @@ class ExportCamelMain extends Export { if (secretsRefreshProviders != null) { List<String> providers = getSecretProviders(); - for (String provider : providers - ) { + for (String provider : providers) { switch (provider) { case "AWS": exportAwsSecretsRefreshProp(properties); 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 744acf06ab5..7e8c3ad4e4a 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 @@ -26,7 +26,6 @@ import java.util.Map; import java.util.Properties; import java.util.Set; import java.util.StringJoiner; -import java.util.regex.Pattern; import java.util.stream.Collectors; import org.apache.camel.catalog.CamelCatalog; @@ -190,8 +189,7 @@ class ExportQuarkus extends Export { if (secretsRefreshProviders != null) { List<String> providers = getSecretProviders(); - for (String provider : providers - ) { + for (String provider : providers) { switch (provider) { case "AWS": exportAwsSecretsRefreshProp(properties); @@ -309,8 +307,7 @@ class ExportQuarkus extends Export { if (secretsRefresh) { if (secretsRefreshProviders != null) { List<String> providers = getSecretProviders(); - for (String provider : providers - ) { + for (String provider : providers) { switch (provider) { case "AWS": MavenGav awsGav = new MavenGav(); @@ -474,25 +471,27 @@ class ExportQuarkus extends Export { if (secretsRefresh) { if (secretsRefreshProviders != null) { List<String> providers = getSecretProviders(); - for (String provider : providers - ) { + for (String provider : providers) { switch (provider) { case "AWS": sb.append(" <dependency>\n"); sb.append(" <groupId>").append("org.apache.camel.quarkus").append("</groupId>\n"); - sb.append(" <artifactId>").append("camel-quarkus-aws-secrets-manager").append("</artifactId>\n"); + sb.append(" <artifactId>").append("camel-quarkus-aws-secrets-manager") + .append("</artifactId>\n"); sb.append(" </dependency>\n"); break; case "GCP": sb.append(" <dependency>\n"); sb.append(" <groupId>").append("org.apache.camel.quarkus").append("</groupId>\n"); - sb.append(" <artifactId>").append("camel-quarkus-google-secret-manager").append("</artifactId>\n"); + sb.append(" <artifactId>").append("camel-quarkus-google-secret-manager") + .append("</artifactId>\n"); sb.append(" </dependency>\n"); break; case "Azure": sb.append(" <dependency>\n"); sb.append(" <groupId>").append("org.apache.camel.quarkus").append("</groupId>\n"); - sb.append(" <artifactId>").append("camel-quarkus-azure-key-vault").append("</artifactId>\n"); + sb.append(" <artifactId>").append("camel-quarkus-azure-key-vault") + .append("</artifactId>\n"); sb.append(" </dependency>\n"); break; } 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 6df9850a7e6..a162046fd23 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 @@ -253,25 +253,27 @@ class ExportSpringBoot extends Export { if (secretsRefresh) { if (secretsRefreshProviders != null) { List<String> providers = getSecretProviders(); - for (String provider : providers - ) { + for (String provider : providers) { switch (provider) { case "AWS": sb.append(" <dependency>\n"); sb.append(" <groupId>").append("org.apache.camel.springboot").append("</groupId>\n"); - sb.append(" <artifactId>").append("camel-aws-secrets-manager-starter").append("</artifactId>\n"); + sb.append(" <artifactId>").append("camel-aws-secrets-manager-starter") + .append("</artifactId>\n"); sb.append(" </dependency>\n"); break; case "GCP": sb.append(" <dependency>\n"); sb.append(" <groupId>").append("org.apache.camel.springboot").append("</groupId>\n"); - sb.append(" <artifactId>").append("camel-google-secret-manager-starter").append("</artifactId>\n"); + sb.append(" <artifactId>").append("camel-google-secret-manager-starter") + .append("</artifactId>\n"); sb.append(" </dependency>\n"); break; case "Azure": sb.append(" <dependency>\n"); sb.append(" <groupId>").append("org.apache.camel.springboot").append("</groupId>\n"); - sb.append(" <artifactId>").append("camel-azure-key-vault-starter").append("</artifactId>\n"); + sb.append(" <artifactId>").append("camel-azure-key-vault-starter") + .append("</artifactId>\n"); sb.append(" </dependency>\n"); break; } @@ -352,8 +354,7 @@ class ExportSpringBoot extends Export { if (secretsRefresh) { if (secretsRefreshProviders != null) { List<String> providers = getSecretProviders(); - for (String provider : providers - ) { + for (String provider : providers) { switch (provider) { case "AWS": MavenGav awsGav = new MavenGav(); @@ -444,8 +445,7 @@ class ExportSpringBoot extends Export { if (secretsRefreshProviders != null) { List<String> providers = getSecretProviders(); - for (String provider : providers - ) { + for (String provider : providers) { switch (provider) { case "AWS": exportAwsSecretsRefreshProp(properties);
