You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/05/09 13:24:50 UTC
[camel] 10/10: CAMEL-19099 - Camel-Jbang Export: Add a flag to include secret refresh properties in application.properties
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8a4721fed9cecf96c94e2c951fd36d714a5a6e44
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue May 9 13:46:18 2023 +0200
CAMEL-19099 - Camel-Jbang Export: Add a flag to include secret refresh properties in application.properties
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../dsl/jbang/core/commands/ExportBaseCommand.java | 2 +-
.../camel/dsl/jbang/core/commands/ExportCamelMain.java | 12 ++++++------
.../camel/dsl/jbang/core/commands/ExportQuarkus.java | 18 +++++++++---------
.../dsl/jbang/core/commands/ExportSpringBoot.java | 18 +++++++++---------
4 files changed, 25 insertions(+), 25 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 f2d50aa70f9..4f34e942b67 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
@@ -155,7 +155,7 @@ abstract class ExportBaseCommand extends CamelCommand {
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")
+ description = "Comma separated list of providers in the set aws,gcp and azure, to use in combination with --secrets-refresh option")
protected String secretsRefreshProviders;
@CommandLine.Option(names = { "--logging" }, defaultValue = "false",
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 8c3835f8d5f..06204ebd8ce 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
@@ -202,20 +202,20 @@ class ExportCamelMain extends Export {
List<String> providers = getSecretProviders();
for (String provider : providers) {
switch (provider) {
- case "AWS":
+ case "aws":
sb.append(" <dependency>\n");
sb.append(" <groupId>").append("org.apache.camel").append("</groupId>\n");
sb.append(" <artifactId>").append("camel-aws-secrets-manager").append("</artifactId>\n");
sb.append(" </dependency>\n");
break;
- case "GCP":
+ 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(" </dependency>\n");
break;
- case "Azure":
+ case "azure":
sb.append(" <dependency>\n");
sb.append(" <groupId>").append("org.apache.camel").append("</groupId>\n");
sb.append(" <artifactId>").append("camel-azure-key-vault").append("</artifactId>\n");
@@ -288,13 +288,13 @@ class ExportCamelMain extends Export {
for (String provider : providers) {
switch (provider) {
- case "AWS":
+ case "aws":
exportAwsSecretsRefreshProp(properties);
break;
- case "GCP":
+ case "gcp":
exportGcpSecretsRefreshProp(properties);
break;
- case "Azure":
+ case "azure":
exportAzureSecretsRefreshProp(properties);
break;
default:
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 1669d022b4f..51c9098d50c 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
@@ -191,13 +191,13 @@ class ExportQuarkus extends Export {
for (String provider : providers) {
switch (provider) {
- case "AWS":
+ case "aws":
exportAwsSecretsRefreshProp(properties);
break;
- case "GCP":
+ case "gcp":
exportGcpSecretsRefreshProp(properties);
break;
- case "Azure":
+ case "azure":
exportAzureSecretsRefreshProp(properties);
break;
default:
@@ -311,21 +311,21 @@ class ExportQuarkus extends Export {
List<String> providers = getSecretProviders();
for (String provider : providers) {
switch (provider) {
- case "AWS":
+ case "aws":
MavenGav awsGav = new MavenGav();
awsGav.setGroupId("org.apache.camel.quarkus");
awsGav.setArtifactId("camel-quarkus-aws-secrets-manager");
awsGav.setVersion(null);
gavs.add(awsGav);
break;
- case "GCP":
+ case "gcp":
MavenGav gcpGav = new MavenGav();
gcpGav.setGroupId("org.apache.camel.quarkus");
gcpGav.setArtifactId("camel-quarkus-google-secret-manager");
gcpGav.setVersion(null);
gavs.add(gcpGav);
break;
- case "Azure":
+ case "azure":
MavenGav azureGav = new MavenGav();
azureGav.setGroupId("org.apache.camel.quarkus");
azureGav.setArtifactId("camel-quarkus-azure-key-vault");
@@ -477,21 +477,21 @@ class ExportQuarkus extends Export {
List<String> providers = getSecretProviders();
for (String provider : providers) {
switch (provider) {
- case "AWS":
+ 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(" </dependency>\n");
break;
- case "GCP":
+ 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(" </dependency>\n");
break;
- case "Azure":
+ 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")
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 71e69c70636..6bdfaf2fcb1 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
@@ -262,21 +262,21 @@ class ExportSpringBoot extends Export {
List<String> providers = getSecretProviders();
for (String provider : providers) {
switch (provider) {
- case "AWS":
+ 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(" </dependency>\n");
break;
- case "GCP":
+ 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(" </dependency>\n");
break;
- case "Azure":
+ 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")
@@ -365,21 +365,21 @@ class ExportSpringBoot extends Export {
List<String> providers = getSecretProviders();
for (String provider : providers) {
switch (provider) {
- case "AWS":
+ case "aws":
MavenGav awsGav = new MavenGav();
awsGav.setGroupId("org.apache.camel.springboot");
awsGav.setArtifactId("camel-aws-secrets-manager-starter");
awsGav.setVersion(null);
gavs.add(awsGav);
break;
- case "GCP":
+ case "gcp":
MavenGav gcpGav = new MavenGav();
gcpGav.setGroupId("org.apache.camel.springboot");
gcpGav.setArtifactId("camel-google-secret-manager-starter");
gcpGav.setVersion(null);
gavs.add(gcpGav);
break;
- case "Azure":
+ case "azure":
MavenGav azureGav = new MavenGav();
azureGav.setGroupId("org.apache.camel.springboot");
azureGav.setArtifactId("camel-azure-key-vault-starter");
@@ -458,13 +458,13 @@ class ExportSpringBoot extends Export {
for (String provider : providers) {
switch (provider) {
- case "AWS":
+ case "aws":
exportAwsSecretsRefreshProp(properties);
break;
- case "GCP":
+ case "gcp":
exportGcpSecretsRefreshProp(properties);
break;
- case "Azure":
+ case "azure":
exportAzureSecretsRefreshProp(properties);
break;
default: