CFNV2: fix delete change set (#12977)

simonrw · web-flow · commit c1d19e211e58 · 2025-08-08T19:44:47.000+01:00
diff --git a/localstack-core/localstack/services/cloudformation/v2/provider.py b/localstack-core/localstack/services/cloudformation/v2/provider.py
@@ -175,7 +175,7 @@ def find_change_set_v2(
     state: CloudFormationStore, change_set_name: str, stack_name: str | None = None
 ) -> ChangeSet | None:
     if is_changeset_arn(change_set_name):
-        return state.change_sets[change_set_name]
+        return state.change_sets.get(change_set_name)
     else:
         if stack_name is not None:
             stack = find_stack_v2(state, stack_name)
@@ -187,7 +187,9 @@ def find_change_set_v2(
                 if change_set_candidate.change_set_name == change_set_name:
                     return change_set_candidate
         else:
-            raise ValueError("No stack name specified when finding change set")
+            raise ValidationError(
+                "StackName must be specified if ChangeSetName is not specified as an ARN."
+            )
 
 
 def find_stack_set_v2(state: CloudFormationStore, stack_set_name: str) -> StackSet | None:
@@ -627,16 +629,7 @@ def delete_change_set(
         **kwargs,
     ) -> DeleteChangeSetOutput:
         state = get_cloudformation_store(context.account_id, context.region)
-
-        if is_changeset_arn(change_set_name):
-            change_set = state.change_sets.get(change_set_name)
-        elif not is_changeset_arn(change_set_name) and stack_name:
-            change_set = find_change_set_v2(state, change_set_name, stack_name)
-        else:
-            raise ValidationError(
-                "StackName must be specified if ChangeSetName is not specified as an ARN."
-            )
-
+        change_set = find_change_set_v2(state, change_set_name, stack_name)
         if not change_set:
             return DeleteChangeSetOutput()
 
diff --git a/tests/aws/services/cloudformation/api/test_changesets.py b/tests/aws/services/cloudformation/api/test_changesets.py
@@ -848,7 +848,6 @@ def _check_changeset_success():
     snapshot.match("error_execute_failed", e.value)
 
 
-@skip_if_v2_provider(reason="CFNV2:DeleteChangeSet")
 @markers.aws.validated
 def test_deleted_changeset(snapshot, cleanups, aws_client):
     """simple case verifying that proper exception is thrown when trying to get a deleted changeset"""
