Light, fluffy, and always free - The AWS Local Emulator alternative
fix(s3): make us-east-1 bucket creation idempotent (#844)
Fred Peñaa396110cb586
diff --git a/src/main/java/io/github/hectorvent/floci/services/s3/S3Service.java b/src/main/java/io/github/hectorvent/floci/services/s3/S3Service.javaindex 93034b96bb..ba6ef2b540 100644--- a/src/main/java/io/github/hectorvent/floci/services/s3/S3Service.java+++ b/src/main/java/io/github/hectorvent/floci/services/s3/S3Service.java@@ -157,6 +157,11 @@ public class S3Service {public Bucket createBucket(String bucketName, String region) {var existing = bucketStore.get(bucketName);if (existing.isPresent()) {+ Bucket bucket = existing.get();+ if (isDefaultS3Region(bucket.getRegion()) && isDefaultS3Region(region)) {+ LOG.infov("Bucket already exists in default region, treating CreateBucket as idempotent: {0}", bucketName);+ return bucket;+ }throw new AwsException("BucketAlreadyOwnedByYou","Your previous request to create the named bucket succeeded and you already own it.", 409);}@@ -168,6 +173,10 @@ public class S3Service {return bucket;}+ private static boolean isDefaultS3Region(String region) {+ return region == null || region.isBlank() || "us-east-1".equalsIgnoreCase(region);+ }+public void deleteBucket(String bucketName) {ensureBucketExists(bucketName);diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3IntegrationTest.javaindex 23097ef3e1..0a507c6870 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3IntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3IntegrationTest.java@@ -30,13 +30,13 @@ class S3IntegrationTest {@Test@Order(2)- void createDuplicateBucketFails() {+ void createDuplicateBucketInUsEast1IsIdempotent() {given().when().put("/test-bucket").then()- .statusCode(409)- .body(containsString("BucketAlreadyOwnedByYou"));+ .statusCode(200)+ .header("Location", equalTo("/test-bucket"));}@Testdiff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceTest.javaindex 5cbc2aefcb..9097bbd462 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3ServiceTest.java@@ -58,9 +58,16 @@ class S3ServiceTest {}@Test- void createDuplicateBucketThrows() {- s3Service.createBucket("test-bucket", "us-east-1");- assertThrows(AwsException.class, () -> s3Service.createBucket("test-bucket", "us-east-1"));+ void createDuplicateBucketInUsEast1IsIdempotent() {+ Bucket first = s3Service.createBucket("test-bucket", "us-east-1");+ Bucket duplicate = s3Service.createBucket("test-bucket", "us-east-1");+ assertSame(first, duplicate);+ }++ @Test+ void createDuplicateBucketOutsideUsEast1Throws() {+ s3Service.createBucket("eu-bucket", "eu-central-1");+ assertThrows(AwsException.class, () -> s3Service.createBucket("eu-bucket", "eu-central-1"));}@Test