Merge branch 'master' into zoewang/backfillChangelogEntry

Author: zoewangg

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/MultipartClientChecksumTest.java

@@ -100,7 +100,8 @@ public static void teardown() throws IOException {
         wireMock.stop();
     }
 
-    @ParameterizedTest
+    // TODO - re-enable after S3 feature release
+    /*@ParameterizedTest
     @MethodSource("checksumAlgorithmParams")
     public void multipartUpload_withChecksumAlgorithmAndNoChecksumValueProvided_shouldNotAddChecksumType(ChecksumAlgorithm checksumAlgorithm) {
         stubSuccessfulResponses();
@@ -113,7 +114,7 @@ public void multipartUpload_withChecksumAlgorithmAndNoChecksumValueProvided_shou
         assertThat(checksumCapturingInterceptor.createMpuChecksumType).isNull();
         assertThat(checksumCapturingInterceptor.completeMpuChecksumType).isNull();
         assertThat(checksumCapturingInterceptor.completeMpuMpObjectSize).isEqualTo(FILE_SIZE);
-    }
+    }*/
 
     // TODO - re-enable after S3 feature release
     /*@ParameterizedTest

test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3MockStabilityTestBase.java

@@ -20,6 +20,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.function.IntFunction;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.jupiter.api.BeforeAll;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 import software.amazon.awssdk.services.s3.model.ChecksumAlgorithm;
@@ -37,6 +38,12 @@ public abstract class S3MockStabilityTestBase {
     private static final Logger log = Logger.loggerFor(S3MockStabilityTestBase.class);
     MockAsyncHttpClient mockAsyncHttpClient;
     S3AsyncClient testClient;
+
+    @BeforeAll
+    public static void init() {
+        CHECKSUM_ALGORITHMS.remove(ChecksumAlgorithm.valueOf("MD5"));
+    }
+
     @RetryableTest(maxRetries = 3, retryableException = StabilityTestsRetryableException.class)
     public void putObject_Checksum() {
         putObjectChecksumVariations();