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 2020/09/29 09:55:48 UTC

[camel] branch master updated: Camel-AWS2-KMS: Added localstack test for describeKey

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

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


The following commit(s) were added to refs/heads/master by this push:
     new f629775  Camel-AWS2-KMS: Added localstack test for describeKey
f629775 is described below

commit f629775be579cba68e3f7c08cf30d4350f3a5d2f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Sep 29 11:55:01 2020 +0200

    Camel-AWS2-KMS: Added localstack test for describeKey
---
 ...Test.java => KmsDescribeKeyLocalstackTest.java} | 39 ++++++----------------
 .../kms/localstack/KmsEnableKeyLocalstackTest.java |  2 +-
 2 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsEnableKeyLocalstackTest.java b/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDescribeKeyLocalstackTest.java
similarity index 66%
copy from components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsEnableKeyLocalstackTest.java
copy to components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDescribeKeyLocalstackTest.java
index c7924320..29b07e0 100644
--- a/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsEnableKeyLocalstackTest.java
+++ b/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsDescribeKeyLocalstackTest.java
@@ -25,12 +25,12 @@ import org.apache.camel.component.aws2.kms.KMS2Constants;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.services.kms.model.CreateKeyResponse;
-import software.amazon.awssdk.services.kms.model.ListKeysResponse;
+import software.amazon.awssdk.services.kms.model.DescribeKeyResponse;
+import software.amazon.awssdk.services.kms.model.KeyState;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
-public class KmsEnableKeyLocalstackTest extends Aws2KmsBaseTest {
+public class KmsDescribeKeyLocalstackTest extends Aws2KmsBaseTest {
 
     @EndpointInject
     private ProducerTemplate template;
@@ -52,35 +52,19 @@ public class KmsEnableKeyLocalstackTest extends Aws2KmsBaseTest {
 
         String keyId = ex.getMessage().getBody(CreateKeyResponse.class).keyMetadata().keyId();
 
-        template.send("direct:disableKey", new Processor() {
+        template.send("direct:describeKey", new Processor() {
 
             @Override
             public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(KMS2Constants.OPERATION, "disableKey");
+                exchange.getIn().setHeader(KMS2Constants.OPERATION, "describeKey");
                 exchange.getIn().setHeader(KMS2Constants.KEY_ID, keyId);
             }
         });
 
-        template.send("direct:enableKey", new Processor() {
-
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(KMS2Constants.OPERATION, "enableKey");
-                exchange.getIn().setHeader(KMS2Constants.KEY_ID, keyId);
-            }
-        });
-
-        template.send("direct:listKeys", new Processor() {
-
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(KMS2Constants.OPERATION, "listKeys");
-            }
-        });
-
         assertMockEndpointsSatisfied();
         assertEquals(1, result.getExchanges().size());
-        assertTrue(result.getExchanges().get(0).getIn().getBody(ListKeysResponse.class).hasKeys());
+        assertEquals(KeyState.ENABLED,
+                result.getExchanges().get(0).getIn().getBody(DescribeKeyResponse.class).keyMetadata().keyState());
     }
 
     @Override
@@ -90,13 +74,10 @@ public class KmsEnableKeyLocalstackTest extends Aws2KmsBaseTest {
             public void configure() throws Exception {
                 String awsEndpoint
                         = "aws2-kms://default?operation=createKey";
-                String disableKey = "aws2-kms://default?operation=disableKey";
-                String enableKey = "aws2-kms://default?operation=enableKey";
-                String listKeys = "aws2-kms://default?operation=listKeys";
+                String describeKey
+                        = "aws2-kms://default?operation=describeKey";
                 from("direct:createKey").to(awsEndpoint);
-                from("direct:disableKey").to(disableKey);
-                from("direct:disableKey").to(enableKey);
-                from("direct:listKeys").to(listKeys).to("mock:result");
+                from("direct:describeKey").to(describeKey).to("mock:result");
             }
         };
     }
diff --git a/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsEnableKeyLocalstackTest.java b/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsEnableKeyLocalstackTest.java
index c7924320..3af99a2 100644
--- a/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsEnableKeyLocalstackTest.java
+++ b/components/camel-aws2-kms/src/test/java/org/apache/camel/component/aws2/kms/localstack/KmsEnableKeyLocalstackTest.java
@@ -95,7 +95,7 @@ public class KmsEnableKeyLocalstackTest extends Aws2KmsBaseTest {
                 String listKeys = "aws2-kms://default?operation=listKeys";
                 from("direct:createKey").to(awsEndpoint);
                 from("direct:disableKey").to(disableKey);
-                from("direct:disableKey").to(enableKey);
+                from("direct:enableKey").to(enableKey);
                 from("direct:listKeys").to(listKeys).to("mock:result");
             }
         };