Skip to content

Fix checksum tests #6895

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
davidh44 merged 4 commits into from
Apr 25, 2026
+44 −25
Merged

Fix checksum tests #6895

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9676d28
Fix checksum tests
zoewangg Apr 22, 2026
38f44cf
Merge branch 'master' into zoewang/fixChecksumTests
davidh44 Apr 24, 2026
46f2db7
Merge branch 'master' into zoewang/fixChecksumTests
zoewangg Apr 24, 2026
7e00c4b
Merge branch 'master' into zoewang/fixChecksumTests
davidh44 Apr 25, 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
69 changes: 44 additions & 25 deletions ...va/software/amazon/awssdk/services/s3/internal/multipart/MultipartClientChecksumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import com.github.tomakehurst.wiremock.WireMockServer;
import java.io.IOException;
Expand All @@ -34,15 +35,18 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.CompletionException;
import java.util.stream.Stream;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.core.interceptor.Context;
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
Expand Down Expand Up @@ -71,6 +75,8 @@ public static void setup() throws IOException {

public static Stream<ChecksumAlgorithm> checksumAlgorithmParams() {
List<ChecksumAlgorithm> checksumAlgorithms = new ArrayList<>(ChecksumAlgorithm.knownValues());
// MD5 calculation is not supported in the SDK
checksumAlgorithms.remove(ChecksumAlgorithm.MD5);
checksumAlgorithms.add(null);
return checksumAlgorithms.stream();
}
Expand Down Expand Up @@ -100,8 +106,7 @@ public static void teardown() throws IOException {
wireMock.stop();
}

// TODO - re-enable after S3 feature release
/*@ParameterizedTest
@ParameterizedTest
@MethodSource("checksumAlgorithmParams")
public void multipartUpload_withChecksumAlgorithmAndNoChecksumValueProvided_shouldNotAddChecksumType(ChecksumAlgorithm checksumAlgorithm) {
stubSuccessfulResponses();
Expand All @@ -114,35 +119,22 @@ 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
@ParameterizedTest
@MethodSource("checksumAlgorithmParams")
public void multipartUpload_withChecksumValueProvided_shouldUseSameAlgorithmForUploadAndAddChecksumTypeFullObject(ChecksumAlgorithm checksumAlgorithm) {
stubSuccessfulResponses();

PutObjectRequest.Builder requestBuilder = putObjectRequestBuilder();
if (checksumAlgorithm != null) {
switch (checksumAlgorithm) {
case CRC32:
requestBuilder.checksumCRC32("checksumVal");
break;
case SHA256:
requestBuilder.checksumSHA256("checksumVal");
break;
case CRC32_C:
requestBuilder.checksumCRC32C("checksumVal");
break;
case SHA1:
requestBuilder.checksumSHA1("checksumVal");
break;
case CRC64_NVME:
requestBuilder.checksumCRC64NVME("checksumVal");
break;
default:
throw new UnsupportedOperationException("Unsupported checksum algorithm: " + checksumAlgorithm);
}
String checksumFieldName = "Checksum" + checksumAlgorithm;
requestBuilder.sdkFields().stream()
.filter(f -> f.memberName().equals(checksumFieldName))
.findFirst()
.orElseThrow(() -> new UnsupportedOperationException(
"No SdkField found for checksum algorithm: " + checksumAlgorithm))
.set(requestBuilder, "checksumVal");
}

String expectedChecksumAlgo = checksumAlgorithm == null ? "CRC32" : checksumAlgorithm.toString();
Expand All @@ -158,7 +150,34 @@ public void multipartUpload_withChecksumValueProvided_shouldUseSameAlgorithmForU
assertThat(checksumCapturingInterceptor.completeMpuChecksumType).isEqualTo(ChecksumType.FULL_OBJECT.toString());
}
assertThat(checksumCapturingInterceptor.completeMpuMpObjectSize).isEqualTo(FILE_SIZE);
}*/
}

@Test
public void multipartUpload_withMd5ChecksumValueProvided_shouldPassThrough() {
stubSuccessfulResponses();

PutObjectRequest putObjectRequest = putObjectRequestBuilder().checksumMD5("checksumVal").build();

multipartS3.putObject(putObjectRequest, testFile).join();
assertThat(checksumCapturingInterceptor.createMpuChecksumAlgorithm).isEqualTo("MD5");
assertThat(checksumCapturingInterceptor.uploadPartChecksumAlgorithm).isEqualTo("MD5");
assertThat(checksumCapturingInterceptor.completeMpuHeaders.get("x-amz-checksum-md5")).contains("checksumVal");
assertThat(checksumCapturingInterceptor.createMpuChecksumType).isEqualTo(ChecksumType.FULL_OBJECT.toString());
assertThat(checksumCapturingInterceptor.completeMpuChecksumType).isEqualTo(ChecksumType.FULL_OBJECT.toString());
assertThat(checksumCapturingInterceptor.completeMpuMpObjectSize).isEqualTo(FILE_SIZE);
}

@Test
public void multipartUpload_withMd5ChecksumAlgorithmProvided_shouldThrowException() {
stubSuccessfulResponses();

PutObjectRequest putObjectRequest = putObjectRequestBuilder().checksumAlgorithm(ChecksumAlgorithm.MD5).build();

assertThatThrownBy(() -> multipartS3.putObject(putObjectRequest, testFile).join())
.isInstanceOf(CompletionException.class)
.hasCauseInstanceOf(SdkClientException.class)
.hasMessageContaining("MD5 is not supported");
}

private PutObjectRequest.Builder putObjectRequestBuilder() {
return PutObjectRequest.builder().bucket("bucket").key("key");
Expand Down
Loading