Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix: return versionId in CompleteMultipartUpload response (#35)

ByronLudwig6e8713d9fe4e
diff --git a/src/main/java/io/github/hectorvent/floci/services/s3/S3Controller.java b/src/main/java/io/github/hectorvent/floci/services/s3/S3Controller.java
index 88800dd740..61d3df876f 100644
--- a/src/main/java/io/github/hectorvent/floci/services/s3/S3Controller.java
+++ b/src/main/java/io/github/hectorvent/floci/services/s3/S3Controller.java
@@ -481,16 +481,22 @@ public class S3Controller {
if (baseUrl.endsWith("/")) {
baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
}
- String xml = new XmlBuilder()
+ XmlBuilder xmlBuilder = new XmlBuilder()
.raw("<?xml version=\"1.0\" encoding=\"UTF-8\"?>")
.start("CompleteMultipartUploadResult", AwsNamespaces.S3)
.elem("Location", baseUrl + "/" + bucket + "/" + key)
.elem("Bucket", bucket)
.elem("Key", key)
- .elem("ETag", obj.getETag())
- .end("CompleteMultipartUploadResult")
- .build();
- return Response.ok(xml).build();
+ .elem("ETag", obj.getETag());
+ if (obj.getVersionId() != null) {
+ xmlBuilder.elem("VersionId", obj.getVersionId());
+ }
+ String xml = xmlBuilder.end("CompleteMultipartUploadResult").build();
+ var resp = Response.ok(xml);
+ if (obj.getVersionId() != null) {
+ resp.header("x-amz-version-id", obj.getVersionId());
+ }
+ return resp.build();
}
return xmlErrorResponse(new AwsException("InvalidArgument",
diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3MultipartServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3MultipartServiceTest.java
index 3235d1c718..6e5be42b4d 100644
--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3MultipartServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3MultipartServiceTest.java
@@ -122,6 +122,18 @@ class S3MultipartServiceTest {
assertTrue(uploads.isEmpty());
}
+ @Test
+ void completeMultipartUploadVersioned() {
+ s3Service.putBucketVersioning("test-bucket", "Enabled");
+ MultipartUpload upload = s3Service.initiateMultipartUpload("test-bucket", "versioned.bin", "text/plain");
+ s3Service.uploadPart("test-bucket", "versioned.bin", upload.getUploadId(), 1, "data".getBytes());
+
+ S3Object result = s3Service.completeMultipartUpload("test-bucket", "versioned.bin",
+ upload.getUploadId(), List.of(1));
+
+ assertNotNull(result.getVersionId(), "Versioned bucket should produce a versionId");
+ }
+
@Test
void completeMultipartUploadCleansUp() {
MultipartUpload upload = s3Service.initiateMultipartUpload("test-bucket", "file.bin", null);