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/02/12 14:07:18 UTC
[camel] 01/03: CAMEL-16189 - AWS2S3Producer not setting serverside
encryption values
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch CAMEL-16189
in repository https://gitbox.apache.org/repos/asf/camel.git
commit daf501d23bd5f2f3e8573731ab31765277430fd2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Feb 12 14:40:57 2021 +0100
CAMEL-16189 - AWS2S3Producer not setting serverside encryption values
---
.../main/java/org/apache/camel/component/aws2/s3/AWS2S3Producer.java | 4 ++++
1 file changed, 4 insertions(+)
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 d980f48..55947d2 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
@@ -69,6 +69,7 @@ import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
import software.amazon.awssdk.services.s3.model.ObjectCannedACL;
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
import software.amazon.awssdk.services.s3.model.PutObjectResponse;
+import software.amazon.awssdk.services.s3.model.ServerSideEncryption;
import software.amazon.awssdk.services.s3.model.UploadPartRequest;
import software.amazon.awssdk.services.s3.presigner.S3Presigner;
import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;
@@ -177,6 +178,7 @@ public class AWS2S3Producer extends DefaultProducer {
if (getConfiguration().isUseAwsKMS()) {
createMultipartUploadRequest.ssekmsKeyId(getConfiguration().getAwsKMSKeyId());
+ createMultipartUploadRequest.serverSideEncryption(ServerSideEncryption.AWS_KMS);
}
if (getConfiguration().isUseCustomerKey()) {
@@ -305,6 +307,7 @@ public class AWS2S3Producer extends DefaultProducer {
if (getConfiguration().isUseAwsKMS()) {
if (ObjectHelper.isNotEmpty(getConfiguration().getAwsKMSKeyId())) {
putObjectRequest.ssekmsKeyId(getConfiguration().getAwsKMSKeyId());
+ putObjectRequest.serverSideEncryption(ServerSideEncryption.AWS_KMS);
}
}
@@ -367,6 +370,7 @@ public class AWS2S3Producer extends DefaultProducer {
if (getConfiguration().isUseAwsKMS()) {
if (ObjectHelper.isNotEmpty(getConfiguration().getAwsKMSKeyId())) {
copyObjectRequest.ssekmsKeyId(getConfiguration().getAwsKMSKeyId());
+ copyObjectRequest.serverSideEncryption(ServerSideEncryption.AWS_KMS);
}
}