Skip to content

Fix S3 multipart SSE-C integration test broken by new S3 default bucket encryption behavior #6850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fred1155 merged 2 commits into from
Apr 9, 2026
Merged

Fix S3 multipart SSE-C integration test broken by new S3 default bucket encryption behavior #6850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20c456a
unblock sse-c for the bucket for test
Fred1155 Apr 8, 2026
aaad257
more fix to other test
Fred1155 Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ...c/it/java/software/amazon/awssdk/services/s3/ServerSideEncryptionIntegrationTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import static org.assertj.core.api.Fail.fail;
import static software.amazon.awssdk.services.s3.S3IntegrationTestBase.createBucket;
import static software.amazon.awssdk.services.s3.model.ServerSideEncryption.AES256;
import static software.amazon.awssdk.testutils.service.S3BucketUtils.temporaryBucketName;

import java.io.File;
Expand All @@ -25,6 +26,7 @@
import org.junit.AfterClass;
import org.junit.BeforeClass;
import software.amazon.awssdk.services.kms.KmsClient;
import software.amazon.awssdk.services.s3.model.EncryptionType;
import software.amazon.awssdk.services.s3.model.ServerSideEncryption;
import software.amazon.awssdk.testutils.RandomTempFile;

Expand All @@ -48,6 +50,14 @@ public static void setupFixture() throws IOException {
createBucket(BUCKET_WITH_SSE);
keyId = KMS.createKey().keyMetadata().keyId();

// Since April 2026, new S3 buckets block SSE-C by default. Unblock it for SSE-C tests.
s3.putBucketEncryption(r -> r
.bucket(BUCKET)
.serverSideEncryptionConfiguration(ssec -> ssec
.rules(rule -> rule
.applyServerSideEncryptionByDefault(d -> d.sseAlgorithm(AES256))
.blockedEncryptionTypes(b -> b.encryptionType(EncryptionType.NONE)))));

s3.putBucketEncryption(r -> r
.bucket(BUCKET_WITH_SSE)
.serverSideEncryptionConfiguration(ssec -> ssec
Expand Down
9 changes: 9 additions & 0 deletions ...va/software/amazon/awssdk/services/s3/multipart/S3ClientMultiPartCopyIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import software.amazon.awssdk.services.s3.internal.multipart.MultipartS3AsyncClient;
import software.amazon.awssdk.services.s3.model.ChecksumAlgorithm;
import software.amazon.awssdk.services.s3.model.CopyObjectResponse;
import software.amazon.awssdk.services.s3.model.EncryptionType;
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
import software.amazon.awssdk.services.s3.model.MetadataDirective;
import software.amazon.awssdk.utils.Md5Utils;
Expand All @@ -71,6 +72,14 @@ public class S3ClientMultiPartCopyIntegrationTest extends S3IntegrationTestBase
public static void setUp() throws Exception {
S3IntegrationTestBase.setUp();
createBucket(BUCKET);

s3.putBucketEncryption(r -> r.bucket(BUCKET)
.serverSideEncryptionConfiguration(c -> c.rules(
rule -> rule.applyServerSideEncryptionByDefault(
d -> d.sseAlgorithm(AES256))
.blockedEncryptionTypes(
b -> b.encryptionType(EncryptionType.NONE)))));

s3CrtAsyncClient = S3CrtAsyncClient.builder()
.credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
.region(DEFAULT_REGION)
Expand Down
8 changes: 8 additions & 0 deletions ...ftware/amazon/awssdk/services/s3/multipart/S3MultipartClientPutObjectIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
import software.amazon.awssdk.services.s3.model.ChecksumMode;
import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
import software.amazon.awssdk.services.s3.model.EncryptionType;
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
import software.amazon.awssdk.services.s3.model.PutObjectRequest;
Expand Down Expand Up @@ -110,6 +111,13 @@ public static void setup() throws Exception {
setUp();
createBucket(TEST_BUCKET);

s3.putBucketEncryption(r -> r.bucket(TEST_BUCKET)
.serverSideEncryptionConfiguration(c -> c.rules(
rule -> rule.applyServerSideEncryptionByDefault(
d -> d.sseAlgorithm(AES256))
.blockedEncryptionTypes(
b -> b.encryptionType(EncryptionType.NONE)))));

testFile = new RandomTempFile(OBJ_SIZE);
bytes = Files.readAllBytes(testFile.toPath());
expectedChecksum = ChecksumUtils.computeCheckSum(Files.newInputStream(testFile.toPath()));
Expand Down
Loading