Skip to content

Commit d399f04

Browse files
committed
remove bucket accelerate config
1 parent ca66496 commit d399f04

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717

1818
import static org.assertj.core.api.Assertions.assertThat;
1919
import static software.amazon.awssdk.services.s3.regression.ControlPlaneOperationRegressionTesting.testConfigs;
20-
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccelerateWithArnType;
21-
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccelerateWithEoz;
22-
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccelerateWithPathStyle;
2320
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccessPointWithPathStyle;
2421
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.crc32;
2522

@@ -115,10 +112,7 @@ void testCleanup() {
115112
@ParameterizedTest
116113
@MethodSource("downloadConfigs")
117114
void downloadObject(DownloadConfig config) throws Exception {
118-
assumeNotAccelerateWithPathStyle(config.baseConfig());
119115
assumeNotAccessPointWithPathStyle(config.baseConfig());
120-
assumeNotAccelerateWithArnType(config.baseConfig());
121-
assumeNotAccelerateWithEoz(config.baseConfig());
122116

123117
LOG.debug(() -> "Running downloadObject with config: " + config);
124118

@@ -494,7 +488,6 @@ private S3Client makeSyncClient(TestConfig config) {
494488
.requestChecksumCalculation(config.getRequestChecksumValidation())
495489
.region(REGION)
496490
.credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
497-
.accelerate(config.isAccelerateEnabled())
498491
.build();
499492
default:
500493
throw new RuntimeException("Unsupported sync flavor: " + config.getFlavor());
@@ -509,15 +502,13 @@ private S3AsyncClient makeAsyncClient(TestConfig config) {
509502
.requestChecksumCalculation(config.getRequestChecksumValidation())
510503
.region(REGION)
511504
.credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
512-
.accelerate(config.isAccelerateEnabled())
513505
.build();
514506
case MULTIPART_ENABLED:
515507
return S3AsyncClient.builder()
516508
.forcePathStyle(config.isForcePathStyle())
517509
.requestChecksumCalculation(config.getRequestChecksumValidation())
518510
.region(REGION)
519511
.credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
520-
.accelerate(config.isAccelerateEnabled())
521512
.multipartEnabled(true)
522513
.build();
523514
case CRT_BASED: {
@@ -526,7 +517,6 @@ private S3AsyncClient makeAsyncClient(TestConfig config) {
526517
.requestChecksumCalculation(config.getRequestChecksumValidation())
527518
.region(REGION)
528519
.credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
529-
.accelerate(config.isAccelerateEnabled())
530520
.build();
531521
}
532522
default:

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
package software.amazon.awssdk.services.s3.regression;
1717

1818
import static org.assertj.core.api.Assertions.assertThat;
19-
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccelerateWithArnType;
20-
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccelerateWithEoz;
21-
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccelerateWithPathStyle;
2219
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.assumeNotAccessPointWithPathStyle;
2320
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.crc32;
2421
import static software.amazon.awssdk.services.s3.regression.S3ChecksumsTestUtils.makeAsyncClient;
@@ -119,10 +116,7 @@ public static void cleanup() {
119116
@ParameterizedTest
120117
@MethodSource("uploadConfigs")
121118
void putObject(UploadConfig config) throws Exception {
122-
assumeNotAccelerateWithPathStyle(config.getBaseConfig());
123119
assumeNotAccessPointWithPathStyle(config.getBaseConfig());
124-
assumeNotAccelerateWithArnType(config.getBaseConfig());
125-
assumeNotAccelerateWithEoz(config.getBaseConfig());
126120

127121
// For testing purposes, ContentProvider is Publisher<ByteBuffer> for async clients
128122
// There is no way to create AsyncRequestBody with a Publisher<ByteBuffer> and also provide the content length

0 commit comments

Comments
 (0)