fix: Return 412 on if-none-match=true in CompleteMultipartRequest

Also fixes links in Kotlin doc and wording in S3 Exception.

Fixes #2790

Author: afranken

CHANGELOG.md

@@ -152,6 +152,7 @@ Version 5.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Jav
   * Get object with range now returns the same headers as non-range calls.
   * Docker: Copy "s3mock.jar" to "/opt/", run with absolute path reference to avoid issues when working directory is changed. (fixes #2827)
   * S3Mock supports ChecksumType.FULL_OBJECT for Multipart uploads (fixes #2843)
+  * Return 412 on if-none-match=true when making CompleteMultipartRequest (fixes #2790) 
 * Refactorings
   * Use Jackson 3 annotations and mappers.
   * AWS has deprecated SDK for Java v1 and will remove support EOY 2025.
@@ -170,7 +171,10 @@ Version 5.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Jav
   * Bump TestContainers to 2.0.2
 * Version updates (build dependencies)
   * Bump Maven to 4.0.0
-  * Bump github/codeql-action from 4.31.6 to 4.31.7
+  * Bump org.apache.maven.plugins:maven-release-plugin from 3.3.0 to 3.3.1
+  * Bump com.puppycrawl.tools:checkstyle from 12.2.0 to 12.3.0
+  * Bump actions/upload-artifact from 5.0.0 to 6.0.0
+  * Bump github/codeql-action from 4.31.6 to 4.31.8
   * Bump actions/setup-java from 5.0.0 to 5.1.0
   * Bump step-security/harden-runner from 2.13.3 to 2.14.0
 

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/MultipartIT.kt

@@ -497,6 +497,7 @@ internal class MultipartIT : S3TestBase() {
         it.bucket(initiateMultipartUploadResult.bucket())
         it.key(initiateMultipartUploadResult.key())
         it.uploadId(initiateMultipartUploadResult.uploadId())
+        it.checksumType(ChecksumType.COMPOSITE)
         it.multipartUpload {
           it.parts(
             {
@@ -541,6 +542,7 @@ internal class MultipartIT : S3TestBase() {
         it.bucket(initiateMultipartUploadResult.bucket())
         it.key(initiateMultipartUploadResult.key())
         it.uploadId(initiateMultipartUploadResult.uploadId())
+        it.checksumType(ChecksumType.COMPOSITE)
         it.multipartUpload {
           it.parts(
             {
@@ -563,7 +565,6 @@ internal class MultipartIT : S3TestBase() {
     assertThat(completeMultipartUpload.bucket()).isEqualTo(completeMultipartUpload1.bucket())
     assertThat(completeMultipartUpload.key()).isEqualTo(completeMultipartUpload1.key())
     assertThat(completeMultipartUpload.eTag()).isEqualTo(completeMultipartUpload1.eTag())
-    assertThat(completeMultipartUpload.checksumCRC32()).isEqualTo(completeMultipartUpload1.checksumCRC32())
     assertThat(completeMultipartUpload.checksumType()).isEqualTo(completeMultipartUpload1.checksumType())
   }
 
@@ -1812,7 +1813,7 @@ internal class MultipartIT : S3TestBase() {
         it.sourceKey(sourceKey)
         it.sourceBucket(bucketName)
         it.partNumber(1)
-        it.copySourceRange("bytes=0-$UPLOAD_FILE_LENGTH")
+        it.copySourceRange("bytes=0-${UPLOAD_FILE_LENGTH - 1}")
         it.copySourceIfModifiedSince(now)
       }
     }.isInstanceOf(S3Exception::class.java)
@@ -2081,6 +2082,54 @@ internal class MultipartIT : S3TestBase() {
       .hasMessageContaining(INVALID_PART)
   }
 
+  @Test
+  @S3VerifiedSuccess(year = 2025)
+  fun `CompleteMultipart fails with if-none-match=true`(testInfo: TestInfo) {
+    val (bucketName, response) = givenBucketAndObject(testInfo, UPLOAD_FILE_NAME)
+    val initiateMultipartUploadResult =
+      s3Client
+        .createMultipartUpload {
+          it.bucket(bucketName)
+          it.key(UPLOAD_FILE_NAME)
+        }
+    val uploadId = initiateMultipartUploadResult.uploadId()
+
+    assertThat(
+      s3Client
+        .listMultipartUploads {
+          it.bucket(bucketName)
+        }.uploads(),
+    ).isNotEmpty
+
+    val eTag =
+      s3Client
+        .uploadPart(
+          {
+            it.bucket(initiateMultipartUploadResult.bucket())
+            it.key(initiateMultipartUploadResult.key())
+            it.uploadId(uploadId)
+            it.partNumber(1)
+          },
+          RequestBody.fromFile(UPLOAD_FILE),
+        ).eTag()
+
+    assertThatThrownBy {
+      s3Client.completeMultipartUpload {
+        it.bucket(initiateMultipartUploadResult.bucket())
+        it.key(initiateMultipartUploadResult.key())
+        it.uploadId(uploadId)
+        it.ifNoneMatch("*")
+        it.multipartUpload {
+          it.parts({
+            it.eTag(eTag)
+            it.partNumber(1)
+          })
+        }
+      }
+    }.isInstanceOf(S3Exception::class.java)
+      .hasMessageContaining(PRECONDITION_FAILED.message)
+  }
+
   private fun uploadPart(
     bucketName: String,
     key: String,
@@ -2107,7 +2156,7 @@ internal class MultipartIT : S3TestBase() {
     private const val NO_SUCH_BUCKET = "The specified bucket does not exist"
     private const val INVALID_PART_NUMBER = "Part number must be an integer between 1 and 10000, inclusive"
     private const val INVALID_PART =
-      "One or more of the specified parts could not be found. " +
-        "The part might not have been uploaded, or the specified entity tag may not match the part's entity tag."
+      "One or more of the specified parts could not be found.  " +
+        "The part may not have been uploaded, or the specified entity tag may not match the part's entity tag."
   }
 }

server/src/main/kotlin/com/adobe/testing/s3mock/S3Exception.kt

@@ -20,12 +20,12 @@ import org.springframework.http.HttpStatus
 /**
  * [RuntimeException] to communicate general S3 errors.
  * These are handled by ControllerConfiguration.S3MockExceptionHandler,
- * mapped to [ErrorResponse] and serialized.
+ * mapped to [com.adobe.testing.s3mock.dto.ErrorResponse] and serialized.
  * [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/API/ErrorResponses.html)
  */
 class S3Exception
 /**
- * Creates a new S3Exception to be mapped as an [ErrorResponse].
+ * Creates a new S3Exception to be mapped as an [com.adobe.testing.s3mock.dto.ErrorResponse].
  *
  * @param status The Error Status.
  * @param code The Error Code.
@@ -43,7 +43,7 @@ class S3Exception
         )
         val INVALID_PART: S3Exception = S3Exception(
             HttpStatus.BAD_REQUEST.value(), "InvalidPart",
-            "One or more of the specified parts could not be found. The part might not have been "
+            "One or more of the specified parts could not be found.  The part may not have been "
                     + "uploaded, or the specified entity tag may not match the part's entity tag."
         )
         val INVALID_PART_ORDER: S3Exception = S3Exception(

server/src/main/kotlin/com/adobe/testing/s3mock/controller/ChecksumModeHeaderConverter.kt

@@ -19,7 +19,7 @@ import com.adobe.testing.s3mock.dto.ChecksumMode
 import org.springframework.core.convert.converter.Converter
 
 /**
- * Converts values of the [AwsHttpHeaders.X_AMZ_CHECKSUM_MODE] which is sent by the Amazon
+ * Converts values of the [com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_CHECKSUM_MODE] which is sent by the Amazon
  * client.
  * Example:  x-amz-checksum-mode: ENABLED
  * [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html)

server/src/main/kotlin/com/adobe/testing/s3mock/controller/MultipartController.kt

@@ -434,7 +434,7 @@ class MultipartController(
       multipartService.verifyMultipartParts(bucketName, objectName, uploadId, upload.parts)
     }
     val s3ObjectMetadata = objectService.getObject(bucketName, key.key, null)
-    objectService.verifyObjectMatching(match, noneMatch, null, null, s3ObjectMetadata)
+    objectService.verifyObjectMatching(bucketName, key.key, match, noneMatch)
     val locationWithEncodedKey = request
       .requestURL
       .toString()

server/src/test/kotlin/com/adobe/testing/s3mock/controller/MultipartControllerTest.kt

@@ -475,11 +475,10 @@ internal class MultipartControllerTest : BaseControllerTest() {
     doThrow(S3Exception.PRECONDITION_FAILED)
       .whenever(objectService)
       .verifyObjectMatching(
+        eq(TEST_BUCKET_NAME),
+        eq(key),
         anyOrNull(),
         anyOrNull(),
-        anyOrNull(),
-        anyOrNull(),
-        eq(s3meta)
       )
 
     val uri = UriComponentsBuilder