Light, fluffy, and always free - The AWS Local Emulator alternative
fix: fix s3 createbucket response format for rust sdk compatibility (#11)
Hector Ventura0e29c65266e5
diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationResourceProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationResourceProvisioner.javaindex 4d53daff78..66719c853f 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationResourceProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationResourceProvisioner.java@@ -136,7 +136,7 @@ public class CloudFormationResourceProvisioner {if (bucketName == null || bucketName.isBlank()) {bucketName = "cfn-" + UUID.randomUUID().toString().substring(0, 12).toLowerCase();}- s3Service.createBucket(bucketName);+ s3Service.createBucket(bucketName, region);r.setPhysicalId(bucketName);r.getAttributes().put("Arn", "arn:aws:s3:::" + bucketName);r.getAttributes().put("DomainName", bucketName + ".s3.amazonaws.com");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.javaindex 7cc77a4462..88800dd740 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@@ -139,7 +139,13 @@ public class S3Controller {return Response.ok().build();}- s3Service.createBucket(bucket);+ String locationConstraint = null;+ if (body != null && body.length > 0) {+ locationConstraint = XmlParser.extractFirst(new String(body, StandardCharsets.UTF_8),+ "LocationConstraint", null);+ }+ String region = locationConstraint != null ? locationConstraint : regionResolver.getDefaultRegion();+ s3Service.createBucket(bucket, region);String lockEnabled = httpHeaders.getHeaderString("x-amz-bucket-object-lock-enabled");if ("true".equalsIgnoreCase(lockEnabled)) {s3Service.putBucketVersioning(bucket, "Enabled");@@ -721,8 +727,10 @@ public class S3Controller {// --- Bucket Location ---private Response handleGetBucketLocation(String bucket) {- s3Service.headBucket(bucket);- String region = regionResolver.getDefaultRegion();+ String region = s3Service.getBucketRegion(bucket);+ if (region == null) {+ region = regionResolver.getDefaultRegion();+ }String xml = new XmlBuilder().raw("<?xml version=\"1.0\" encoding=\"UTF-8\"?>").start("LocationConstraint", AwsNamespaces.S3)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 a9a712e874..7454ad18cf 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@@ -90,7 +90,7 @@ public class S3Service {}}- public Bucket createBucket(String bucketName) {+ public Bucket createBucket(String bucketName, String region) {var existing = bucketStore.get(bucketName);if (existing.isPresent()) {throw new AwsException("BucketAlreadyOwnedByYou",@@ -98,8 +98,9 @@ public class S3Service {}Bucket bucket = new Bucket(bucketName);+ bucket.setRegion(region);bucketStore.put(bucketName, bucket);- LOG.infov("Created bucket: {0}", bucketName);+ LOG.infov("Created bucket: {0} in region: {1}", bucketName, region);return bucket;}@@ -436,6 +437,11 @@ public class S3Service {ensureBucketExists(bucketName);}+ public String getBucketRegion(String bucketName) {+ ensureBucketExists(bucketName);+ return bucketStore.get(bucketName).map(Bucket::getRegion).orElse(null);+ }+// --- Batch Delete ---public record DeleteResult(String key, String versionId, boolean deleteMarker, String deleteMarkerVersionId) {diff --git a/src/main/java/io/github/hectorvent/floci/services/s3/model/Bucket.java b/src/main/java/io/github/hectorvent/floci/services/s3/model/Bucket.javaindex 528e16511a..e432269648 100644--- a/src/main/java/io/github/hectorvent/floci/services/s3/model/Bucket.java+++ b/src/main/java/io/github/hectorvent/floci/services/s3/model/Bucket.java@@ -23,6 +23,7 @@ public class Bucket {private String lifecycleConfiguration;private String acl; // XML representation or JSON stubprivate String encryptionConfiguration; // XML string+ private String region;public Bucket() {this.tags = new HashMap<>();@@ -74,4 +75,7 @@ public class Bucket {public String getEncryptionConfiguration() { return encryptionConfiguration; }public void setEncryptionConfiguration(String encryptionConfiguration) { this.encryptionConfiguration = encryptionConfiguration; }++ public String getRegion() { return region; }+ public void setRegion(String region) { this.region = region; }}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.javaindex c81887ccbe..3235d1c718 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@@ -24,7 +24,7 @@ class S3MultipartServiceTest {@BeforeEachvoid setUp() {s3Service = new S3Service(new InMemoryStorage<>(), new InMemoryStorage<>(), tempDir);- s3Service.createBucket("test-bucket");+ s3Service.createBucket("test-bucket", "us-east-1");}@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 121cee5be5..81d3f3739b 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@@ -30,27 +30,39 @@ class S3ServiceTest {@Testvoid createBucket() {- Bucket bucket = s3Service.createBucket("test-bucket");+ Bucket bucket = s3Service.createBucket("test-bucket", "us-east-1");assertEquals("test-bucket", bucket.getName());assertNotNull(bucket.getCreationDate());}+ @Test+ void createBucketStoresRegion() {+ s3Service.createBucket("eu-bucket", "eu-central-1");+ assertEquals("eu-central-1", s3Service.getBucketRegion("eu-bucket"));+ }++ @Test+ void createBucketNullRegionWhenNotProvided() {+ s3Service.createBucket("default-bucket", null);+ assertNull(s3Service.getBucketRegion("default-bucket"));+ }+@Testvoid createDuplicateBucketThrows() {- s3Service.createBucket("test-bucket");- assertThrows(AwsException.class, () -> s3Service.createBucket("test-bucket"));+ s3Service.createBucket("test-bucket", "us-east-1");+ assertThrows(AwsException.class, () -> s3Service.createBucket("test-bucket", "us-east-1"));}@Testvoid deleteBucket() {- s3Service.createBucket("test-bucket");+ s3Service.createBucket("test-bucket", "us-east-1");s3Service.deleteBucket("test-bucket");assertThrows(AwsException.class, () -> s3Service.deleteBucket("test-bucket"));}@Testvoid deleteNonEmptyBucketThrows() {- s3Service.createBucket("test-bucket");+ s3Service.createBucket("test-bucket", "us-east-1");s3Service.putObject("test-bucket", "file.txt", "hello".getBytes(), "text/plain", null);assertThrows(AwsException.class, () -> s3Service.deleteBucket("test-bucket"));}@@ -62,8 +74,8 @@ class S3ServiceTest {@Testvoid listBuckets() {- s3Service.createBucket("bucket-a");- s3Service.createBucket("bucket-b");+ s3Service.createBucket("bucket-a", "us-east-1");+ s3Service.createBucket("bucket-b", "us-east-1");List<Bucket> buckets = s3Service.listBuckets();assertEquals(2, buckets.size());@@ -71,7 +83,7 @@ class S3ServiceTest {@Testvoid putAndGetObject() {- s3Service.createBucket("test-bucket");+ s3Service.createBucket("test-bucket", "us-east-1");byte[] data = "Hello World".getBytes(StandardCharsets.UTF_8);S3Object put = s3Service.putObject("test-bucket", "greeting.txt", data, "text/plain", null);@@ -85,7 +97,7 @@ class S3ServiceTest {@Testvoid putObjectWritesFileToDisk() {- s3Service.createBucket("test-bucket");+ s3Service.createBucket("test-bucket", "us-east-1");byte[] data = "file content".getBytes(StandardCharsets.UTF_8);s3Service.putObject("test-bucket", "docs/readme.txt", data, "text/plain", null);@@ -96,7 +108,7 @@ class S3ServiceTest {@Testvoid deleteObjectRemovesFileFromDisk() {- s3Service.createBucket("test-bucket");+ s3Service.createBucket("test-bucket", "us-east-1");s3Service.putObject("test-bucket", "file.txt", "data".getBytes(), null, null);Path filePath = tempDir.resolve("s3/test-bucket/file.txt");@@ -108,7 +120,7 @@ class S3ServiceTest {@Testvoid deleteBucketRemovesDirectory() {- s3Service.createBucket("test-bucket");+ s3Service.createBucket("test-bucket", "us-east-1");s3Service.putObject("test-bucket", "file.txt", "data".getBytes(), null, null);s3Service.deleteObject("test-bucket", "file.txt");s3Service.deleteBucket("test-bucket");@@ -118,7 +130,7 @@ class S3ServiceTest {@Testvoid getObjectNotFoundThrows() {- s3Service.createBucket("test-bucket");+ s3Service.createBucket("test-bucket", "us-east-1");AwsException ex = assertThrows(AwsException.class, () ->s3Service.getObject("test-bucket", "missing.txt"));assertEquals("NoSuchKey", ex.getErrorCode());@@ -132,7 +144,7 @@ class S3ServiceTest {@Testvoid deleteObject() {- s3Service.createBucket("test-bucket");+ s3Service.createBucket("test-bucket", "us-east-1");s3Service.putObject("test-bucket", "file.txt", "data".getBytes(), null, null);s3Service.deleteObject("test-bucket", "file.txt");@@ -142,7 +154,7 @@ class S3ServiceTest {@Testvoid listObjects() {- s3Service.createBucket("test-bucket");+ s3Service.createBucket("test-bucket", "us-east-1");s3Service.putObject("test-bucket", "docs/a.txt", "a".getBytes(), null, null);s3Service.putObject("test-bucket", "docs/b.txt", "b".getBytes(), null, null);s3Service.putObject("test-bucket", "images/pic.jpg", "img".getBytes(), null, null);@@ -162,8 +174,8 @@ class S3ServiceTest {@Testvoid copyObject() {- s3Service.createBucket("source-bucket");- s3Service.createBucket("dest-bucket");+ s3Service.createBucket("source-bucket", "us-east-1");+ s3Service.createBucket("dest-bucket", "us-east-1");s3Service.putObject("source-bucket", "original.txt", "content".getBytes(), "text/plain", null);S3Object copy = s3Service.copyObject("source-bucket", "original.txt", "dest-bucket", "copy.txt");@@ -178,7 +190,7 @@ class S3ServiceTest {@Testvoid copyObjectSameBucket() {- s3Service.createBucket("test-bucket");+ s3Service.createBucket("test-bucket", "us-east-1");s3Service.putObject("test-bucket", "original.txt", "data".getBytes(), null, null);s3Service.copyObject("test-bucket", "original.txt", "test-bucket", "copy.txt");@@ -187,7 +199,7 @@ class S3ServiceTest {@Testvoid headObject() {- s3Service.createBucket("test-bucket");+ s3Service.createBucket("test-bucket", "us-east-1");s3Service.putObject("test-bucket", "file.txt", "hello".getBytes(), "text/plain", null);S3Object head = s3Service.headObject("test-bucket", "file.txt");@@ -197,7 +209,7 @@ class S3ServiceTest {@Testvoid putObjectOverwrites() {- s3Service.createBucket("test-bucket");+ s3Service.createBucket("test-bucket", "us-east-1");s3Service.putObject("test-bucket", "file.txt", "v1".getBytes(), null, null);s3Service.putObject("test-bucket", "file.txt", "v2".getBytes(), null, null);diff --git a/src/test/java/io/github/hectorvent/floci/services/s3/S3VersioningServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/s3/S3VersioningServiceTest.javaindex b84b54470b..6b62665fd4 100644--- a/src/test/java/io/github/hectorvent/floci/services/s3/S3VersioningServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/s3/S3VersioningServiceTest.java@@ -23,7 +23,7 @@ class S3VersioningServiceTest {@BeforeEachvoid setUp() {s3Service = new S3Service(new InMemoryStorage<>(), new InMemoryStorage<>(), tempDir);- s3Service.createBucket("versioned-bucket");+ s3Service.createBucket("versioned-bucket", "us-east-1");}@Test