Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(s3): implement S3 Control ListTagsForResource, TagResource, Untag… (#363)

Hector Venturae3e8903ffab2
diff --git a/compatibility-tests/sdk-test-java/pom.xml b/compatibility-tests/sdk-test-java/pom.xml
index 88d221f95e..394c73c77d 100644
--- a/compatibility-tests/sdk-test-java/pom.xml
+++ b/compatibility-tests/sdk-test-java/pom.xml
@@ -58,6 +58,10 @@
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
</dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>s3control</artifactId>
+ </dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>ssm</artifactId>
diff --git a/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java b/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java
index e3d2fdddb0..95a1873893 100644
--- a/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java
+++ b/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java
@@ -16,6 +16,9 @@ import software.amazon.awssdk.services.lambda.LambdaClient;
import software.amazon.awssdk.services.opensearch.OpenSearchClient;
import software.amazon.awssdk.services.rds.RdsClient;
import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.endpoints.Endpoint;
+import software.amazon.awssdk.services.s3control.S3ControlClient;
+import software.amazon.awssdk.services.s3control.endpoints.S3ControlEndpointProvider;
import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
import software.amazon.awssdk.services.ses.SesClient;
import software.amazon.awssdk.services.sfn.SfnClient;
@@ -131,6 +134,22 @@ public final class TestFixtures {
.build();
}
+ /**
+ * S3 Control client for the S3 Control API (/v20180820/...).
+ * Host prefix injection (account-ID prepended to host) is disabled so requests
+ * go to the configured endpoint directly rather than 000000000000.localhost:4566.
+ */
+ public static S3ControlClient s3ControlClient() {
+ URI endpoint = ENDPOINT;
+ return S3ControlClient.builder()
+ .region(REGION)
+ .credentialsProvider(CREDENTIALS)
+ .endpointProvider((S3ControlEndpointProvider) params ->
+ java.util.concurrent.CompletableFuture.completedFuture(
+ Endpoint.builder().url(endpoint).build()))
+ .build();
+ }
+
public static DynamoDbClient dynamoDbClient() {
return DynamoDbClient.builder()
.endpointOverride(ENDPOINT)
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3ControlTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3ControlTest.java
new file mode 100644
index 0000000000..b0609ba5f2
--- /dev/null
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/S3ControlTest.java
@@ -0,0 +1,216 @@
+package com.floci.test;
+
+import org.junit.jupiter.api.*;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.BucketAlreadyOwnedByYouException;
+import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+import software.amazon.awssdk.services.s3.model.DeleteBucketRequest;
+import software.amazon.awssdk.services.s3.model.DeleteBucketTaggingRequest;
+import software.amazon.awssdk.services.s3.model.GetBucketTaggingRequest;
+import software.amazon.awssdk.services.s3.model.GetBucketTaggingResponse;
+import software.amazon.awssdk.services.s3.model.PutBucketTaggingRequest;
+import software.amazon.awssdk.services.s3.model.Tag;
+import software.amazon.awssdk.services.s3.model.Tagging;
+import software.amazon.awssdk.services.s3control.S3ControlClient;
+import software.amazon.awssdk.services.s3control.model.ListTagsForResourceRequest;
+import software.amazon.awssdk.services.s3control.model.ListTagsForResourceResponse;
+import software.amazon.awssdk.services.s3control.model.TagResourceRequest;
+import software.amazon.awssdk.services.s3control.model.UntagResourceRequest;
+import software.amazon.awssdk.services.s3control.model.S3ControlException;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.assertj.core.api.Assertions.*;
+
+/**
+ * Compatibility tests for S3 Control API (issue #341).
+ *
+ * Verifies ListTagsForResource, TagResource, and UntagResource work correctly
+ * via the real AWS SDK S3ControlClient against Floci.
+ *
+ * Terraform AWS provider v6.x calls ListTagsForResource during bucket read-back;
+ * without this API the provider marks buckets as errored even when they are created.
+ */
+@DisplayName("S3 Control API — ListTagsForResource / TagResource / UntagResource (#341)")
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+class S3ControlTest {
+
+ private static S3Client s3;
+ private static S3ControlClient s3control;
+
+ private static final String BUCKET = "compat-341-bucket";
+ private static final String ACCOUNT_ID = "000000000000";
+ private static final String REGION_NAME = "us-east-1";
+
+ private static String bucketArn() {
+ return "arn:aws:s3:" + REGION_NAME + ":" + ACCOUNT_ID + ":bucket/" + BUCKET;
+ }
+
+ @BeforeAll
+ static void setup() {
+ s3 = TestFixtures.s3Client();
+ s3control = TestFixtures.s3ControlClient();
+
+ try {
+ s3.createBucket(CreateBucketRequest.builder().bucket(BUCKET).build());
+ } catch (BucketAlreadyOwnedByYouException ignored) {}
+ }
+
+ @AfterAll
+ static void cleanup() {
+ if (s3 != null) {
+ try {
+ s3.deleteBucketTagging(DeleteBucketTaggingRequest.builder().bucket(BUCKET).build());
+ s3.deleteBucket(DeleteBucketRequest.builder().bucket(BUCKET).build());
+ } catch (Exception ignored) {}
+ s3.close();
+ }
+ if (s3control != null) {
+ s3control.close();
+ }
+ }
+
+ @Test
+ @Order(1)
+ @DisplayName("listTagsForResource: returns tags set via standard PutBucketTagging")
+ void listTagsForResourceReturnsBucketTags() {
+ s3.putBucketTagging(PutBucketTaggingRequest.builder()
+ .bucket(BUCKET)
+ .tagging(Tagging.builder()
+ .tagSet(
+ Tag.builder().key("Environment").value("dev").build(),
+ Tag.builder().key("ManagedBy").value("terraform").build())
+ .build())
+ .build());
+
+ ListTagsForResourceResponse response = s3control.listTagsForResource(
+ ListTagsForResourceRequest.builder()
+ .accountId(ACCOUNT_ID)
+ .resourceArn(bucketArn())
+ .build());
+
+ Map<String, String> tags = response.tags().stream()
+ .collect(Collectors.toMap(
+ software.amazon.awssdk.services.s3control.model.Tag::key,
+ software.amazon.awssdk.services.s3control.model.Tag::value));
+
+ assertThat(tags).containsEntry("Environment", "dev")
+ .containsEntry("ManagedBy", "terraform");
+ }
+
+ @Test
+ @Order(2)
+ @DisplayName("listTagsForResource: untagged bucket returns empty tag list")
+ void listTagsForResourceEmptyBucket() {
+ s3.deleteBucketTagging(DeleteBucketTaggingRequest.builder().bucket(BUCKET).build());
+
+ ListTagsForResourceResponse response = s3control.listTagsForResource(
+ ListTagsForResourceRequest.builder()
+ .accountId(ACCOUNT_ID)
+ .resourceArn(bucketArn())
+ .build());
+
+ assertThat(response.tags()).isEmpty();
+ }
+
+ @Test
+ @Order(3)
+ @DisplayName("tagResource: tags set via S3 Control are visible through standard GetBucketTagging")
+ void tagResourceVisibleThroughStandardApi() {
+ s3control.tagResource(TagResourceRequest.builder()
+ .accountId(ACCOUNT_ID)
+ .resourceArn(bucketArn())
+ .tags(
+ software.amazon.awssdk.services.s3control.model.Tag.builder()
+ .key("Team").value("platform").build(),
+ software.amazon.awssdk.services.s3control.model.Tag.builder()
+ .key("CostCenter").value("engineering").build())
+ .build());
+
+ GetBucketTaggingResponse tagging = s3.getBucketTagging(
+ GetBucketTaggingRequest.builder().bucket(BUCKET).build());
+
+ Map<String, String> tags = tagging.tagSet().stream()
+ .collect(Collectors.toMap(Tag::key, Tag::value));
+
+ assertThat(tags).containsEntry("Team", "platform")
+ .containsEntry("CostCenter", "engineering");
+ }
+
+ @Test
+ @Order(4)
+ @DisplayName("tagResource: replaces all existing tags (not a merge)")
+ void tagResourceReplacesAllTags() {
+ // tagResource replaces — only the new tags should remain
+ s3control.tagResource(TagResourceRequest.builder()
+ .accountId(ACCOUNT_ID)
+ .resourceArn(bucketArn())
+ .tags(software.amazon.awssdk.services.s3control.model.Tag.builder()
+ .key("NewOnly").value("yes").build())
+ .build());
+
+ ListTagsForResourceResponse response = s3control.listTagsForResource(
+ ListTagsForResourceRequest.builder()
+ .accountId(ACCOUNT_ID)
+ .resourceArn(bucketArn())
+ .build());
+
+ Map<String, String> tags = response.tags().stream()
+ .collect(Collectors.toMap(
+ software.amazon.awssdk.services.s3control.model.Tag::key,
+ software.amazon.awssdk.services.s3control.model.Tag::value));
+
+ assertThat(tags).containsOnlyKeys("NewOnly");
+ }
+
+ @Test
+ @Order(5)
+ @DisplayName("untagResource: removes specific keys, leaves others intact")
+ void untagResourceRemovesSpecificKeys() {
+ // Set two tags first
+ s3control.tagResource(TagResourceRequest.builder()
+ .accountId(ACCOUNT_ID)
+ .resourceArn(bucketArn())
+ .tags(
+ software.amazon.awssdk.services.s3control.model.Tag.builder()
+ .key("Keep").value("me").build(),
+ software.amazon.awssdk.services.s3control.model.Tag.builder()
+ .key("Remove").value("me").build())
+ .build());
+
+ s3control.untagResource(UntagResourceRequest.builder()
+ .accountId(ACCOUNT_ID)
+ .resourceArn(bucketArn())
+ .tagKeys(List.of("Remove"))
+ .build());
+
+ ListTagsForResourceResponse response = s3control.listTagsForResource(
+ ListTagsForResourceRequest.builder()
+ .accountId(ACCOUNT_ID)
+ .resourceArn(bucketArn())
+ .build());
+
+ Map<String, String> tags = response.tags().stream()
+ .collect(Collectors.toMap(
+ software.amazon.awssdk.services.s3control.model.Tag::key,
+ software.amazon.awssdk.services.s3control.model.Tag::value));
+
+ assertThat(tags).containsEntry("Keep", "me")
+ .doesNotContainKey("Remove");
+ }
+
+ @Test
+ @Order(6)
+ @DisplayName("listTagsForResource: non-existent bucket returns 404 NoSuchBucket")
+ void listTagsForResourceNonExistentBucketThrows() {
+ assertThatThrownBy(() -> s3control.listTagsForResource(
+ ListTagsForResourceRequest.builder()
+ .accountId(ACCOUNT_ID)
+ .resourceArn("arn:aws:s3:" + REGION_NAME + ":" + ACCOUNT_ID + ":bucket/does-not-exist-341")
+ .build()))
+ .isInstanceOf(S3ControlException.class)
+ .satisfies(e -> assertThat(((S3ControlException) e).statusCode()).isEqualTo(404));
+ }
+}
diff --git a/src/main/java/io/github/hectorvent/floci/core/common/AwsNamespaces.java b/src/main/java/io/github/hectorvent/floci/core/common/AwsNamespaces.java
index 5cc76ec712..c358fb34e9 100644
--- a/src/main/java/io/github/hectorvent/floci/core/common/AwsNamespaces.java
+++ b/src/main/java/io/github/hectorvent/floci/core/common/AwsNamespaces.java
@@ -14,6 +14,7 @@ public final class AwsNamespaces {
public static final String EC = "http://elasticache.amazonaws.com/doc/2015-02-02/";
public static final String CW = "http://monitoring.amazonaws.com/doc/2010-08-01/";
public static final String S3 = "http://s3.amazonaws.com/doc/2006-03-01/";
+ public static final String S3_CONTROL = "http://awss3control.amazonaws.com/doc/2018-08-20/";
public static final String SES = "http://ses.amazonaws.com/doc/2010-12-01/";
public static final String EC2 = "http://ec2.amazonaws.com/doc/2016-11-15/";
diff --git a/src/main/java/io/github/hectorvent/floci/services/s3/S3ControlController.java b/src/main/java/io/github/hectorvent/floci/services/s3/S3ControlController.java
new file mode 100644
index 0000000000..c5efbd3b27
--- /dev/null
+++ b/src/main/java/io/github/hectorvent/floci/services/s3/S3ControlController.java
@@ -0,0 +1,120 @@
+package io.github.hectorvent.floci.services.s3;
+
+import io.github.hectorvent.floci.core.common.AwsException;
+import io.github.hectorvent.floci.core.common.AwsNamespaces;
+import io.github.hectorvent.floci.core.common.XmlBuilder;
+import io.github.hectorvent.floci.core.common.XmlParser;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.HeaderParam;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * S3 Control API endpoints used by Terraform AWS provider v6.x and other tools.
+ * All endpoints are under /v20180820 matching the S3 Control API version.
+ *
+ * Protocol: REST-XML
+ * Namespace: http://awss3control.amazonaws.com/doc/2018-08-20/
+ */
+@Path("/v20180820")
+@Produces(MediaType.APPLICATION_XML)
+public class S3ControlController {
+
+ private final S3Service s3Service;
+
+ @Inject
+ public S3ControlController(S3Service s3Service) {
+ this.s3Service = s3Service;
+ }
+
+ /**
+ * ListTagsForResource — returns all tags on the specified S3 bucket.
+ * Used by Terraform AWS provider v6.x during bucket read-back.
+ *
+ * GET /v20180820/tags/{resourceArn+}
+ * Header: x-amz-account-id
+ */
+ @GET
+ @Path("/tags/{resourceArn: .+}")
+ public Response listTagsForResource(
+ @PathParam("resourceArn") String resourceArn,
+ @HeaderParam("x-amz-account-id") String accountId) {
+
+ String bucketName = extractBucketName(resourceArn);
+ Map<String, String> tags = s3Service.getBucketTagging(bucketName);
+
+ XmlBuilder xml = new XmlBuilder()
+ .raw("<?xml version=\"1.0\" encoding=\"UTF-8\"?>")
+ .start("ListTagsForResourceResult", AwsNamespaces.S3_CONTROL)
+ .start("Tags");
+ tags.forEach((k, v) ->
+ xml.start("Tag").elem("Key", k).elem("Value", v).end("Tag"));
+ xml.end("Tags").end("ListTagsForResourceResult");
+ return Response.ok(xml.build()).build();
+ }
+
+ /**
+ * TagResource — replaces all tags on the specified S3 bucket.
+ *
+ * POST /v20180820/tags/{resourceArn+}
+ * Header: x-amz-account-id
+ * Body: XML containing {@code <Tags><Tag><Key>…</Key><Value>…</Value></Tag></Tags>}
+ */
+ @POST
+ @Path("/tags/{resourceArn: .+}")
+ @Consumes(MediaType.WILDCARD)
+ public Response tagResource(
+ @PathParam("resourceArn") String resourceArn,
+ @HeaderParam("x-amz-account-id") String accountId,
+ byte[] body) {
+
+ String bucketName = extractBucketName(resourceArn);
+ String xml = new String(body, StandardCharsets.UTF_8);
+ Map<String, String> tags = XmlParser.extractPairs(xml, "Tag", "Key", "Value");
+ s3Service.putBucketTagging(bucketName, tags);
+ return Response.noContent().build();
+ }
+
+ /**
+ * UntagResource — removes specific tags from the specified S3 bucket.
+ *
+ * DELETE /v20180820/tags/{resourceArn+}?tagKeys=Key1&tagKeys=Key2
+ * Header: x-amz-account-id
+ */
+ @DELETE
+ @Path("/tags/{resourceArn: .+}")
+ public Response untagResource(
+ @PathParam("resourceArn") String resourceArn,
+ @HeaderParam("x-amz-account-id") String accountId,
+ @QueryParam("tagKeys") List<String> tagKeys) {
+
+ String bucketName = extractBucketName(resourceArn);
+ Map<String, String> existing = new HashMap<>(s3Service.getBucketTagging(bucketName));
+ tagKeys.forEach(existing::remove);
+ s3Service.putBucketTagging(bucketName, existing);
+ return Response.noContent().build();
+ }
+
+ private String extractBucketName(String resourceArn) {
+ int idx = resourceArn.lastIndexOf(":bucket/");
+ if (idx < 0) {
+ throw new AwsException("InvalidRequest",
+ "Unsupported resource type. Only S3 bucket ARNs are supported " +
+ "(arn:aws:s3:<region>:<account>:bucket/<name>).", 400);
+ }
+ return resourceArn.substring(idx + ":bucket/".length());
+ }
+}
diff --git a/src/main/java/io/github/hectorvent/floci/services/s3/S3VirtualHostFilter.java b/src/main/java/io/github/hectorvent/floci/services/s3/S3VirtualHostFilter.java
index 15beee754b..a9bcc40274 100644
--- a/src/main/java/io/github/hectorvent/floci/services/s3/S3VirtualHostFilter.java
+++ b/src/main/java/io/github/hectorvent/floci/services/s3/S3VirtualHostFilter.java
@@ -55,6 +55,12 @@ public class S3VirtualHostFilter implements ContainerRequestFilter {
URI uri = requestContext.getUriInfo().getRequestUri();
String path = uri.getRawPath();
+ // Do not rewrite S3 Control API paths — the account ID appears as a host label
+ // in the S3ControlClient but the path belongs to the S3 Control service, not S3.
+ if (path.startsWith("/v20180820/")) {
+ return;
+ }
+
// Rewrite path from /key to /bucket/key
String newPath = "/" + bucket + (path.startsWith("/") ? "" : "/") + path;