Skip to content

Commit b1a24c5

Browse files
L-ApplinL-Applin
committed
use bucket type in upload tests
1 parent a03e166 commit b1a24c5

File tree

7 files changed

+33
-36
lines changed

7 files changed

+33
-36
lines changed

‎test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/S3ChecksumsTestUtils.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@
4343
import software.amazon.awssdk.services.s3.model.LocationInfo;
4444
import software.amazon.awssdk.services.s3.model.LocationType;
4545
import software.amazon.awssdk.services.s3.model.S3Exception;
46-
import software.amazon.awssdk.services.s3.regression.upload.FlattenUploadConfig;
46+
import software.amazon.awssdk.services.s3.regression.upload.UploadConfig;
4747
import software.amazon.awssdk.services.s3control.S3ControlClient;
48-
import software.amazon.awssdk.services.s3control.model.CloudWatchMetrics;
4948
import software.amazon.awssdk.services.s3control.model.CreateMultiRegionAccessPointRequest;
5049
import software.amazon.awssdk.services.s3control.model.GetMultiRegionAccessPointResponse;
5150
import software.amazon.awssdk.services.s3control.model.MultiRegionAccessPointStatus;
@@ -198,7 +197,7 @@ public static void assumeNotAccessPointWithPathStyle(TestConfig config) {
198197
"Path style doesn't work with ARN type buckets");
199198
}
200199

201-
public static void assumeNotAccessPointWithPathStyle(FlattenUploadConfig config) {
200+
public static void assumeNotAccessPointWithPathStyle(UploadConfig config) {
202201
BucketType bucketType = config.getBucketType();
203202
Assumptions.assumeFalse(config.isForcePathStyle() && bucketType.isArnType(),
204203
"Path style doesn't work with ARN type buckets");
@@ -276,7 +275,7 @@ public static S3AsyncClient makeAsyncClient(TestConfig config, Region region, Aw
276275
}
277276
}
278277

279-
public static S3Client makeSyncClient(FlattenUploadConfig config, ClientOverrideConfiguration overrideConfiguration,
278+
public static S3Client makeSyncClient(UploadConfig config, ClientOverrideConfiguration overrideConfiguration,
280279
Region region, AwsCredentialsProvider provider) {
281280
return S3Client.builder()
282281
.overrideConfiguration(overrideConfiguration)
@@ -295,7 +294,7 @@ private static SdkHttpClient makeHttpClient() {
295294
.build();
296295
}
297296

298-
public static S3AsyncClient makeAsyncClient(FlattenUploadConfig config,
297+
public static S3AsyncClient makeAsyncClient(UploadConfig config,
299298
S3ClientFlavor flavor,
300299
ClientOverrideConfiguration overrideConfiguration,
301300
Region region, AwsCredentialsProvider provider) {
@@ -330,7 +329,7 @@ public static S3AsyncClient makeAsyncClient(FlattenUploadConfig config,
330329
}
331330
}
332331

333-
public static S3TransferManager makeTm(FlattenUploadConfig config,
332+
public static S3TransferManager makeTm(UploadConfig config,
334333
S3ClientFlavor flavor,
335334
ClientOverrideConfiguration overrideConfiguration,
336335
Region region, AwsCredentialsProvider provider) {

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424
import java.util.List;
2525
import java.util.Optional;
2626
import java.util.concurrent.TimeUnit;
27-
import org.junit.Test;
2827
import org.junit.jupiter.api.Assumptions;
29-
import org.junit.jupiter.api.BeforeAll;
3028
import org.junit.jupiter.api.Timeout;
3129
import org.junit.jupiter.params.ParameterizedTest;
3230
import org.junit.jupiter.params.provider.MethodSource;
@@ -44,14 +42,14 @@
4442
public class UploadAsyncRegressionTesting extends UploadStreamingRegressionTesting {
4543
private static final Logger LOG = Logger.loggerFor(UploadAsyncRegressionTesting.class);
4644

47-
public static List<FlattenUploadConfig> testConfigs() {
48-
return FlattenUploadConfig.testConfigs();
45+
public static List<UploadConfig> testConfigs() {
46+
return UploadConfig.testConfigs();
4947
}
5048

5149
@ParameterizedTest
5250
@MethodSource("testConfigs")
5351
@Timeout(value = 120, unit = TimeUnit.SECONDS)
54-
void putObject(FlattenUploadConfig config) throws Exception {
52+
void putObject(UploadConfig config) throws Exception {
5553
assumeNotAccessPointWithPathStyle(config);
5654

5755
// For testing purposes, ContentProvider is Publisher<ByteBuffer> for async clients

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
import software.amazon.awssdk.services.s3.regression.BucketType;
2222
import software.amazon.awssdk.utils.ToString;
2323

24-
public class FlattenUploadConfig {
24+
public class UploadConfig {
2525
private BucketType bucketType;
2626
private boolean forcePathStyle;
2727
private RequestChecksumCalculation requestChecksumValidation;
2828
private UploadStreamingRegressionTesting.BodyType bodyType;
2929
private UploadStreamingRegressionTesting.ContentSize contentSize;
3030
private boolean payloadSigning;
3131

32-
public static List<FlattenUploadConfig> testConfigs() {
33-
List<FlattenUploadConfig> configs = new ArrayList<>();
32+
public static List<UploadConfig> testConfigs() {
33+
List<UploadConfig> configs = new ArrayList<>();
3434

3535
boolean[] payloadSign = {true, false};
3636
RequestChecksumCalculation[] checksumValidations = {RequestChecksumCalculation.WHEN_REQUIRED,
@@ -40,13 +40,15 @@ public static List<FlattenUploadConfig> testConfigs() {
4040
for (UploadStreamingRegressionTesting.ContentSize cs :
4141
UploadStreamingRegressionTesting.ContentSize.values()) {
4242
for (boolean ps : payloadSign) {
43-
FlattenUploadConfig testConfig = new FlattenUploadConfig();
44-
testConfig.setBucketType(BucketType.STANDARD_BUCKET);
45-
testConfig.setRequestChecksumValidation(checksumValidation);
46-
testConfig.setBodyType(bodType);
47-
testConfig.setContentSize(cs);
48-
testConfig.setPayloadSigning(ps);
49-
configs.add(testConfig);
43+
for (BucketType bucket : 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(bucket);
50+
configs.add(testConfig);
51+
}
5052
}
5153
}
5254
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
public class UploadCrtRegressionTesting extends UploadStreamingRegressionTesting {
3939
private static final Logger LOG = Logger.loggerFor(UploadCrtRegressionTesting.class);
4040

41-
public static List<FlattenUploadConfig> testConfigs() {
42-
return FlattenUploadConfig.testConfigs();
41+
public static List<UploadConfig> testConfigs() {
42+
return UploadConfig.testConfigs();
4343
}
4444

4545
@ParameterizedTest
4646
@MethodSource("testConfigs")
4747
@Timeout(value = 120, unit = TimeUnit.SECONDS)
48-
void putObject(FlattenUploadConfig config) throws Exception {
48+
void putObject(UploadConfig config) throws Exception {
4949
assumeNotAccessPointWithPathStyle(config);
5050

5151
Assumptions.assumeFalse(config.getBodyType() == BodyType.CONTENT_PROVIDER_WITH_LENGTH,

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.crc32;
2121
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.makeAsyncClient;
2222
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.makeSyncClient;
23-
import static software.amazon.awssdk.services.s3.regression.TestConfig.testConfigs;
2423

2524
import io.reactivex.Flowable;
2625
import java.io.ByteArrayInputStream;
@@ -63,7 +62,6 @@
6362
import software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils;
6463
import software.amazon.awssdk.services.s3.regression.S3ClientFlavor;
6564
import software.amazon.awssdk.services.s3.regression.TestCallable;
66-
import software.amazon.awssdk.services.s3.regression.TestConfig;
6765
import software.amazon.awssdk.transfer.s3.S3TransferManager;
6866
import software.amazon.awssdk.transfer.s3.model.CompletedUpload;
6967
import software.amazon.awssdk.transfer.s3.model.Upload;
@@ -111,7 +109,7 @@ public static void cleanup() {
111109
ASYNC_REQUEST_BODY_EXECUTOR.shutdownNow();
112110
}
113111

114-
protected void verifyChecksumResponsePayload(FlattenUploadConfig config, String key, String expectedCRC32) {
112+
protected void verifyChecksumResponsePayload(UploadConfig config, String key, String expectedCRC32) {
115113
String bucket = bucketForType(config.getBucketType());
116114
ResponseInputStream<GetObjectResponse> response = s3.getObject(req -> req.checksumMode(ChecksumMode.ENABLED)
117115
.key(key)
@@ -125,7 +123,7 @@ protected void verifyChecksumResponsePayload(FlattenUploadConfig config, String
125123

126124
protected TestCallable<PutObjectResponse> callPutObject(PutObjectRequest request,
127125
TestRequestBody requestBody,
128-
FlattenUploadConfig config,
126+
UploadConfig config,
129127
ClientOverrideConfiguration overrideConfiguration) {
130128
S3Client s3Client = makeSyncClient(config, overrideConfiguration, REGION, CREDENTIALS_PROVIDER_CHAIN);
131129
Callable<PutObjectResponse> callable = () -> {
@@ -143,7 +141,7 @@ protected TestCallable<PutObjectResponse> callPutObject(PutObjectRequest request
143141
protected TestCallable<PutObjectResponse> callPutObject(PutObjectRequest request,
144142
S3ClientFlavor flavor,
145143
TestAsyncBody requestBody,
146-
FlattenUploadConfig config,
144+
UploadConfig config,
147145
ClientOverrideConfiguration overrideConfiguration) {
148146
S3AsyncClient s3Client = makeAsyncClient(config, flavor, overrideConfiguration, REGION, CREDENTIALS_PROVIDER_CHAIN);
149147
Callable<PutObjectResponse> callable = () -> {
@@ -164,7 +162,7 @@ protected TestCallable<PutObjectResponse> callPutObject(PutObjectRequest request
164162
protected TestCallable<PutObjectResponse> callTmUpload(PutObjectRequest request,
165163
S3ClientFlavor flavor,
166164
TestAsyncBody requestBody,
167-
FlattenUploadConfig config,
165+
UploadConfig config,
168166
ClientOverrideConfiguration overrideConfiguration) {
169167
S3TransferManager transferManager = S3ChecksumsTestUtils.makeTm(config, flavor, overrideConfiguration,
170168
REGION, CREDENTIALS_PROVIDER_CHAIN);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@
4141
public class UploadSyncRegressionTesting extends UploadStreamingRegressionTesting {
4242
private static final Logger LOG = Logger.loggerFor(UploadSyncRegressionTesting.class);
4343

44-
public static List<FlattenUploadConfig> testConfigs() {
45-
return FlattenUploadConfig.testConfigs();
44+
public static List<UploadConfig> testConfigs() {
45+
return UploadConfig.testConfigs();
4646
}
4747

4848
@ParameterizedTest
4949
@MethodSource("testConfigs")
5050
@Timeout(value = 120, unit = TimeUnit.SECONDS)
51-
void putObject(FlattenUploadConfig config) throws Exception {
51+
void putObject(UploadConfig config) throws Exception {
5252
assumeNotAccessPointWithPathStyle(config);
5353

5454
// TODO connection acquire timeout when RequestBody.fromRemainingByteBuffer is used with RequestChecksumCalculation

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
public class UploadTransferManagerRegressionTesting extends UploadStreamingRegressionTesting {
3939
private static final Logger LOG = Logger.loggerFor(UploadTransferManagerRegressionTesting.class);
4040

41-
public static List<FlattenUploadConfig> testConfigs() {
42-
return FlattenUploadConfig.testConfigs();
41+
public static List<UploadConfig> testConfigs() {
42+
return UploadConfig.testConfigs();
4343
}
4444

4545
@ParameterizedTest
4646
@MethodSource("testConfigs")
4747
@Timeout(value = 120, unit = TimeUnit.SECONDS)
48-
void putObject(FlattenUploadConfig config) throws Exception {
48+
void putObject(UploadConfig config) throws Exception {
4949

5050
assumeNotAccessPointWithPathStyle(config);
5151

0 commit comments

Comments
 (0)