CHANGELOG.md

@@ -1,9 +1,78 @@
 # Changelog
 
-**The current major version 2 will receive new features and bug fixes on a continuous basis.**
-
-## PLANNED - 4.x - RELEASE TBD ~ late 2023 / early 2024
-Version 4.x will be JDK17 LTS bytecode compatible (maybe JDK21 LTS, depending on the release date), with Docker integration.
+**The current major version 2 will receive new features, dependency updates and bug fixes on a continuous basis.**
+
+<!-- TOC -->
+* [Changelog](#changelog)
+* [PLANNED - 4.x - RELEASE TBD ~ late 2023 / early 2024](#planned---4x---release-tbd--late-2023--early-2024)
+    * [Planned changes](#planned-changes)
+* [PLANNED - 3.x - RELEASE TBD ~ July 2023](#planned---3x---release-tbd--july-2023)
+  * [3.x - PLANNED](#3x---planned)
+  * [3.x - PLANNED](#3x---planned-1)
+  * [3.0.0 - PLANNED RELEASE TBD ~ July 2023](#300---planned-release-tbd--july-2023)
+* [CURRENT - 2.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT](#current---2x---this-version-is-under-active-development)
+  * [2.16.0 - PLANNED](#2160---planned)
+  * [2.15.0](#2150)
+  * [2.14.0](#2140)
+  * [2.13.1](#2131)
+  * [2.13.0](#2130)
+  * [2.12.2](#2122)
+  * [2.12.1](#2121)
+  * [2.12.0](#2120)
+  * [2.11.0](#2110)
+  * [2.10.2](#2102)
+  * [2.10.1](#2101)
+  * [2.10.0](#2100)
+  * [2.9.1](#291)
+  * [2.9.0](#290)
+  * [2.8.0](#280)
+  * [2.7.2](#272)
+  * [2.7.1](#271)
+  * [2.7.0](#270)
+  * [2.6.3](#263)
+  * [2.6.2](#262)
+  * [2.6.1](#261)
+  * [2.6.0](#260)
+  * [2.5.4](#254)
+  * [2.5.3](#253)
+  * [2.5.2](#252)
+  * [2.5.1](#251)
+  * [2.5.0](#250)
+  * [2.4.16](#2416)
+  * [2.4.15](#2415)
+  * [2.4.14](#2414)
+  * [2.4.13](#2413)
+  * [2.4.11 - 2.4.12](#2411---2412)
+  * [2.4.10](#2410)
+  * [2.4.9](#249)
+  * [2.4.8](#248)
+  * [2.4.7](#247)
+  * [2.4.6](#246)
+  * [2.4.2 - 2.4.5](#242---245)
+  * [2.4.1](#241)
+  * [2.4.0](#240)
+  * [2.3.3](#233)
+  * [2.3.2](#232)
+  * [2.3.1](#231)
+  * [2.3.0](#230)
+  * [2.2.3](#223)
+  * [2.2.2](#222)
+  * [2.2.1](#221)
+  * [2.2.0](#220)
+  * [2.1.35](#2135)
+  * [2.1.34](#2134)
+  * [2.1.33](#2133)
+  * [2.1.32](#2132)
+  * [2.1.31](#2131-1)
+  * [2.1.30](#2130-1)
+  * [2.1.29](#2129)
+  * [2.1.28](#2128)
+  * [2.1.27](#2127)
+  * [1.0.0](#100)
+<!-- TOC -->
+
+# PLANNED - 4.x - RELEASE TBD ~ late 2023 / early 2024
+Version 4.x is JDK17 LTS bytecode compatible (maybe JDK21 LTS, depending on the release date), with Docker integration.
 
 Any JUnit / direct Java usage support will most likely be dropped and only supported on a best-effort basis.
 (i.e. the modules will be deleted from the code base and not released anymore. It *may* be possible to
@@ -13,7 +82,7 @@ to easily to run `S3MockApplication#start` from a static context. These workarou
 
 Running S3Mock in unit tests is still supported by using [TestContainers](https://www.testcontainers.org/).
 
-**Once 4.x is released, 3.x will receive bug fixes, new features will be best-effort only.**
+**Once 4.x is released, 3.x may receive bug fixes and features, this will be best-effort only.**
 
 **Once 4.x is released, 2.x support will be best-effort entirely.**
 
@@ -29,53 +98,18 @@ Running S3Mock in unit tests is still supported by using [TestContainers](https:
 * Version updates
   * Bump java version from 17 to 21 (?)
 
-## PLANNED 3.x - RELEASE TBD ~ July 2023
-Version 3.x will be JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
-
-**Once 3.x is released, 2.x may receive bug fixes and features, this will be best-effort only.**
-
-**Once 4.x is released, 3.x ay receive bug fixes and features, this will be best-effort only.**
-
-## CURRENT - 2.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT
-Version 2.x is JDK8 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
-
-**The current major version 2 will receive new features and bug fixes on a continuous basis.**
+# PLANNED - 3.x - RELEASE TBD ~ July 2023
+Version 3.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
 
 **Once 3.x is released, 2.x may receive bug fixes and features, this will be best-effort only.**
 
-**Once 4.x is released, 2.x support will be best-effort entirely.**
-
-### Planned changes
-
-* Features and fixes
-  * Support for GetObjectAttributes API
-  * Support for Presigned URIs
-  * Support for Bucket subdomains
-  * Support for Version APIs
-* Refactorings
-  * TBD
-* Version updates
-  * TBD
-
-## 3.x - PLANNED
-3.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
-
-* Features and fixes
-  * Support for Bucket subdomains
-    * This one may be impossible to do in a minor version update, as all paths would need to match
-      keys only. Not sure if we can somehow duplicate the path patterns and stay compatible for both
-      "path style access" and "bucket subdomain access".
-    * Started draft PR: [#925](https://github.com/adobe/S3Mock/pull/925)
-* Refactorings
-  * TBD
-* Version updates
-  * TBD
+**Once 4.x is released, 3.x may receive bug fixes and features, this will be best-effort only.**
 
 ## 3.x - PLANNED
 3.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
 
 * Features and fixes
-  * Support for Versions in APIs
+  * Support Versions in APIs
 * Refactorings
   * TBD
 * Version updates
@@ -100,22 +134,42 @@ Version 2.x is JDK8 LTS bytecode compatible, with Docker and JUnit / direct Java
   * Use new Spring Boot 3 features
   * Use new Spring Framework 6 features
   * Dependency cleanup
+  * Code cleanup
 * Version updates
   * Bump spring-boot.version from 2.x to 3.x
     * This will update all Spring Boot dependencies as well, including Spring Framework 6.x
   * Bump java version from 8 to 17
+    * This change is necessary, as Spring Framework 6 and Spring Boot 3 raise the baseline Java version from 8 to 17.
+
+# CURRENT - 2.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT
+Version 2.x is JDK8 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
+
+**The current major version 2 will receive new features, dependency updates and bug fixes on a continuous basis.**
 
-## 2.15.0 - PLANNED
+**Once 3.x is released, 2.x may receive bug fixes and features, this will be best-effort only.**
+
+**Once 4.x is released, 2.x support will be best-effort entirely.**
+
+## 2.16.0 - PLANNED
 2.x is JDK8 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
 
 * Features and fixes
-  * Support for GetObjectAttributes API
-    * Started draft PR: [#832](https://github.com/adobe/S3Mock/pull/832/)
+  * Add support for GetObjectAttributes API (fixes #536)
 * Refactorings
   * TBD
 * Version updates
   * TBD
 
+## 2.15.0
+2.x is JDK8 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
+
+* Features and fixes
+  * Store and return all encryption headers (fixes #1178)
+* Version updates
+  * Bump aws-v2.version from 2.20.92 to 2.20.94
+  * Bump aws-java-sdk-s3 from 1.12.494 to 1.12.497
+  * Bump checkstyle from 10.12.0 to 10.12.1
+
 ## 2.14.0
 2.x is JDK8 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
 

README.md

@@ -41,8 +41,8 @@ The `S3Mock` server can be started as a standalone *Docker* container, using *Te
 
 ## Changelog
 
-See the [changelog](CHANGELOG.md) for detailed information about changes in releases and planned changes.  
-We also use GitHub's [releases](https://github.com/adobe/S3Mock/releases) to document changes.
+See [GitHub releases](https://github.com/adobe/S3Mock/releases).  
+See also the [changelog](CHANGELOG.md) for detailed information about changes in releases and changes planned for future releases.  
 
 ## Implemented S3 APIs
 

build-config/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>2.14.0</version>
+    <version>2.15.0</version>
   </parent>
 
   <artifactId>s3mock-build-config</artifactId>

docker/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>2.14.0</version>
+    <version>2.15.0</version>
   </parent>
 
   <artifactId>s3mock-docker</artifactId>

integration-tests/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>2.14.0</version>
+    <version>2.15.0</version>
   </parent>
 
   <artifactId>s3mock-integration-tests</artifactId>

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

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2022 Adobe.
+ *  Copyright 2017-2023 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -151,6 +151,7 @@ internal class GetPutDeleteObjectV1IT : S3TestBase() {
     assertThat(objectMetadata.userMetadata)
       .`as`("User metadata should be identical!")
       .isEqualTo(metadata.userMetadata)
+    assertThat(objectMetadata.sseAwsKmsKeyId).isEqualTo(TEST_ENC_KEY_ID)
   }
 
   /**

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

@@ -27,6 +27,7 @@ import software.amazon.awssdk.services.s3.model.GetObjectRequest
 import software.amazon.awssdk.services.s3.model.HeadObjectRequest
 import software.amazon.awssdk.services.s3.model.PutObjectRequest
 import software.amazon.awssdk.services.s3.model.S3Exception
+import software.amazon.awssdk.services.s3.model.ServerSideEncryption
 import java.io.File
 import java.io.FileInputStream
 import java.io.InputStream
@@ -320,6 +321,52 @@ internal class GetPutDeleteObjectV2IT : S3TestBase() {
     assertThat(getObject.response().contentRange()).isEqualTo("bytes 5242380-5242879/5242880")
   }
 
+  /**
+   * Tests if Object can be uploaded with KMS and Metadata can be retrieved.
+   */
+  @Test
+  @S3VerifiedFailure(year = 2023,
+    reason = "No KMS configuration for AWS test account")
+  fun testPutObject_withEncryption(testInfo: TestInfo) {
+    val bucketName = givenBucketV2(testInfo)
+    val uploadFile = File(UPLOAD_FILE_NAME)
+
+    val sseCustomerAlgorithm = "someCustomerAlgorithm"
+    val sseCustomerKey = "someCustomerKey"
+    val sseCustomerKeyMD5 = "someCustomerKeyMD5"
+    val ssekmsEncryptionContext = "someEncryptionContext"
+    val putObject = s3ClientV2.putObject(
+      PutObjectRequest.builder()
+        .bucket(bucketName)
+        .key(UPLOAD_FILE_NAME)
+        .ssekmsKeyId(TEST_ENC_KEY_ID)
+        .sseCustomerAlgorithm(sseCustomerAlgorithm)
+        .sseCustomerKey(sseCustomerKey)
+        .sseCustomerKeyMD5(sseCustomerKeyMD5)
+        .ssekmsEncryptionContext(ssekmsEncryptionContext)
+        .serverSideEncryption(ServerSideEncryption.AWS_KMS)
+        .build(),
+      RequestBody.fromFile(uploadFile)
+    )
+
+    assertThat(putObject.ssekmsKeyId()).isEqualTo(TEST_ENC_KEY_ID)
+    assertThat(putObject.sseCustomerAlgorithm()).isEqualTo(sseCustomerAlgorithm)
+    assertThat(putObject.sseCustomerKeyMD5()).isEqualTo(sseCustomerKeyMD5)
+    assertThat(putObject.serverSideEncryption()).isEqualTo(ServerSideEncryption.AWS_KMS)
+
+    val getObject = s3ClientV2.getObject(
+      GetObjectRequest.builder()
+        .bucket(bucketName)
+        .key(UPLOAD_FILE_NAME)
+        .build()
+    )
+
+    assertThat(getObject.response().ssekmsKeyId()).isEqualTo(TEST_ENC_KEY_ID)
+    assertThat(getObject.response().sseCustomerAlgorithm()).isEqualTo(sseCustomerAlgorithm)
+    assertThat(getObject.response().sseCustomerKeyMD5()).isEqualTo(sseCustomerKeyMD5)
+    assertThat(getObject.response().serverSideEncryption()).isEqualTo(ServerSideEncryption.AWS_KMS)
+  }
+
   fun givenObjectV2WithRandomBytes(bucketName: String): String {
     val key = randomName
     s3ClientV2.putObject(

pom.xml

@@ -21,7 +21,7 @@
 
   <groupId>com.adobe.testing</groupId>
   <artifactId>s3mock-parent</artifactId>
-  <version>2.14.0</version>
+  <version>2.15.0</version>
   <packaging>pom</packaging>
 
   <name>S3Mock - Parent</name>
@@ -73,7 +73,7 @@
   <scm>
     <connection>scm:git:https://github.com/adobe/S3Mock.git</connection>
     <developerConnection>scm:git:https://github.com/adobe/S3Mock.git</developerConnection>
-    <tag>2.14.0</tag>
+    <tag>2.15.0</tag>
     <url>https://github.com/adobe/S3Mock/tree/main</url>
   </scm>
 
@@ -89,10 +89,10 @@
   </distributionManagement>
 
   <properties>
-    <aws-v2.version>2.20.92</aws-v2.version>
+    <aws-v2.version>2.20.94</aws-v2.version>
 
-    <aws.version>1.12.494</aws.version>
-    <checkstyle.version>10.12.0</checkstyle.version>
+    <aws.version>1.12.497</aws.version>
+    <checkstyle.version>10.12.1</checkstyle.version>
     <commons-codec.version>1.15</commons-codec.version>
     <commons-io.version>2.13.0</commons-io.version>
     <docker-builder.image.name>s3mock-buildx</docker-builder.image.name>

server/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>2.14.0</version>
+    <version>2.15.0</version>
   </parent>
 
   <artifactId>s3mock</artifactId>