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/10 16:20:05 UTC
[camel] branch master updated (11dfa25 -> 493911c)
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 11dfa25 camel-ftp: fixes usages of deprecated matchesMockWaitTime (#4183)
new dcb9a82 Camel-AWS2-S3: Adding tests with localstack and test containers
new 8d48059 Camel-AWS2-S3: Adding tests with localstack and test containers
new af6466d Camel-AWS2-S3: Adding tests with localstack and test containers
new 493911c Fixed CS
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-s3/pom.xml | 70 ++++++++++++++++++++++
.../aws2/s3/localstack/Aws2S3BaseTest.java} | 52 +++++++++-------
.../S3ConsumerLocalstackTest.java} | 23 ++-----
.../S3CopyObjectCustomerKeyLocalstackTest.java} | 37 ++++++------
.../S3DeleteBucketOperationLocalstackTest.java} | 17 +-----
5 files changed, 126 insertions(+), 73 deletions(-)
copy components/{camel-nats/src/test/java/org/apache/camel/component/nats/NatsTLSAuthTestSupport.java => camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java} (53%)
copy components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/{integration/S3ConsumerIntegrationTest.java => localstack/S3ConsumerLocalstackTest.java} (73%)
copy components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/{integration/S3CopyObjectCustomerKeyOperationIntegrationTest.java => localstack/S3CopyObjectCustomerKeyLocalstackTest.java} (86%)
copy components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/{integration/S3DeleteBucketOperationIntegrationTest.java => localstack/S3DeleteBucketOperationLocalstackTest.java} (75%)
[camel] 02/04: Camel-AWS2-S3: Adding tests with localstack and test
containers
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 8d480599dde9c5859126e0b6618131231cec95f9
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 10 16:46:51 2020 +0200
Camel-AWS2-S3: Adding tests with localstack and test containers
---
components/camel-aws2-s3/pom.xml | 12 ---------
.../aws2/s3/localstack/Aws2S3BaseTest.java | 30 +++++++++++++---------
.../s3/localstack/S3ConsumerLocalstackTest.java | 4 +--
3 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/components/camel-aws2-s3/pom.xml b/components/camel-aws2-s3/pom.xml
index 5cf3106..81d292b 100644
--- a/components/camel-aws2-s3/pom.xml
+++ b/components/camel-aws2-s3/pom.xml
@@ -67,18 +67,6 @@
<artifactId>camel-testcontainers-junit5</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>localstack</artifactId>
- <version>${testcontainers-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-s3</artifactId>
- <version>${aws-java-sdk-version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<profiles>
diff --git a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java
index 26f459d..555f4f0 100644
--- a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java
+++ b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java
@@ -1,21 +1,20 @@
package org.apache.camel.component.aws2.s3.localstack;
+import java.net.URI;
+
import org.apache.camel.CamelContext;
import org.apache.camel.component.aws2.s3.AWS2S3Component;
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 org.testcontainers.containers.localstack.LocalStackContainer;
-import org.testcontainers.containers.localstack.LocalStackContainer.Service;
-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.s3.S3Client;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
public class Aws2S3BaseTest extends ContainerAwareTestSupport {
- public static final String CONTAINER_IMAGE = "localstack:0.11.4";
+ public static final String CONTAINER_IMAGE = "localstack/localstack:0.11.4";
public static final String CONTAINER_NAME = "s3";
@Override
@@ -23,10 +22,19 @@ public class Aws2S3BaseTest extends ContainerAwareTestSupport {
return localstackContainer();
}
- public static LocalStackContainer localstackContainer() {
- return new LocalStackContainer()
+ public static GenericContainer localstackContainer() {
+ return new GenericContainer(CONTAINER_IMAGE)
.withNetworkAliases(CONTAINER_NAME)
- .withServices(Service.S3);
+ .withEnv("SERVICES", "s3")
+ .withExposedPorts(4572)
+ .waitingFor(Wait.forListeningPort());
+ }
+
+ public String getS3Url() {
+ return String.format(
+ "%s:%d",
+ getContainerHost(CONTAINER_NAME),
+ getContainerPort(CONTAINER_NAME, 4572));
}
@Override
@@ -35,10 +43,8 @@ public class Aws2S3BaseTest extends ContainerAwareTestSupport {
AWS2S3Component s3 = context.getComponent("aws2-s3", AWS2S3Component.class);
S3Client s3Client = S3Client
.builder()
- .endpointOverride(localstackContainer().getEndpointOverride(LocalStackContainer.Service.S3))
- .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
- localstackContainer().getAccessKey(), localstackContainer().getSecretKey())))
- .region(Region.of(localstackContainer().getRegion()))
+ .endpointOverride(URI.create("http://" + getS3Url()))
+ .region(Region.EU_WEST_1)
.build();
s3.getConfiguration().setAmazonS3Client(s3Client);
return context;
diff --git a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3ConsumerLocalstackTest.java b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3ConsumerLocalstackTest.java
index 541a0c8..ed82771 100644
--- a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3ConsumerLocalstackTest.java
+++ b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3ConsumerLocalstackTest.java
@@ -73,11 +73,11 @@ public class S3ConsumerLocalstackTest extends Aws2S3BaseTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- String awsEndpoint = "aws2-s3://mycamel?autoCreateBucket=false";
+ String awsEndpoint = "aws2-s3://mycamel?autoCreateBucket=true";
from("direct:putObject").startupOrder(1).to(awsEndpoint).to("mock:result");
- from("aws2-s3://mycamel?moveAfterRead=true&destinationBucket=camel-kafka-connector&autoCreateBucket=false&destinationBucketPrefix=RAW(movedPrefix)&destinationBucketSuffix=RAW(movedSuffix)")
+ from("aws2-s3://mycamel?moveAfterRead=true&destinationBucket=camel-kafka-connector&autoCreateBucket=true&destinationBucketPrefix=RAW(movedPrefix)&destinationBucketSuffix=RAW(movedSuffix)")
.startupOrder(2).log("${body}");
}
[camel] 03/04: Camel-AWS2-S3: Adding tests with localstack and test
containers
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 af6466db68e827dad016a1e34e1aaae937c6f6de
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 10 18:15:20 2020 +0200
Camel-AWS2-S3: Adding tests with localstack and test containers
---
.../aws2/s3/localstack/Aws2S3BaseTest.java | 17 ++-
.../S3CopyObjectCustomerKeyLocalstackTest.java | 167 +++++++++++++++++++++
.../S3DeleteBucketOperationLocalstackTest.java | 75 +++++++++
3 files changed, 253 insertions(+), 6 deletions(-)
diff --git a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java
index 555f4f0..02ea4ff 100644
--- a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java
+++ b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java
@@ -27,7 +27,8 @@ public class Aws2S3BaseTest extends ContainerAwareTestSupport {
.withNetworkAliases(CONTAINER_NAME)
.withEnv("SERVICES", "s3")
.withExposedPorts(4572)
- .waitingFor(Wait.forListeningPort());
+ .waitingFor(Wait.forListeningPort())
+ .waitingFor(Wait.forLogMessageContaining("Ready.", 1));
}
public String getS3Url() {
@@ -37,16 +38,20 @@ public class Aws2S3BaseTest extends ContainerAwareTestSupport {
getContainerPort(CONTAINER_NAME, 4572));
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = super.createCamelContext();
- AWS2S3Component s3 = context.getComponent("aws2-s3", AWS2S3Component.class);
+ public S3Client getS3Client() {
S3Client s3Client = S3Client
.builder()
.endpointOverride(URI.create("http://" + getS3Url()))
.region(Region.EU_WEST_1)
.build();
- s3.getConfiguration().setAmazonS3Client(s3Client);
+ return s3Client;
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+ AWS2S3Component s3 = context.getComponent("aws2-s3", AWS2S3Component.class);
+ s3.getConfiguration().setAmazonS3Client(getS3Client());
return context;
}
}
diff --git a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3CopyObjectCustomerKeyLocalstackTest.java b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3CopyObjectCustomerKeyLocalstackTest.java
new file mode 100644
index 0000000..18f8595
--- /dev/null
+++ b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3CopyObjectCustomerKeyLocalstackTest.java
@@ -0,0 +1,167 @@
+/*
+ * 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.s3.localstack;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
+import java.util.Base64;
+import java.util.List;
+import java.util.UUID;
+
+import javax.crypto.KeyGenerator;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.aws2.s3.AWS2S3Constants;
+import org.apache.camel.component.aws2.s3.AWS2S3Operations;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.core.ResponseInputStream;
+import software.amazon.awssdk.services.s3.model.GetObjectRequest;
+import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.utils.Md5Utils;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static software.amazon.awssdk.services.s3.model.ServerSideEncryption.AES256;
+
+public class S3CopyObjectCustomerKeyLocalstackTest extends Aws2S3BaseTest {
+
+ String key = UUID.randomUUID().toString();
+ byte[] secretKey = generateSecretKey();
+ String b64Key = Base64.getEncoder().encodeToString(secretKey);
+ String b64KeyMd5 = Md5Utils.md5AsBase64(secretKey);
+
+ @EndpointInject
+ private ProducerTemplate template;
+
+ @EndpointInject("mock:result")
+ private MockEndpoint result;
+
+ @Test
+ public void sendIn() throws Exception {
+ result.expectedMessageCount(1);
+
+ template.send("direct:putObject", new Processor() {
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(AWS2S3Constants.KEY, "test.txt");
+ exchange.getIn().setBody("Test");
+ }
+ });
+
+ template.send("direct:copyObject", new Processor() {
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(AWS2S3Constants.KEY, "test.txt");
+ exchange.getIn().setHeader(AWS2S3Constants.DESTINATION_KEY, "test1.txt");
+ exchange.getIn().setHeader(AWS2S3Constants.BUCKET_DESTINATION_NAME, "mycamel1");
+ exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.copyObject);
+ }
+ });
+
+ Exchange res = template.request("direct:getObject", new Processor() {
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ GetObjectRequest getObjectRequest = GetObjectRequest.builder()
+ .key("test1.txt")
+ .bucket("mycamel1")
+ .sseCustomerKey(b64Key)
+ .sseCustomerAlgorithm(AES256.name())
+ .sseCustomerKeyMD5(b64KeyMd5)
+ .build();
+ exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.getObject);
+ exchange.getIn().setBody(getObjectRequest);
+ }
+ });
+
+ ResponseInputStream<GetObjectResponse> s3 = res.getIn().getBody(ResponseInputStream.class);
+
+ assertEquals("Test", readInputStream(s3));
+
+ Exchange res1 = template.request("direct:listObject", new Processor() {
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.listObjects);
+ }
+ });
+
+ List response = res1.getIn().getBody(List.class);
+
+ assertEquals(1, response.size());
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ String awsEndpoint = "aws2-s3://mycamel?autoCreateBucket=true&useCustomerKey=true&customerKeyId=RAW(" + b64Key
+ + ")&customerKeyMD5=RAW(" + b64KeyMd5 + ")&customerAlgorithm=" + AES256.name();
+ String awsEndpoint1 = "aws2-s3://mycamel1?autoCreateBucket=true&pojoRequest=true";
+ String awsEndpoint2 = "aws2-s3://mycamel1?autoCreateBucket=true";
+ from("direct:putObject").setHeader(AWS2S3Constants.KEY, constant("test.txt")).setBody(constant("Test"))
+ .to(awsEndpoint);
+
+ from("direct:copyObject").to(awsEndpoint);
+
+ from("direct:listObject").to(awsEndpoint2);
+
+ from("direct:getObject").to(awsEndpoint1).to("mock:result");
+
+ }
+ };
+ }
+
+ protected static byte[] generateSecretKey() {
+ KeyGenerator generator;
+ try {
+ generator = KeyGenerator.getInstance("AES");
+ generator.init(256, new SecureRandom());
+ return generator.generateKey().getEncoded();
+ } catch (Exception e) {
+ fail("Unable to generate symmetric key: " + e.getMessage());
+ return null;
+ }
+ }
+
+ private String readInputStream(ResponseInputStream<GetObjectResponse> s3Object) throws IOException {
+ StringBuilder textBuilder = new StringBuilder();
+ try (Reader reader
+ = new BufferedReader(new InputStreamReader(s3Object, Charset.forName(StandardCharsets.UTF_8.name())))) {
+ int c = 0;
+ while ((c = reader.read()) != -1) {
+ textBuilder.append((char) c);
+ }
+ }
+ return textBuilder.toString();
+ }
+}
diff --git a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3DeleteBucketOperationLocalstackTest.java b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3DeleteBucketOperationLocalstackTest.java
new file mode 100644
index 0000000..6b9aae7
--- /dev/null
+++ b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3DeleteBucketOperationLocalstackTest.java
@@ -0,0 +1,75 @@
+/*
+ * 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.s3.localstack;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.aws2.s3.AWS2S3Constants;
+import org.apache.camel.component.aws2.s3.AWS2S3Operations;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Test;
+
+public class S3DeleteBucketOperationLocalstackTest extends Aws2S3BaseTest {
+
+ @EndpointInject
+ private ProducerTemplate template;
+
+ @EndpointInject("mock:result")
+ private MockEndpoint result;
+
+ @Test
+ public void sendIn() throws Exception {
+ result.expectedMessageCount(1);
+
+ template.send("direct:listBucket", new Processor() {
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.listBuckets);
+ }
+ });
+
+ template.send("direct:deleteBucket", new Processor() {
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(AWS2S3Constants.BUCKET_NAME, "mycamel2");
+ exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.deleteBucket);
+ }
+ });
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ String awsEndpoint = "aws2-s3://mycamel2?autoCreateBucket=true";
+
+ from("direct:listBucket").to(awsEndpoint);
+
+ from("direct:deleteBucket").to(awsEndpoint).to("mock:result");
+
+ }
+ };
+ }
+}
[camel] 01/04: Camel-AWS2-S3: Adding tests with localstack and test
containers
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 dcb9a828cd93af407324881a262e8551d931d419
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 10 12:30:23 2020 +0200
Camel-AWS2-S3: Adding tests with localstack and test containers
---
components/camel-aws2-s3/pom.xml | 82 +++++++++++++++++++++
.../aws2/s3/localstack/Aws2S3BaseTest.java | 46 ++++++++++++
.../s3/localstack/S3ConsumerLocalstackTest.java | 86 ++++++++++++++++++++++
3 files changed, 214 insertions(+)
diff --git a/components/camel-aws2-s3/pom.xml b/components/camel-aws2-s3/pom.xml
index b22aa1b..5cf3106 100644
--- a/components/camel-aws2-s3/pom.xml
+++ b/components/camel-aws2-s3/pom.xml
@@ -62,5 +62,87 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-testcontainers-junit5</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>localstack</artifactId>
+ <version>${testcontainers-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-s3</artifactId>
+ <version>${aws-java-sdk-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>aws2-s3-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-s3-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-s3-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>
diff --git a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java
new file mode 100644
index 0000000..26f459d
--- /dev/null
+++ b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java
@@ -0,0 +1,46 @@
+package org.apache.camel.component.aws2.s3.localstack;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.aws2.s3.AWS2S3Component;
+import org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
+import org.junit.jupiter.api.TestInstance;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.localstack.LocalStackContainer;
+import org.testcontainers.containers.localstack.LocalStackContainer.Service;
+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.s3.S3Client;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public class Aws2S3BaseTest extends ContainerAwareTestSupport {
+
+ public static final String CONTAINER_IMAGE = "localstack:0.11.4";
+ public static final String CONTAINER_NAME = "s3";
+
+ @Override
+ protected GenericContainer<?> createContainer() {
+ return localstackContainer();
+ }
+
+ public static LocalStackContainer localstackContainer() {
+ return new LocalStackContainer()
+ .withNetworkAliases(CONTAINER_NAME)
+ .withServices(Service.S3);
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+ AWS2S3Component s3 = context.getComponent("aws2-s3", AWS2S3Component.class);
+ S3Client s3Client = S3Client
+ .builder()
+ .endpointOverride(localstackContainer().getEndpointOverride(LocalStackContainer.Service.S3))
+ .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create(
+ localstackContainer().getAccessKey(), localstackContainer().getSecretKey())))
+ .region(Region.of(localstackContainer().getRegion()))
+ .build();
+ s3.getConfiguration().setAmazonS3Client(s3Client);
+ return context;
+ }
+}
diff --git a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3ConsumerLocalstackTest.java b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3ConsumerLocalstackTest.java
new file mode 100644
index 0000000..541a0c8
--- /dev/null
+++ b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3ConsumerLocalstackTest.java
@@ -0,0 +1,86 @@
+/*
+ * 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.s3.localstack;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.aws2.s3.AWS2S3Constants;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.jupiter.api.Test;
+
+public class S3ConsumerLocalstackTest extends Aws2S3BaseTest {
+
+ @EndpointInject
+ private ProducerTemplate template;
+
+ @EndpointInject("mock:result")
+ private MockEndpoint result;
+
+ @Test
+ public void sendIn() throws Exception {
+ result.expectedMessageCount(3);
+
+ template.send("direct:putObject", new Processor() {
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(AWS2S3Constants.KEY, "test.txt");
+ exchange.getIn().setBody("Test");
+ }
+ });
+
+ template.send("direct:putObject", new Processor() {
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(AWS2S3Constants.KEY, "test1.txt");
+ exchange.getIn().setBody("Test1");
+ }
+ });
+
+ template.send("direct:putObject", new Processor() {
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setHeader(AWS2S3Constants.KEY, "test2.txt");
+ exchange.getIn().setBody("Test2");
+ }
+ });
+
+ Thread.sleep(10000);
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ String awsEndpoint = "aws2-s3://mycamel?autoCreateBucket=false";
+
+ from("direct:putObject").startupOrder(1).to(awsEndpoint).to("mock:result");
+
+ from("aws2-s3://mycamel?moveAfterRead=true&destinationBucket=camel-kafka-connector&autoCreateBucket=false&destinationBucketPrefix=RAW(movedPrefix)&destinationBucketSuffix=RAW(movedSuffix)")
+ .startupOrder(2).log("${body}");
+
+ }
+ };
+ }
+}
[camel] 04/04: Fixed CS
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 493911cf68d1742bcb611303ac07edde336686d5
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 10 18:16:18 2020 +0200
Fixed CS
---
.../component/aws2/s3/localstack/Aws2S3BaseTest.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java
index 02ea4ff..78262e0 100644
--- a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java
+++ b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/Aws2S3BaseTest.java
@@ -1,3 +1,19 @@
+/*
+ * 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.s3.localstack;
import java.net.URI;