This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 662f246b306b5eff1037bdd2a4cab2d748b2cee4 Author: Andrea Cosentino <[email protected]> AuthorDate: Tue May 10 12:04:36 2022 +0200 CAMEL-18064 - Cannot set server side encryption SSE-S3 for S3 bucket --- .../apache/camel/component/aws2/s3/AWS2S3Producer.java | 2 +- .../aws2/s3/integration/s3UploadWithSSES3IT.java | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java index 3830fa10814..ab99e7ccbca 100644 --- a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java +++ b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java @@ -353,7 +353,7 @@ public class AWS2S3Producer extends DefaultProducer { } if (getConfiguration().isUseSSES3()) { - putObjectRequest.serverSideEncryption(ServerSideEncryption.AES256); + putObjectRequest.serverSideEncryption(ServerSideEncryption.AES256); } if (getConfiguration().isUseCustomerKey()) { diff --git a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/s3UploadWithSSES3IT.java b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/s3UploadWithSSES3IT.java index e31548a532d..b228fbcdec6 100644 --- a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/s3UploadWithSSES3IT.java +++ b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/s3UploadWithSSES3IT.java @@ -22,23 +22,14 @@ 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.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperties; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; -import software.amazon.awssdk.core.ResponseInputStream; import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.S3Client; -import software.amazon.awssdk.services.s3.model.GetObjectRequest; -import software.amazon.awssdk.services.s3.model.GetObjectResponse; - -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; // Must be manually tested. Provide your own accessKey and secretKey using -Daws.manual.access.key and -Daws.manual.secret.key @EnabledIfSystemProperties({ @@ -52,9 +43,9 @@ public class s3UploadWithSSES3IT extends CamelTestSupport { @BindToRegistry("amazonS3Client") S3Client client = S3Client.builder() - .credentialsProvider(StaticCredentialsProvider.create( - AwsBasicCredentials.create(ACCESS_KEY, SECRET_KEY))) - .region(Region.EU_CENTRAL_1).build(); + .credentialsProvider(StaticCredentialsProvider.create( + AwsBasicCredentials.create(ACCESS_KEY, SECRET_KEY))) + .region(Region.EU_CENTRAL_1).build(); @EndpointInject private ProducerTemplate template;
