Merge pull request #2003 from adobe/1978-put-object-tagging-for-aws-cli

Allow PUT requests without content-type application/xml
adobe · Jul 27, 2024 · 90f89c7 · 90f89c7
2 parents c6de60a + 86e3422
commit 90f89c7
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,8 @@
 * [PLANNED - 4.x - RELEASE TBD](#planned---4x---release-tbd)
     * [Planned changes](#planned-changes)
 * [CURRENT - 3.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT](#current---3x---this-version-is-under-active-development)
-  * [3.10.0 - PLANNED](#3100---planned)
+  * [3.11.0 - PLANNED](#3110---planned)
+  * [3.10.0](#3100)
   * [3.9.1](#391)
   * [3.9.0](#390)
   * [3.8.0](#380)
@@ -126,7 +127,7 @@ Version 3.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Jav
 
 **The current major version 3 will receive new features, dependency updates and bug fixes on a continuous basis.**
 
-## 3.10.0 - PLANNED
+## 3.11.0 - PLANNED
 3.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
 
 * Features and fixes
@@ -138,6 +139,38 @@ Version 3.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Jav
 * Version updates
   * TBD
 
+## 3.10.0
+3.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
+
+* Features and fixes
+  * Allow PUT requests without content-type application/xml (fixes #1978) 
+* Version updates
+  * Bump aws-v2.version from 2.25.59 to 2.26.25
+  * Bump aws.version from 1.12.729 to 1.12.765
+  * Bump spring-boot.version from 3.3.0 to 3.3.2
+  * Bump alpine from 3.20.0 to 3.20.2 in /docker
+  * Bump com.fasterxml.jackson:jackson-bom from 2.17.1 to 2.17.2
+  * Bump testcontainers.version from 1.19.8 to 1.20.0
+  * Bump org.mockito.kotlin:mockito-kotlin from 5.3.1 to 5.4.0
+  * Bump com.puppycrawl.tools:checkstyle from 10.16.0 to 10.17.0
+  * Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.2.5 to 3.3.1
+  * Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.5 to 3.3.1
+  * Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.4.1 to 3.5.0
+  * Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.8.0
+  * Bump org.apache.maven.plugins:maven-dependency-plugin from 3.6.1 to 3.7.1
+  * Bump org.apache.maven.plugins:maven-checkstyle-plugin from 3.3.1 to 3.4.0
+  * Bump org.apache.maven.plugins:maven-release-plugin from 3.0.1 to 3.1.1
+  * Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.2 to 3.4.0
+  * Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2
+  * Bump org.sonatype.plugins:nexus-staging-maven-plugin from 1.6.13 to 1.7.0
+  * Bump docker/setup-qemu-action from 3.0.0 to 3.2.0
+  * Bump actions/upload-artifact from 4.3.3 to 4.3.4
+  * Bump actions/dependency-review-action from 4.3.2 to 4.3.4
+  * Bump actions/checkout from 4.1.6 to 4.1.7
+  * Bump github/codeql-action from 3.25.6 to 3.25.14
+  * Bump ossf/scorecard-action from 2.3.3 to 2.4.0
+  * Bump step-security/harden-runner from 2.8.0 to 2.9.0
+
 ## 3.9.1
 3.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
 

diff --git a/build-config/pom.xml b/build-config/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>3.9.2-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-build-config</artifactId>

diff --git a/docker/pom.xml b/docker/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>3.9.2-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-docker</artifactId>

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>3.9.2-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-integration-tests</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>com.adobe.testing</groupId>
   <artifactId>s3mock-parent</artifactId>
-  <version>3.9.2-SNAPSHOT</version>
+  <version>3.10.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>S3Mock - Parent</name>

diff --git a/server/pom.xml b/server/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>3.9.2-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock</artifactId>

diff --git a/server/src/main/java/com/adobe/testing/s3mock/BucketController.java b/server/src/main/java/com/adobe/testing/s3mock/BucketController.java
@@ -225,8 +225,7 @@ public ResponseEntity<ObjectLockConfiguration> getObjectLockConfiguration(
       },
       params = {
           OBJECT_LOCK
-      },
-      consumes = APPLICATION_XML_VALUE
+      }
   )
   public ResponseEntity<Void> putObjectLockConfiguration(
       @PathVariable String bucketName,
@@ -281,8 +280,7 @@ public ResponseEntity<BucketLifecycleConfiguration> getBucketLifecycleConfigurat
       },
       params = {
           LIFECYCLE
-      },
-      consumes = APPLICATION_XML_VALUE
+      }
   )
   public ResponseEntity<Void> putBucketLifecycleConfiguration(
       @PathVariable String bucketName,

diff --git a/server/src/main/java/com/adobe/testing/s3mock/ObjectController.java b/server/src/main/java/com/adobe/testing/s3mock/ObjectController.java
@@ -307,8 +307,7 @@ public ResponseEntity<StreamingResponseBody> getObject(@PathVariable String buck
       value = "/{bucketName:.+}/{*key}",
       params = {
           ACL,
-      },
-      consumes = APPLICATION_XML_VALUE
+      }
   )
   public ResponseEntity<Void> putObjectAcl(@PathVariable final String bucketName,
       @PathVariable ObjectKey key,
@@ -399,8 +398,7 @@ public ResponseEntity<Tagging> getObjectTagging(@PathVariable String bucketName,
       value = "/{bucketName:.+}/{*key}",
       params = {
           TAGGING
-      },
-      consumes = APPLICATION_XML_VALUE
+      }
   )
   public ResponseEntity<Void> putObjectTagging(@PathVariable String bucketName,
       @PathVariable ObjectKey key,
@@ -452,8 +450,7 @@ public ResponseEntity<LegalHold> getLegalHold(@PathVariable String bucketName,
       value = "/{bucketName:.+}/{*key}",
       params = {
           LEGAL_HOLD
-      },
-      consumes = APPLICATION_XML_VALUE
+      }
   )
   public ResponseEntity<Void> putLegalHold(@PathVariable String bucketName,
       @PathVariable ObjectKey key,
@@ -504,8 +501,7 @@ public ResponseEntity<Retention> getObjectRetention(@PathVariable String bucketN
       value = "/{bucketName:.+}/{*key}",
       params = {
           RETENTION
-      },
-      consumes = APPLICATION_XML_VALUE
+      }
   )
   public ResponseEntity<Void> putObjectRetention(@PathVariable String bucketName,
       @PathVariable ObjectKey key,
@@ -683,7 +679,7 @@ public ResponseEntity<Void> putObject(@PathVariable String bucketName,
           NOT_ACL
       },
       produces = APPLICATION_XML_VALUE
-      )
+  )
   public ResponseEntity<CopyObjectResult> copyObject(@PathVariable String bucketName,
       @PathVariable ObjectKey key,
       @RequestHeader(value = X_AMZ_COPY_SOURCE) CopySource copySource,

diff --git a/testsupport/common/pom.xml b/testsupport/common/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-testsupport-reactor</artifactId>
-    <version>3.9.2-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-testsupport-common</artifactId>

diff --git a/testsupport/junit4/pom.xml b/testsupport/junit4/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-testsupport-reactor</artifactId>
-    <version>3.9.2-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-junit4</artifactId>

diff --git a/testsupport/junit5/pom.xml b/testsupport/junit5/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-testsupport-reactor</artifactId>
-    <version>3.9.2-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-junit5</artifactId>

diff --git a/testsupport/pom.xml b/testsupport/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>3.9.2-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-testsupport-reactor</artifactId>

diff --git a/testsupport/testcontainers/pom.xml b/testsupport/testcontainers/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-testsupport-reactor</artifactId>
-    <version>3.9.2-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-testcontainers</artifactId>

diff --git a/testsupport/testng/pom.xml b/testsupport/testng/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-testsupport-reactor</artifactId>
-    <version>3.9.2-SNAPSHOT</version>
+    <version>3.10.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-testng</artifactId>