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 2022/02/21 17:47:47 UTC

[camel] branch main updated (63bd073 -> d6ff322)

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 63bd073  CAMEL-17685 - Create a Camel Google Secrets Manager component
     new 4c3952c  CAMEL-17691 - Camel Google Secret Manager: Add more operations
     new 16c3c07  CAMEL-17691 - Camel Google Secret Manager: Add more operations
     new 1a94971  CAMEL-17691 - Camel Google Secret Manager: Add more operations
     new d6ff322  CAMEL-17691 - Camel Google Secret Manager: Add more operations

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../manager/GoogleSecretManagerConstants.java      |  1 +
 .../manager/GoogleSecretManagerOperations.java     |  1 +
 .../manager/GoogleSecretManagerProducer.java       | 23 +++++++++++++-
 .../secret/manager/integration/GoogleCloudIT.java  | 36 +++++++++++++++++-----
 .../{log4j.properties => log4j2.properties}        |  2 +-
 5 files changed, 53 insertions(+), 10 deletions(-)
 rename components/camel-google/camel-google-secrets-manager/src/test/resources/{log4j.properties => log4j2.properties} (97%)

[camel] 02/04: CAMEL-17691 - Camel Google Secret Manager: Add more operations

Posted by ac...@apache.org.
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 <an...@gmail.com>
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

[camel] 04/04: CAMEL-17691 - Camel Google Secret Manager: Add more operations

Posted by ac...@apache.org.
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 d6ff32252c50527cded931023c058b0bf8a1026f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 21 18:47:05 2022 +0100

    CAMEL-17691 - Camel Google Secret Manager: Add more operations
---
 .../component/google/secret/manager/integration/GoogleCloudIT.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 001ecee..a325ad5 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
@@ -48,11 +48,11 @@ public class GoogleCloudIT extends CamelTestSupport {
 
                 from("direct:createSecret")
                         .to("google-secret-manager://" + project + "?serviceAccountKey="
-                         + serviceAccountKeyFile + "&operation=createSecret")
+                            + serviceAccountKeyFile + "&operation=createSecret")
                         .to("mock:createSecret");
 
                 from("direct:getSecretVersion").to("google-secret-manager://" + project + "?serviceAccountKey="
-                         + serviceAccountKeyFile + "&operation=getSecretVersion")
+                                                   + serviceAccountKeyFile + "&operation=getSecretVersion")
                         .to("mock:getSecret");
 
             }

[camel] 03/04: CAMEL-17691 - Camel Google Secret Manager: Add more operations

Posted by ac...@apache.org.
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 1a94971f075ec5faddfc4061d762288007a08eff
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 21 18:40:30 2022 +0100

    CAMEL-17691 - Camel Google Secret Manager: Add more operations
---
 .../component/google/secret/manager/integration/GoogleCloudIT.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a81aa29..001ecee 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
@@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class GoogleCloudIT extends CamelTestSupport {
 
     final String serviceAccountKeyFile = System.getenv("GOOGLE_APPLICATION_CREDENTIALS");
-    final String project = "andrea-342012";
+    final String project = "myProject";
 
     @EndpointInject("mock:createSecret")
     private MockEndpoint mockSecret;

[camel] 01/04: CAMEL-17691 - Camel Google Secret Manager: Add more operations

Posted by ac...@apache.org.
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 4c3952cdd410fcdba45be9ba13ee3e894dd42e2d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 21 15:30:38 2022 +0100

    CAMEL-17691 - Camel Google Secret Manager: Add more operations
---
 .../manager/GoogleSecretManagerConstants.java      |  1 +
 .../manager/GoogleSecretManagerOperations.java     |  1 +
 .../manager/GoogleSecretManagerProducer.java       | 28 +++++++++++++++-------
 .../secret/manager/integration/GoogleCloudIT.java  | 15 ++++++++++++
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/components/camel-google/camel-google-secrets-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerConstants.java b/components/camel-google/camel-google-secrets-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerConstants.java
index 593f76b..ec02f51 100644
--- a/components/camel-google/camel-google-secrets-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerConstants.java
+++ b/components/camel-google/camel-google-secrets-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerConstants.java
@@ -19,5 +19,6 @@ package org.apache.camel.component.google.secret.manager;
 public interface GoogleSecretManagerConstants {
     String OPERATION = "GoogleSecretManagerOperation";
     String SECRET_ID = "CamelGoogleSecretManagerSecretId";
+    String VERSION_ID = "CamelGoogleSecretManagerVersionId";
     String REPLICATION = "CamelGoogleSecretManagerReplication";
 }
diff --git a/components/camel-google/camel-google-secrets-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerOperations.java b/components/camel-google/camel-google-secrets-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerOperations.java
index b5c27a1..1ed549c 100644
--- a/components/camel-google/camel-google-secrets-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerOperations.java
+++ b/components/camel-google/camel-google-secrets-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerOperations.java
@@ -19,5 +19,6 @@ package org.apache.camel.component.google.secret.manager;
 public enum GoogleSecretManagerOperations {
 
     createSecret,
+    getSecretVersion,
     deleteSecret;
 }
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 873531c..ae7f1ce 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,13 +16,7 @@
  */
 package org.apache.camel.component.google.secret.manager;
 
-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.*;
 import com.google.protobuf.ByteString;
 import org.apache.camel.Exchange;
 import org.apache.camel.InvalidPayloadException;
@@ -50,7 +44,9 @@ public class GoogleSecretManagerProducer extends DefaultProducer {
             case createSecret:
                 createSecret(endpoint.getClient(), exchange);
                 break;
-
+            case getSecretVersion:
+                getSecretVersion(endpoint.getClient(), exchange);
+                break;
             default:
                 throw new IllegalArgumentException("Unsupported operation");
         }
@@ -80,6 +76,22 @@ public class GoogleSecretManagerProducer extends DefaultProducer {
         message.setBody(response);
     }
 
+    private void getSecretVersion(SecretManagerServiceClient client, Exchange exchange) throws InvalidPayloadException {
+        AccessSecretVersionResponse response;
+        if (getConfiguration().isPojoRequest()) {
+            AccessSecretVersionRequest request = exchange.getIn().getMandatoryBody(AccessSecretVersionRequest.class);
+            response = client.accessSecretVersion(request);
+        } else {
+            String secretId = exchange.getMessage().getHeader(GoogleSecretManagerConstants.SECRET_ID, String.class);
+            String versionId = exchange.getMessage().getHeader(GoogleSecretManagerConstants.VERSION_ID, String.class);
+            String projectId = getConfiguration().getProject();
+            SecretVersionName secretVersionName = SecretVersionName.of(projectId, secretId, versionId);
+            response = client.accessSecretVersion(secretVersionName);
+        }
+        Message message = getMessageForResponse(exchange);
+        message.setBody(response.getPayload().getData().toStringUtf8());
+    }
+
     private GoogleSecretManagerOperations determineOperation(Exchange exchange) {
         GoogleSecretManagerOperations operation = exchange.getIn().getHeader(GoogleSecretManagerConstants.OPERATION,
                 GoogleSecretManagerOperations.class);
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 6027a22..389510f 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
@@ -35,6 +35,8 @@ public class GoogleCloudIT extends CamelTestSupport {
 
     @EndpointInject("mock:createSecret")
     private MockEndpoint mockSecret;
+    @EndpointInject("mock:getSecret")
+    private MockEndpoint mockGetSecret;
 
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
@@ -53,6 +55,16 @@ public class GoogleCloudIT extends CamelTestSupport {
                             + 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}")
+                        .to("mock:getSecret");
+
             }
         };
     }
@@ -61,6 +73,9 @@ public class GoogleCloudIT extends CamelTestSupport {
     public void sendIn() throws Exception {
 
         mockSecret.expectedMessageCount(1);
+        mockGetSecret.expectedMessageCount(1);
+        Thread.sleep(10000);
+        template.requestBody("direct:getSecretVersion", "Hello");
         Thread.sleep(10000);
     }