This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-3.7.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit 03331c88a3f685744be32b44556d934c3b473687 Author: Andrea Cosentino <[email protected]> AuthorDate: Fri Feb 12 14:50:36 2021 +0100 CAMEL-16189 - AWS2S3Producer not setting serverside encryption values, added tests --- .../camel/component/aws2/s3/AWS2S3Producer.java | 2 +- .../aws2/s3/localstack/Aws2S3BaseTest.java | 6 ++ ...mpleEncryptedUploadOperationLocalstackTest.java | 86 ++++++++++++++++++++++ 3 files changed, 93 insertions(+), 1 deletion(-) diff --git a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java index 55947d2..f497d17 100644 --- a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java +++ b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java @@ -307,7 +307,7 @@ public class AWS2S3Producer extends DefaultProducer { if (getConfiguration().isUseAwsKMS()) { if (ObjectHelper.isNotEmpty(getConfiguration().getAwsKMSKeyId())) { putObjectRequest.ssekmsKeyId(getConfiguration().getAwsKMSKeyId()); - putObjectRequest.serverSideEncryption(ServerSideEncryption.AWS_KMS); + putObjectRequest.serverSideEncryption(ServerSideEncryption.AWS_KMS); } } 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 4258b58..a045fc4 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 @@ -24,6 +24,7 @@ import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.RegisterExtension; +import software.amazon.awssdk.services.kms.model.CreateKeyRequest; @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class Aws2S3BaseTest extends CamelTestSupport { @@ -37,4 +38,9 @@ public class Aws2S3BaseTest extends CamelTestSupport { s3.getConfiguration().setAmazonS3Client(AWSSDKClientUtils.newS3Client()); return context; } + + protected String createKmsKey() { + return AWSSDKClientUtils.newKMSClient().createKey(CreateKeyRequest.builder().description("Test_key").build()) + .keyMetadata().keyId(); + } } diff --git a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3SimpleEncryptedUploadOperationLocalstackTest.java b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3SimpleEncryptedUploadOperationLocalstackTest.java new file mode 100644 index 0000000..e0e03e7 --- /dev/null +++ b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/localstack/S3SimpleEncryptedUploadOperationLocalstackTest.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 java.util.List; + +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.services.s3.model.S3Object; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class S3SimpleEncryptedUploadOperationLocalstackTest extends Aws2S3BaseTest { + + @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, "camel.txt"); + exchange.getIn().setBody("Camel rocks!"); + } + }); + + template.request("direct:listObjects", new Processor() { + + @Override + public void process(Exchange exchange) throws Exception { + exchange.getIn().setHeader(AWS2S3Constants.BUCKET_NAME, "mycamel"); + exchange.getIn().setHeader(AWS2S3Constants.S3_OPERATION, AWS2S3Operations.listObjects); + } + }); + + List<S3Object> resp = result.getExchanges().get(0).getMessage().getBody(List.class); + assertEquals(1, resp.size()); + assertEquals("camel.txt", resp.get(0).key()); + + assertMockEndpointsSatisfied(); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + String key = createKmsKey(); + return new RouteBuilder() { + @Override + public void configure() throws Exception { + String awsEndpoint = "aws2-s3://mycamel?autoCreateBucket=true&useAwsKMS=true&awsKMSKeyId=" + key; + + from("direct:putObject").to(awsEndpoint); + + from("direct:listObjects").to(awsEndpoint).to("mock:result"); + + } + }; + } +}
