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/10/01 08:18:58 UTC
[camel] branch master updated (0ac5a7f -> 5b31dc8)
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 0ac5a7f Regen for commit 500e78c8e3ec3f9b6338e19a9e9fa76d99561127
new ea91ea5 Camel-AWS2-Lambda: Added Testcontainers support for testing
new e31fc95 Camel-AWS2-Lambda: Added base test for localstack
new cd46e62 Camel-AWS2-Lambda: Fixed the localstack service
new 5b31dc8 Camel-AWS2-Lambda: Added localstack test for CreateFunction operation
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:
components/camel-aws2-lambda/pom.xml | 70 ++++++++++++++++++
.../lambda/localstack/Aws2LambdaBaseTest.java} | 22 +++---
.../LambdaCreateFunctionLocalstackTest.java | 85 ++++++++++++++++++++++
3 files changed, 166 insertions(+), 11 deletions(-)
copy components/{camel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/localstack/Aws2CwBaseTest.java => camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/localstack/Aws2LambdaBaseTest.java} (79%)
create mode 100644 components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/localstack/LambdaCreateFunctionLocalstackTest.java
[camel] 02/04: Camel-AWS2-Lambda: Added base test for 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 e31fc9558654818a8b901e824a962cc86cd97afe
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 1 09:00:48 2020 +0200
Camel-AWS2-Lambda: Added base test for localstack
---
.../aws2/lambda/localstack/Aws2LambdaBaseTest.java | 76 ++++++++++++++++++++++
1 file changed, 76 insertions(+)
diff --git a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/localstack/Aws2LambdaBaseTest.java b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/localstack/Aws2LambdaBaseTest.java
new file mode 100644
index 0000000..93be03f
--- /dev/null
+++ b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/localstack/Aws2LambdaBaseTest.java
@@ -0,0 +1,76 @@
+/*
+ * 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.aws2.lambda.localstack;
+
+import java.net.URI;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.aws2.lambda.Lambda2Component;
+import org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
+import org.apache.camel.test.testcontainers.junit5.Wait;
+import org.junit.jupiter.api.TestInstance;
+import org.testcontainers.containers.GenericContainer;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.lambda.LambdaClient;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class Aws2LambdaBaseTest extends ContainerAwareTestSupport {
+
+ public static final String CONTAINER_IMAGE = "localstack/localstack:0.11.5";
+ public static final String CONTAINER_NAME = "lambda";
+
+ @Override
+ protected GenericContainer<?> createContainer() {
+ return localstackContainer();
+ }
+
+ public static GenericContainer localstackContainer() {
+ return new GenericContainer(CONTAINER_IMAGE)
+ .withNetworkAliases(CONTAINER_NAME)
+ .withEnv("SERVICES", "kms")
+ .withExposedPorts(4566)
+ .waitingFor(Wait.forListeningPort())
+ .waitingFor(Wait.forLogMessageContaining("Ready.", 1));
+ }
+
+ public String getEventbridgeUrl() {
+ return String.format(
+ "%s:%d",
+ getContainerHost(CONTAINER_NAME),
+ getContainerPort(CONTAINER_NAME, 4566));
+ }
+
+ public LambdaClient getLambdaClient() {
+ LambdaClient lambdaClient = LambdaClient
+ .builder()
+ .endpointOverride(URI.create("http://" + getEventbridgeUrl()))
+ .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("xxx", "yyy")))
+ .region(Region.EU_WEST_1)
+ .build();
+ return lambdaClient;
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+ Lambda2Component lambdaComponent = context.getComponent("aws2-lambda", Lambda2Component.class);
+ lambdaComponent.getConfiguration().setAwsLambdaClient(getLambdaClient());
+ return context;
+ }
+}
[camel] 03/04: Camel-AWS2-Lambda: Fixed the localstack service
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 cd46e6279647a98b597a74693d636bd255f4ff47
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 1 09:16:53 2020 +0200
Camel-AWS2-Lambda: Fixed the localstack service
---
.../camel/component/aws2/lambda/localstack/Aws2LambdaBaseTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/localstack/Aws2LambdaBaseTest.java b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/localstack/Aws2LambdaBaseTest.java
index 93be03f..88e4b25 100644
--- a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/localstack/Aws2LambdaBaseTest.java
+++ b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/localstack/Aws2LambdaBaseTest.java
@@ -43,7 +43,7 @@ public class Aws2LambdaBaseTest extends ContainerAwareTestSupport {
public static GenericContainer localstackContainer() {
return new GenericContainer(CONTAINER_IMAGE)
.withNetworkAliases(CONTAINER_NAME)
- .withEnv("SERVICES", "kms")
+ .withEnv("SERVICES", "lambda")
.withExposedPorts(4566)
.waitingFor(Wait.forListeningPort())
.waitingFor(Wait.forLogMessageContaining("Ready.", 1));
@@ -57,7 +57,7 @@ public class Aws2LambdaBaseTest extends ContainerAwareTestSupport {
}
public LambdaClient getLambdaClient() {
- LambdaClient lambdaClient = LambdaClient
+ LambdaClient lambdaClient = LambdaClient
.builder()
.endpointOverride(URI.create("http://" + getEventbridgeUrl()))
.credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("xxx", "yyy")))
[camel] 04/04: Camel-AWS2-Lambda: Added localstack test for
CreateFunction operation
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 5b31dc85358260352746d759703079b437dfd1d7
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 1 09:17:16 2020 +0200
Camel-AWS2-Lambda: Added localstack test for CreateFunction operation
---
.../LambdaCreateFunctionLocalstackTest.java | 85 ++++++++++++++++++++++
1 file changed, 85 insertions(+)
diff --git a/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/localstack/LambdaCreateFunctionLocalstackTest.java b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/localstack/LambdaCreateFunctionLocalstackTest.java
new file mode 100644
index 0000000..db6dbdb
--- /dev/null
+++ b/components/camel-aws2-lambda/src/test/java/org/apache/camel/component/aws2/lambda/localstack/LambdaCreateFunctionLocalstackTest.java
@@ -0,0 +1,85 @@
+/*
+ * 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.aws2.lambda.localstack;
+
+import java.io.File;
+import java.io.FileInputStream;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.aws2.lambda.Lambda2Constants;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.services.lambda.model.CreateFunctionResponse;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class LambdaCreateFunctionLocalstackTest extends Aws2LambdaBaseTest {
+
+ @EndpointInject
+ private ProducerTemplate template;
+
+ @EndpointInject("mock:result")
+ private MockEndpoint result;
+
+ @Test
+ public void sendIn() throws Exception {
+ result.expectedMessageCount(1);
+
+ template.send("direct:createFunction", ExchangePattern.InOut, new Processor() {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(Lambda2Constants.RUNTIME, "nodejs6.10");
+ exchange.getIn().setHeader(Lambda2Constants.HANDLER, "GetHelloWithName.handler");
+ exchange.getIn().setHeader(Lambda2Constants.DESCRIPTION, "Hello with node.js on Lambda");
+ exchange.getIn().setHeader(Lambda2Constants.ROLE,
+ "arn:aws:iam::643534317684:role/lambda-execution-role");
+
+ ClassLoader classLoader = getClass().getClassLoader();
+ File file = new File(
+ classLoader
+ .getResource("org/apache/camel/component/aws2/lambda/function/node/GetHelloWithName.zip")
+ .getFile());
+ FileInputStream inputStream = new FileInputStream(file);
+ exchange.getIn().setBody(inputStream);
+ }
+ });
+
+ assertMockEndpointsSatisfied();
+ CreateFunctionResponse resp = result.getExchanges().get(0).getIn().getBody(CreateFunctionResponse.class);
+ assertEquals("GetHelloWithName", resp.functionName());
+ assertEquals("Hello with node.js on Lambda", resp.description());
+ assertNotNull(resp.functionArn());
+ assertNotNull(resp.codeSha256());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ String awsEndpoint = "aws2-lambda://GetHelloWithName?operation=createFunction";
+ from("direct:createFunction").to(awsEndpoint).to("mock:result");
+ }
+ };
+ }
+}
[camel] 01/04: Camel-AWS2-Lambda: Added Testcontainers support for
testing
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 ea91ea5b495fc76772151723f7c6a25974abc569
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Oct 1 08:54:35 2020 +0200
Camel-AWS2-Lambda: Added Testcontainers support for testing
---
components/camel-aws2-lambda/pom.xml | 70 ++++++++++++++++++++++++++++++++++++
1 file changed, 70 insertions(+)
diff --git a/components/camel-aws2-lambda/pom.xml b/components/camel-aws2-lambda/pom.xml
index 89db659c..15450f0 100644
--- a/components/camel-aws2-lambda/pom.xml
+++ b/components/camel-aws2-lambda/pom.xml
@@ -67,5 +67,75 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-testcontainers-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>aws2-lambda-skip-tests</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- activate test if the docker socket file is accessible -->
+ <profile>
+ <id>aws2-lambda-tests-docker-file</id>
+ <activation>
+ <file>
+ <exists>/var/run/docker.sock</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>${skipTests}</skipTests>
+ <systemPropertyVariables>
+ <visibleassertions.silence>true</visibleassertions.silence>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- activate test if the DOCKER_HOST env var is set -->
+ <profile>
+ <id>aws2-lambda-tests-docker-env</id>
+ <activation>
+ <property>
+ <name>env.DOCKER_HOST</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>${skipTests}</skipTests>
+ <systemPropertyVariables>
+ <visibleassertions.silence>true</visibleassertions.silence>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>