Light, fluffy, and always free - The AWS Local Emulator alternative
fix(cloudformation): resolve stacks by ARN in addition to name (#386)
Hector Ventura035a99d0183b
diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationService.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationService.javaindex f2246fee34..4c924d4541 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationService.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationService.java@@ -52,7 +52,7 @@ public class CloudFormationService {public List<Stack> describeStacks(String stackName, String region) {if (stackName != null && !stackName.isBlank()) {- Stack stack = stacks.get(key(stackName, region));+ Stack stack = resolveStack(stackName, region);if (stack == null) {throw new AwsException("ValidationError","Stack with id " + stackName + " does not exist", 400);@@ -147,7 +147,7 @@ public class CloudFormationService {// ── DeleteStack ───────────────────────────────────────────────────────────public void deleteStack(String stackName, String region) {- Stack stack = stacks.get(key(stackName, region));+ Stack stack = resolveStack(stackName, region);if (stack == null) {return; // Already gone — no-op}@@ -484,15 +484,60 @@ public class CloudFormationService {stack.getEvents().add(event);}- private Stack getStackOrThrow(String stackName, String region) {- Stack stack = stacks.get(key(stackName, region));+ private Stack getStackOrThrow(String stackNameOrArn, String region) {+ Stack stack = resolveStack(stackNameOrArn, region);if (stack == null) {throw new AwsException("ValidationError",- "Stack with id " + stackName + " does not exist", 400);+ "Stack with id " + stackNameOrArn + " does not exist", 400);}return stack;}+ /**+ * Resolves a stack by name or ARN. When an ARN is provided the stack name+ * is extracted from the ARN path segment ({@code …:stack/<name>/<id>}).+ * Falls back to a linear scan matching on stackId for robustness.+ */+ private Stack resolveStack(String stackNameOrArn, String region) {+ // Try direct name lookup first (fast path)+ Stack stack = stacks.get(key(stackNameOrArn, region));+ if (stack != null) {+ return stack;+ }++ // If input looks like an ARN, extract the stack name and retry+ if (stackNameOrArn != null && stackNameOrArn.startsWith("arn:")) {+ String extractedName = extractStackNameFromArn(stackNameOrArn);+ if (extractedName != null) {+ stack = stacks.get(key(extractedName, region));+ if (stack != null) {+ return stack;+ }+ }+ // Fallback: scan by stackId in case the ARN format is unexpected+ for (Stack s : stacks.values()) {+ if (stackNameOrArn.equals(s.getStackId())) {+ return s;+ }+ }+ }+ return null;+ }++ /**+ * Extracts the stack name from a CloudFormation stack ARN.+ * Expected format: {@code arn:aws:cloudformation:REGION:ACCOUNT:stack/STACK_NAME/UUID}+ */+ private static String extractStackNameFromArn(String arn) {+ int stackSegment = arn.indexOf(":stack/");+ if (stackSegment < 0) {+ return null;+ }+ String afterStack = arn.substring(stackSegment + ":stack/".length());+ int slash = afterStack.indexOf('/');+ return slash > 0 ? afterStack.substring(0, slash) : afterStack;+ }+private List<String> topologicalSort(JsonNode resources, Map<String, Boolean> conditions) {Set<String> allIds = new LinkedHashSet<>();resources.fieldNames().forEachRemaining(allIds::add);diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationIntegrationTest.javaindex c9124e9bba..3661a453a6 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationIntegrationTest.java@@ -488,6 +488,62 @@ class CloudFormationIntegrationTest {.body(not(containsString("my-changeset")));}+ @Test+ void describeStackEvents_byArn() {+ String template = """+ {+ "Resources": {+ "MyBucket": {+ "Type": "AWS::S3::Bucket",+ "Properties": {+ "BucketName": "arn-events-test-bucket"+ }+ }+ }+ }+ """;++ // 1. Create stack and capture the ARN+ String createResponse = given()+ .contentType("application/x-www-form-urlencoded")+ .formParam("Action", "CreateStack")+ .formParam("StackName", "arn-events-stack")+ .formParam("TemplateBody", template)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body(containsString("<StackId>"))+ .extract().asString();++ // Extract the ARN from the response+ String stackArn = createResponse.substring(+ createResponse.indexOf("<StackId>") + "<StackId>".length(),+ createResponse.indexOf("</StackId>"));++ // 2. Describe stack events using the ARN+ given()+ .contentType("application/x-www-form-urlencoded")+ .formParam("Action", "DescribeStackEvents")+ .formParam("StackName", stackArn)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body(containsString("<StackName>arn-events-stack</StackName>"));++ // 3. Describe stacks using the ARN+ given()+ .contentType("application/x-www-form-urlencoded")+ .formParam("Action", "DescribeStacks")+ .formParam("StackName", stackArn)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body(containsString("<StackName>arn-events-stack</StackName>"));+ }+@Testvoid deleteChangeSet_nonExistentChangeSet_returnsError() {String template = """