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 2021/03/18 07:16:58 UTC
[camel] branch master updated (6e4c8a0 -> bb5a446)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 6e4c8a0 Camel-Examples: PrepareExampleMojo doesn't need to filter for camel-example-* string anymore
new b087874 Camel-AWS-Secrets-Manager: Moving integration test to localstack
new 791b4e5 Camel-AWS-Secrets-Manager: Moving integration test to localstack
new 69666b9 Camel-AWS-Secrets-Manager: Moving integration test to localstack
new d1f2859 Camel-AWS-Secrets-Manager: Moving integration test to localstack
new 685a3ae Camel-AWS-Secrets-Manager: Moving integration test to localstack
new bb5a446 Camel-AWS-Secrets-Manager: Moving integration test to localstack
The 6 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:
...nagerDescribeSecretProducerLocalstackTest.java} | 39 ++++++++++++++++------
...etsManagerGetSecretProducerLocalstackTest.java} | 15 ++++-----
2 files changed, 35 insertions(+), 19 deletions(-)
rename components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/{integration/SecretsManagerDescibeSecretProducerIntegrationTest.java => localstack/SecretsManagerDescribeSecretProducerLocalstackTest.java} (55%)
copy components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/{SecretsManagerDeleteSecretProducerLocalstackTest.java => SecretsManagerGetSecretProducerLocalstackTest.java} (83%)
[camel] 04/06: Camel-AWS-Secrets-Manager: Moving integration test
to localstack
Posted by ac...@apache.org.
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
commit d1f28596b7497cba986104fb4cb3323024675d35
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Mar 18 07:59:59 2021 +0100
Camel-AWS-Secrets-Manager: Moving integration test to localstack
---
...anagerDescibeSecretProducerIntegrationTest.java | 63 ----------------------
1 file changed, 63 deletions(-)
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerDescibeSecretProducerIntegrationTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerDescibeSecretProducerIntegrationTest.java
deleted file mode 100644
index 0e6dfd0..0000000
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/integration/SecretsManagerDescibeSecretProducerIntegrationTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.aws.secretsmanager.integration;
-
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.aws.secretsmanager.SecretsManagerConstants;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit5.CamelTestSupport;
-import org.junit.jupiter.api.Test;
-import software.amazon.awssdk.services.secretsmanager.model.DescribeSecretResponse;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-//@Disabled("This test must be manually started, you need to specify AWS Credentials")
-public class SecretsManagerDescibeSecretProducerIntegrationTest extends CamelTestSupport {
-
- @EndpointInject("mock:result")
- private MockEndpoint mock;
-
- @Test
- public void translateTextTest() throws Exception {
-
- mock.expectedMessageCount(1);
- Exchange exchange = template.request("direct:listSecrets", new Processor() {
- @Override
- public void process(Exchange exchange) throws Exception {
- exchange.getIn().setHeader(SecretsManagerConstants.SECRET_ID, "test5");
- }
- });
-
- DescribeSecretResponse resultGet = (DescribeSecretResponse) exchange.getIn().getBody();
- assertNotNull(resultGet.toString());
- }
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("direct:listSecrets")
- .to("aws-secrets-manager://test?accessKey=RAW(xxxx)&secretKey=RAW(yyyy)®ion=eu-west-1&operation=describeSecret")
- .to("mock:result");
- }
- };
- }
-}
[camel] 05/06: Camel-AWS-Secrets-Manager: Moving integration test
to localstack
Posted by ac...@apache.org.
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
commit 685a3ae3d57b7b09cab7a4b6cde42b308ccb8fad
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Mar 18 08:05:44 2021 +0100
Camel-AWS-Secrets-Manager: Moving integration test to localstack
---
...retsManagerGetSecretProducerLocalstackTest.java | 78 ++++++++++++++++++++++
1 file changed, 78 insertions(+)
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerGetSecretProducerLocalstackTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerGetSecretProducerLocalstackTest.java
new file mode 100644
index 0000000..611452d
--- /dev/null
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerGetSecretProducerLocalstackTest.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.aws.secretsmanager.localstack;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.aws.secretsmanager.SecretsManagerConstants;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Test;
+
+import software.amazon.awssdk.services.secretsmanager.model.CreateSecretResponse;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class SecretsManagerGetSecretProducerLocalstackTest extends AwsSecretsManagerBaseTest {
+
+ @EndpointInject("mock:result")
+ private MockEndpoint mock;
+
+ @Test
+ public void createSecretTest() throws Exception {
+
+ mock.expectedMessageCount(1);
+ Exchange exchange = template.request("direct:createSecret", new Processor() {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(SecretsManagerConstants.SECRET_NAME, "TestSecret4");
+ exchange.getIn().setBody("Body");
+ }
+ });
+
+ CreateSecretResponse resultGet = (CreateSecretResponse) exchange.getIn().getBody();
+ assertNotNull(resultGet);
+
+ exchange = template.request("direct:getSecret", new Processor() {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(SecretsManagerConstants.SECRET_ID, resultGet.arn());
+ }
+ });
+
+ String secret = exchange.getIn().getBody(String.class);
+ assertEquals("TestSecret4", secret);
+
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:createSecret")
+ .to("aws-secrets-manager://test?operation=createSecret");
+
+ from("direct:getSecret")
+ .to("aws-secrets-manager://test?operation=getSecret")
+ .to("mock:result");
+ }
+ };
+ }
+}
[camel] 02/06: Camel-AWS-Secrets-Manager: Moving integration test
to localstack
Posted by ac...@apache.org.
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
commit 791b4e5ceefea353a975cdcbbf14f8b2174ab045
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Mar 18 07:57:15 2021 +0100
Camel-AWS-Secrets-Manager: Moving integration test to localstack
---
...Test.java => SecretsManagerDescribeSecretProducerLocalstackTest.java} | 1 -
1 file changed, 1 deletion(-)
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerDescribeSecretProducerIntegrationTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerDescribeSecretProducerLocalstackTest.java
similarity index 99%
rename from components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerDescribeSecretProducerIntegrationTest.java
rename to components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerDescribeSecretProducerLocalstackTest.java
index 0ce27b4..3ad0c41 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerDescribeSecretProducerIntegrationTest.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerDescribeSecretProducerLocalstackTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.secretsmanager.SecretsManagerConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-
import software.amazon.awssdk.services.secretsmanager.model.CreateSecretResponse;
import software.amazon.awssdk.services.secretsmanager.model.DescribeSecretResponse;
[camel] 03/06: Camel-AWS-Secrets-Manager: Moving integration test
to localstack
Posted by ac...@apache.org.
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
commit 69666b989390c75fb5b9f35ae286a1412c4a16e0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Mar 18 07:57:59 2021 +0100
Camel-AWS-Secrets-Manager: Moving integration test to localstack
---
.../localstack/SecretsManagerDescribeSecretProducerLocalstackTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerDescribeSecretProducerLocalstackTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerDescribeSecretProducerLocalstackTest.java
index 3ad0c41..1b6197e 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerDescribeSecretProducerLocalstackTest.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerDescribeSecretProducerLocalstackTest.java
@@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class SecretsManagerDescribeSecretProducerIntegrationTest extends AwsSecretsManagerBaseTest {
+public class SecretsManagerDescribeSecretProducerLocalstackTest extends AwsSecretsManagerBaseTest {
@EndpointInject("mock:result")
private MockEndpoint mock;
[camel] 01/06: Camel-AWS-Secrets-Manager: Moving integration test
to localstack
Posted by ac...@apache.org.
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
commit b08787450dfd3ef0aefbeb6de2ab8bf9e28e4b1f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Mar 18 07:54:33 2021 +0100
Camel-AWS-Secrets-Manager: Moving integration test to localstack
---
...nagerDescribeSecretProducerIntegrationTest.java | 81 ++++++++++++++++++++++
1 file changed, 81 insertions(+)
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerDescribeSecretProducerIntegrationTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerDescribeSecretProducerIntegrationTest.java
new file mode 100644
index 0000000..0ce27b4
--- /dev/null
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerDescribeSecretProducerIntegrationTest.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.aws.secretsmanager.localstack;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.aws.secretsmanager.SecretsManagerConstants;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Test;
+
+import software.amazon.awssdk.services.secretsmanager.model.CreateSecretResponse;
+import software.amazon.awssdk.services.secretsmanager.model.DescribeSecretResponse;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SecretsManagerDescribeSecretProducerIntegrationTest extends AwsSecretsManagerBaseTest {
+
+ @EndpointInject("mock:result")
+ private MockEndpoint mock;
+
+ @Test
+ public void createSecretTest() throws Exception {
+
+ mock.expectedMessageCount(1);
+ Exchange exchange = template.request("direct:createSecret", new Processor() {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(SecretsManagerConstants.SECRET_NAME, "TestSecret4");
+ exchange.getIn().setBody("Body");
+ }
+ });
+
+ CreateSecretResponse resultGet = (CreateSecretResponse) exchange.getIn().getBody();
+ assertNotNull(resultGet);
+
+ exchange = template.request("direct:describeSecret", new Processor() {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(SecretsManagerConstants.SECRET_ID, resultGet.arn());
+ }
+ });
+
+ DescribeSecretResponse resultDescribe = (DescribeSecretResponse) exchange.getIn().getBody();
+ assertTrue(resultDescribe.sdkHttpResponse().isSuccessful());
+ assertEquals("TestSecret4", resultDescribe.name());
+
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:createSecret")
+ .to("aws-secrets-manager://test?operation=createSecret");
+
+ from("direct:describeSecret")
+ .to("aws-secrets-manager://test?operation=describeSecret")
+ .to("mock:result");
+ }
+ };
+ }
+}
[camel] 06/06: Camel-AWS-Secrets-Manager: Moving integration test
to localstack
Posted by ac...@apache.org.
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
commit bb5a4460e402da3e0a76e9faa31df9b31b4a742e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Mar 18 08:07:54 2021 +0100
Camel-AWS-Secrets-Manager: Moving integration test to localstack
---
.../localstack/SecretsManagerGetSecretProducerLocalstackTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerGetSecretProducerLocalstackTest.java b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerGetSecretProducerLocalstackTest.java
index 611452d..d7e2a60 100644
--- a/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerGetSecretProducerLocalstackTest.java
+++ b/components/camel-aws/camel-aws-secrets-manager/src/test/java/org/apache/camel/component/aws/secretsmanager/localstack/SecretsManagerGetSecretProducerLocalstackTest.java
@@ -23,7 +23,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.aws.secretsmanager.SecretsManagerConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-
import software.amazon.awssdk.services.secretsmanager.model.CreateSecretResponse;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -57,7 +56,7 @@ public class SecretsManagerGetSecretProducerLocalstackTest extends AwsSecretsMan
});
String secret = exchange.getIn().getBody(String.class);
- assertEquals("TestSecret4", secret);
+ assertEquals("Body", secret);
}