Light, fluffy, and always free - The AWS Local Emulator alternative
fix(cloudfront): retain distribution tags by ARN (#6797)
Jimmy Liu Jia582dba641957
diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontController.java b/src/main/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontController.javaindex 102de85a8a..eeb22659ca 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontController.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontController.java@@ -66,7 +66,7 @@ public class CloudFrontController {try {DistributionConfig config = parseDistributionConfig(body);Map<String, String> tags = new LinkedHashMap<>();- if (withTags != null) {+ if (withTags != null || "DistributionConfigWithTags".equals(XmlParser.rootElementName(body))) {tags = parseTags(body);}Distribution dist = new Distribution();diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontService.java b/src/main/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontService.javaindex 58ecc49a56..3e441091a7 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontService.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontService.java@@ -218,7 +218,7 @@ public class CloudFrontService implements ServerCertificateReferenceProvider {dist.setEtag(UUID.randomUUID().toString());if (tags != null && !tags.isEmpty()) {dist.setTags(tags);- tagStore.put("distribution/" + id, tags);+ tagStore.put(dist.getArn(), tags);}distStore.put(id, dist);return dist;@@ -443,6 +443,7 @@ public class CloudFrontService implements ServerCertificateReferenceProvider {}distStore.delete(id);invalidationStore.delete(id);+ tagStore.delete(existing.getArn());tagStore.delete("distribution/" + id);}@@ -452,8 +453,12 @@ public class CloudFrontService implements ServerCertificateReferenceProvider {* which owns the resource lifecycle at the stack level.*/public synchronized void removeDistribution(String id) {+ Distribution existing = distStore.get(id).orElse(null);distStore.delete(id);invalidationStore.delete(id);+ if (existing != null) {+ tagStore.delete(existing.getArn());+ }tagStore.delete("distribution/" + id);}diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontManagementProtocolTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontManagementProtocolTest.javaindex 6cf1e07c1a..37f3577132 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontManagementProtocolTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontManagementProtocolTest.java@@ -49,6 +49,49 @@ class CloudFrontManagementProtocolTest {"http://cloudfront.amazonaws.com/doc/2020-05-31/")));}+ @Test+ void distributionCreatedWithTagsReturnsThemByArn() {+ String body = """+ <DistributionConfigWithTags xmlns="http://cloudfront.amazonaws.com/doc/2020-05-31/">+ <DistributionConfig>+ <CallerReference>%s</CallerReference>+ <Enabled>false</Enabled>+ <Origins><Quantity>1</Quantity><Items><Origin>+ <Id>origin</Id><DomainName>example.com</DomainName>+ <CustomOriginConfig>+ <HTTPPort>80</HTTPPort><HTTPSPort>443</HTTPSPort>+ <OriginProtocolPolicy>http-only</OriginProtocolPolicy>+ </CustomOriginConfig>+ </Origin></Items></Origins>+ <DefaultCacheBehavior>+ <TargetOriginId>origin</TargetOriginId>+ <ViewerProtocolPolicy>allow-all</ViewerProtocolPolicy>+ </DefaultCacheBehavior>+ </DistributionConfig>+ <Tags><Items><Tag><Key>env</Key><Value>dev</Value></Tag></Items></Tags>+ </DistributionConfigWithTags>+ """.formatted(UUID.randomUUID());++ Response created = given().contentType("application/xml").body(body)+ .when().post(API + "distribution?WithTags");+ created.then().statusCode(201);+ String xml = created.asString();+ String arn = XmlParser.extractFirst(xml, "ARN", null);+ String id = XmlParser.extractFirst(xml, "Id", null);++ try {+ given().queryParam("Resource", arn)+ .when().get(API + "tagging")+ .then().statusCode(200)+ .body(hasXPath("//*[local-name()='Tag']/*[local-name()='Key']/text()", equalTo("env")))+ .body(hasXPath("//*[local-name()='Tag']/*[local-name()='Value']/text()", equalTo("dev")));+ } finally {+ given().header("If-Match", created.header("ETag"))+ .when().delete(API + "distribution/" + id)+ .then().statusCode(204);+ }+ }+@ParameterizedTest(name = "{0} omits unmodeled Marker and IsTruncated members")@ValueSource(strings = {"cache-policy",diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontServiceTest.javaindex bba2d27431..52ab8fcc6f 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudfront/CloudFrontServiceTest.java@@ -329,6 +329,31 @@ class CloudFrontServiceTest {assertEquals("arn:aws-cn:cloudfront::" + ACCOUNT + ":distribution/" + dist.getId(), dist.getArn());}+ @Test+ void distributionTagsAreReadAndUpdatedByArn() {+ CloudFrontService service = serviceWithDomainSuffix(DEFAULT_DOMAIN_SUFFIX);+ Distribution dist = service.createDistribution(new Distribution(), Map.of("env", "dev"));++ assertEquals(Map.of("env", "dev"), service.listTagsForResource(dist.getArn()));++ service.tagResource(dist.getArn(), Map.of("team", "infra"));+ assertEquals(Map.of("env", "dev", "team", "infra"), service.listTagsForResource(dist.getArn()));++ service.untagResource(dist.getArn(), List.of("env"));+ assertEquals(Map.of("team", "infra"), service.listTagsForResource(dist.getArn()));+ }++ @Test+ void deletingDistributionRemovesTagsStoredUnderItsArn() {+ CloudFrontService service = serviceWithDomainSuffix(DEFAULT_DOMAIN_SUFFIX);+ Distribution dist = service.createDistribution(new Distribution(), Map.of());+ service.tagResource(dist.getArn(), Map.of("env", "dev"));++ service.deleteDistribution(dist.getId(), dist.getEtag());++ assertEquals(Map.of(), service.listTagsForResource(dist.getArn()));+ }+@Testvoid createDistributionUsesDefaultDomainSuffix() {CloudFrontService service = serviceWithDomainSuffix(null);