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
commit 16c3c0716dc9892b888082e920815827b141cb1d Author: Andrea Cosentino <[email protected]> AuthorDate: Mon Feb 21 18:39:58 2022 +0100 CAMEL-17691 - Camel Google Secret Manager: Add more operations --- .../manager/GoogleSecretManagerProducer.java | 11 +++++- .../secret/manager/integration/GoogleCloudIT.java | 45 ++++++++++++---------- .../{log4j.properties => log4j2.properties} | 2 +- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/components/camel-google/camel-google-secrets-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerProducer.java b/components/camel-google/camel-google-secrets-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerProducer.java index ae7f1ce..93d2a4c 100644 --- a/components/camel-google/camel-google-secrets-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerProducer.java +++ b/components/camel-google/camel-google-secrets-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerProducer.java @@ -16,7 +16,16 @@ */ package org.apache.camel.component.google.secret.manager; -import com.google.cloud.secretmanager.v1.*; +import com.google.cloud.secretmanager.v1.AccessSecretVersionRequest; +import com.google.cloud.secretmanager.v1.AccessSecretVersionResponse; +import com.google.cloud.secretmanager.v1.AddSecretVersionRequest; +import com.google.cloud.secretmanager.v1.ProjectName; +import com.google.cloud.secretmanager.v1.Replication; +import com.google.cloud.secretmanager.v1.Secret; +import com.google.cloud.secretmanager.v1.SecretManagerServiceClient; +import com.google.cloud.secretmanager.v1.SecretPayload; +import com.google.cloud.secretmanager.v1.SecretVersion; +import com.google.cloud.secretmanager.v1.SecretVersionName; import com.google.protobuf.ByteString; import org.apache.camel.Exchange; import org.apache.camel.InvalidPayloadException; diff --git a/components/camel-google/camel-google-secrets-manager/src/test/java/org/apache/camel/component/google/secret/manager/integration/GoogleCloudIT.java b/components/camel-google/camel-google-secrets-manager/src/test/java/org/apache/camel/component/google/secret/manager/integration/GoogleCloudIT.java index 389510f..a81aa29 100644 --- a/components/camel-google/camel-google-secrets-manager/src/test/java/org/apache/camel/component/google/secret/manager/integration/GoogleCloudIT.java +++ b/components/camel-google/camel-google-secrets-manager/src/test/java/org/apache/camel/component/google/secret/manager/integration/GoogleCloudIT.java @@ -26,12 +26,14 @@ import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; +import static org.junit.jupiter.api.Assertions.assertEquals; + @EnabledIfEnvironmentVariable(named = "GOOGLE_APPLICATION_CREDENTIALS", matches = ".*", disabledReason = "Application credentials were not provided") public class GoogleCloudIT extends CamelTestSupport { final String serviceAccountKeyFile = System.getenv("GOOGLE_APPLICATION_CREDENTIALS"); - final String project = "myProject"; + final String project = "andrea-342012"; @EndpointInject("mock:createSecret") private MockEndpoint mockSecret; @@ -44,25 +46,13 @@ public class GoogleCloudIT extends CamelTestSupport { @Override public void configure() throws Exception { - from("timer:timer1?repeatCount=1").process(new Processor() { - @Override - public void process(Exchange exchange) throws Exception { - exchange.getMessage().setHeader(GoogleSecretManagerConstants.SECRET_ID, "test123"); - exchange.getMessage().setBody("Hello"); - } - }) + from("direct:createSecret") .to("google-secret-manager://" + project + "?serviceAccountKey=" - + serviceAccountKeyFile + "&operation=createSecret") + + serviceAccountKeyFile + "&operation=createSecret") .to("mock:createSecret"); - from("direct:getSecretVersion").process(new Processor() { - @Override - public void process(Exchange exchange) throws Exception { - exchange.getMessage().setHeader(GoogleSecretManagerConstants.SECRET_ID, "test123"); - exchange.getMessage().setHeader(GoogleSecretManagerConstants.VERSION_ID, "1"); - } - }).to("google-secret-manager://" + project + "?serviceAccountKey=" - + serviceAccountKeyFile + "&operation=getSecretVersion").log("${body}") + from("direct:getSecretVersion").to("google-secret-manager://" + project + "?serviceAccountKey=" + + serviceAccountKeyFile + "&operation=getSecretVersion") .to("mock:getSecret"); } @@ -74,9 +64,24 @@ public class GoogleCloudIT extends CamelTestSupport { mockSecret.expectedMessageCount(1); mockGetSecret.expectedMessageCount(1); - Thread.sleep(10000); - template.requestBody("direct:getSecretVersion", "Hello"); - Thread.sleep(10000); + + template.send("direct:createSecret", new Processor() { + + @Override + public void process(Exchange exchange) throws Exception { + exchange.getMessage().setHeader(GoogleSecretManagerConstants.SECRET_ID, "test123"); + exchange.getMessage().setBody("Hello"); + } + }); + Exchange ex = template.request("direct:getSecretVersion", new Processor() { + @Override + public void process(Exchange exchange) throws Exception { + exchange.getMessage().setHeader(GoogleSecretManagerConstants.SECRET_ID, "test123"); + exchange.getMessage().setHeader(GoogleSecretManagerConstants.VERSION_ID, "1"); + } + }); + + assertEquals("Hello", ex.getMessage().getBody()); } } diff --git a/components/camel-google/camel-google-secrets-manager/src/test/resources/log4j.properties b/components/camel-google/camel-google-secrets-manager/src/test/resources/log4j2.properties similarity index 97% rename from components/camel-google/camel-google-secrets-manager/src/test/resources/log4j.properties rename to components/camel-google/camel-google-secrets-manager/src/test/resources/log4j2.properties index fcf7425..69b1d68 100644 --- a/components/camel-google/camel-google-secrets-manager/src/test/resources/log4j.properties +++ b/components/camel-google/camel-google-secrets-manager/src/test/resources/log4j2.properties @@ -28,4 +28,4 @@ appender.out.name = out appender.out.layout.type = PatternLayout appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n rootLogger.level = INFO -rootLogger.appenderRef.file.ref = file \ No newline at end of file +rootLogger.appenderRef.file.ref = file
