Skip to content

Commit a7df794

Browse files
committed
Enable upload regression testing all bucket types
1 parent 436a19b commit a7df794

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/upload/UploadConfig.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ public static List<UploadConfig> testConfigs() {
4040
for (UploadStreamingRegressionTesting.ContentSize cs :
4141
UploadStreamingRegressionTesting.ContentSize.values()) {
4242
for (boolean ps : payloadSign) {
43-
UploadConfig testConfig = new UploadConfig();
44-
testConfig.setRequestChecksumValidation(checksumValidation);
45-
testConfig.setBodyType(bodType);
46-
testConfig.setContentSize(cs);
47-
testConfig.setPayloadSigning(ps);
48-
testConfig.setBucketType(BucketType.STANDARD_BUCKET);
49-
configs.add(testConfig);
43+
for (BucketType bucketType : BucketType.values()) {
44+
UploadConfig testConfig = new UploadConfig();
45+
testConfig.setRequestChecksumValidation(checksumValidation);
46+
testConfig.setBodyType(bodType);
47+
testConfig.setContentSize(cs);
48+
testConfig.setPayloadSigning(ps);
49+
testConfig.setBucketType(bucketType);
50+
configs.add(testConfig);
51+
}
5052
}
5153
}
5254
}

test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/upload/UploadSyncRegressionTesting.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ void putObject(UploadConfig config) throws Exception {
5858
"TODO: investigate connection acquire timeout when using RequestBody.fromRemainingByteBuffer"
5959
+ " with RequestChecksumCalculation.WHEN_SUPPORTED");
6060

61+
Assumptions.assumeFalse(config.isPayloadSigning()
62+
&& config.getBucketType() == BucketType.MRAP
63+
&& config.getBodyType() == BodyType.INPUTSTREAM_NOT_RESETABLE,
64+
"SigV4a payload signing requires reading the stream twice - INPUTSTREAM_NOT_RESETABLE is not"
65+
+ " valid");
66+
6167
LOG.info(() -> "Running putObject with config: " + config);
6268

6369
BucketType bucketType = config.getBucketType();

0 commit comments

Comments
 (0)