Light, fluffy, and always free - The AWS Local Emulator alternative
fix(appconfig): accept top-level resource ARNs in TagResource/ListTagsForResource (#2279)
sheldon-nadarajah-sft0818e5e2d642
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AppConfigTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AppConfigTest.javaindex b99df3defc..6081ab3bde 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AppConfigTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/AppConfigTest.java@@ -306,4 +306,32 @@ class AppConfigTest {} catch (Exception ignored) {}}}++ @Test+ @Order(51)+ @DisplayName("TagResource / ListTagsForResource - deploymentstrategy ARN (top-level, not nested under application/)")+ void tagDeploymentStrategyViaSdk() {+ // deploymentstrategy/extension/extensionassociation ARNs don't nest under application/+ // like every other AppConfig resource tested above - a naive ARN parser can end up+ // hardcoding the application/ prefix and rejecting these as invalid, even though AWS+ // documents all three as taggable (see e.g. AWS::AppConfig::DeploymentStrategy's Tags+ // property). This asserts the SDK call succeeds end-to-end, not just that some ARN shape+ // is accepted internally.+ String tagStrategyId = appConfig.createDeploymentStrategy(CreateDeploymentStrategyRequest.builder()+ .name("tag-roundtrip-strategy")+ .deploymentDurationInMinutes(0)+ .growthFactor(100f)+ .finalBakeTimeInMinutes(0)+ .build()).id();+ String arn = "arn:aws:appconfig:us-east-1:000000000000:deploymentstrategy/" + tagStrategyId;++ appConfig.tagResource(TagResourceRequest.builder()+ .resourceArn(arn)+ .tags(java.util.Map.of("env", "prod"))+ .build());++ ListTagsForResourceResponse listed = appConfig.listTagsForResource(+ ListTagsForResourceRequest.builder().resourceArn(arn).build());+ assertThat(listed.tags()).isNotNull();+ }}diff --git a/src/main/java/io/github/hectorvent/floci/services/appconfig/AppConfigTagHandler.java b/src/main/java/io/github/hectorvent/floci/services/appconfig/AppConfigTagHandler.javaindex cbb32a82b3..8ffbcd005d 100644--- a/src/main/java/io/github/hectorvent/floci/services/appconfig/AppConfigTagHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/appconfig/AppConfigTagHandler.java@@ -8,6 +8,7 @@ import jakarta.inject.Inject;import java.util.List;import java.util.Map;+import java.util.Set;/*** {@link TagHandler} implementation for AppConfig.@@ -17,9 +18,14 @@ import java.util.Map;* <li>{@code arn:aws:appconfig:<region>:<account>:application/<appId>}* <li>{@code arn:aws:appconfig:<region>:<account>:application/<appId>/environment/<envId>}* <li>{@code arn:aws:appconfig:<region>:<account>:application/<appId>/configurationprofile/<profileId>}+ * <li>{@code arn:aws:appconfig:<region>:<account>:deploymentstrategy/<strategyId>}+ * <li>{@code arn:aws:appconfig:<region>:<account>:extension/<extensionId>}+ * <li>{@code arn:aws:appconfig:<region>:<account>:extensionassociation/<associationId>}* </ul>- * Only application-level tags are stored; environment and configurationprofile tag calls- * are accepted (no-op) to satisfy Terraform provider reads.+ * Only application-level tags are actually stored; every other recognized ARN shape above is+ * accepted (not rejected with a 400) but the tag call itself is a no-op - this satisfies callers+ * (e.g. Terraform's AWS provider) that read tags back after a write without erroring on a resource+ * type Floci doesn't yet persist tags for.*/@ApplicationScopedpublic class AppConfigTagHandler implements TagHandler {@@ -68,6 +74,13 @@ public class AppConfigTagHandler implements TagHandler {private record ResourceRef(String type, String id) {}+ // The AppConfig resource types AWS documents as taggable that are NOT nested under+ // application/... (see e.g. the Tags property on AWS::AppConfig::DeploymentStrategy,+ // AWS::AppConfig::Extension, and AWS::AppConfig::ExtensionAssociation) - every other+ // taggable type (application, environment, configurationprofile) already nests under+ // application/ and is handled by the branch below.+ private static final Set<String> TOP_LEVEL_TYPES = Set.of("deploymentstrategy", "extension", "extensionassociation");+private static ResourceRef parseArn(String arn) {// arn:aws:appconfig:<region>:<account>:<resource>String resource;@@ -77,6 +90,9 @@ public class AppConfigTagHandler implements TagHandler {throw new AwsException("BadRequestException", "Invalid resource ARN: " + arn, 400);}String[] parts = resource.split("/");+ if (parts.length == 2 && TOP_LEVEL_TYPES.contains(parts[0])) {+ return new ResourceRef(parts[0], parts[1]);+ }if (parts.length >= 2 && "application".equals(parts[0])) {// application/<appId>if (parts.length == 2) return new ResourceRef("application", parts[1]);diff --git a/src/test/java/io/github/hectorvent/floci/services/appconfig/AppConfigIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/appconfig/AppConfigIntegrationTest.javaindex ee6c3d4f2c..e5d90f7d5f 100644--- a/src/test/java/io/github/hectorvent/floci/services/appconfig/AppConfigIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/appconfig/AppConfigIntegrationTest.java@@ -317,7 +317,51 @@ class AppConfigIntegrationTest {.body("Tags", anEmptyMap());}+ // ──────────── Tags on top-level (non-application-nested) resource ARNs ────────────+ // deploymentstrategy/extension/extensionassociation are real, taggable AppConfig resource+ // types per the API - unlike environment/deployment above, their ARNs don't nest under+ // application/..., so they need their own top-level branch in AppConfigTagHandler#parseArn.+ // Regression coverage for that ARN-shape acceptance; no tag storage exists for these types+ // yet (same no-op precedent as environment/deployment above), so only 200-not-400 is asserted.+@Test @Order(22)+ void listTagsForDeploymentStrategyArnIsAcceptedNotRejected() {+ String arn = "arn:aws:appconfig:us-east-1:000000000000:deploymentstrategy/" + strategyId;+ given()+ .when().get("/tags/" + arn)+ .then()+ .statusCode(200)+ .body("Tags", anEmptyMap());+ }++ @Test @Order(23)+ void tagDeploymentStrategyArnIsAcceptedNotRejected() {+ String arn = "arn:aws:appconfig:us-east-1:000000000000:deploymentstrategy/" + strategyId;+ given()+ .contentType(ContentType.JSON)+ .body("{\"Tags\": {\"env\": \"local\"}}")+ .when().post("/tags/" + arn)+ .then()+ .statusCode(204);+ }++ @Test @Order(24)+ void listTagsForExtensionAndExtensionAssociationArnsIsAcceptedNotRejected() {+ String extensionArn = "arn:aws:appconfig:us-east-1:000000000000:extension/some-extension-id";+ String associationArn = "arn:aws:appconfig:us-east-1:000000000000:extensionassociation/some-association-id";+ given()+ .when().get("/tags/" + extensionArn)+ .then()+ .statusCode(200)+ .body("Tags", anEmptyMap());+ given()+ .when().get("/tags/" + associationArn)+ .then()+ .statusCode(200)+ .body("Tags", anEmptyMap());+ }++ @Test @Order(25)void emptyConfigurationReturnsEmptyPayload() {emptyAppId = given().contentType(ContentType.JSON)