Handle not setting template after execute_change_set

simonrw · simonrw · commit 90ddbfe1dcf0 · 2025-10-07T23:47:15.000+01:00
diff --git a/localstack-core/localstack/services/cloudformation/v2/provider.py b/localstack-core/localstack/services/cloudformation/v2/provider.py
@@ -617,6 +617,11 @@ def _run(*args):
             result = change_set_executor.execute()
             change_set.stack.resolved_parameters = change_set.resolved_parameters
             change_set.stack.resolved_resources = result.resources
+            change_set.stack.template = change_set.template
+            change_set.stack.processed_template = change_set.processed_template
+            change_set.stack.template_body = change_set.template_body
+            change_set.stack.description = change_set.template.get("Description")
+
             if not result.failure_message:
                 new_stack_status = StackStatus.UPDATE_COMPLETE
                 if change_set.change_set_type == ChangeSetType.CREATE:
@@ -631,13 +636,6 @@ def _run(*args):
                         change_set.stack.resolved_exports[export_name] = output["OutputValue"]
 
                 change_set.stack.change_set_id = change_set.change_set_id
-
-                # if the deployment succeeded, update the stack's template representation to that
-                # which was just deployed
-                change_set.stack.template = change_set.template
-                change_set.stack.description = change_set.template.get("Description")
-                change_set.stack.processed_template = change_set.processed_template
-                change_set.stack.template_body = change_set.template_body
             else:
                 LOG.error(
                     "Execute change set failed: %s",
diff --git a/tests/aws/services/cloudformation/api/test_templates.py b/tests/aws/services/cloudformation/api/test_templates.py
@@ -8,6 +8,7 @@
 from tests.aws.services.cloudformation.conftest import skip_if_legacy_engine
 
 from localstack.testing.pytest import markers
+from localstack.testing.pytest.fixtures import StackDeployError
 from localstack.utils.common import load_file
 from localstack.utils.strings import short_uid, to_bytes
 
@@ -76,6 +77,34 @@ def test_get_template_summary_no_resources(aws_client, snapshot):
     snapshot.match("error", exc_info.value.response)
 
 
+@markers.aws.validated
+@markers.snapshot.skip_snapshot_verify(
+    paths=["$..ResourceIdentifierSummaries..ResourceIdentifiers"]
+)
+@skip_if_legacy_engine()
+def test_get_template_summary_failed_stack(deploy_cfn_template, aws_client, snapshot):
+    snapshot.add_transformer(snapshot.transform.cloudformation_api())
+
+    template = {
+        "Resources": {
+            "MyParameter": {
+                "Type": "AWS::SSM::Parameter",
+                "Properties": {
+                    "Type": "String",
+                    # Note: missing Value parameter so the resource provider should fail
+                },
+            },
+        },
+    }
+
+    stack_name = f"stack-{short_uid()}"
+    with pytest.raises(StackDeployError):
+        deploy_cfn_template(template=json.dumps(template), stack_name=stack_name)
+
+    summary = aws_client.cloudformation.get_template_summary(StackName=stack_name)
+    snapshot.match("template-summary", summary)
+
+
 @markers.aws.validated
 @pytest.mark.parametrize("url_style", ["s3_url", "http_path", "http_host", "http_invalid"])
 def test_create_stack_from_s3_template_url(
diff --git a/tests/aws/services/cloudformation/api/test_templates.snapshot.json b/tests/aws/services/cloudformation/api/test_templates.snapshot.json
@@ -216,5 +216,32 @@
         }
       }
     }
+  },
+  "tests/aws/services/cloudformation/api/test_templates.py::test_get_template_summary_failed_stack": {
+    "recorded-date": "07-10-2025, 22:44:53",
+    "recorded-content": {
+      "template-summary": {
+        "Parameters": [],
+        "ResourceIdentifierSummaries": [
+          {
+            "LogicalResourceIds": [
+              "MyParameter"
+            ],
+            "ResourceIdentifiers": [
+              "Name"
+            ],
+            "ResourceType": "AWS::SSM::Parameter"
+          }
+        ],
+        "ResourceTypes": [
+          "AWS::SSM::Parameter"
+        ],
+        "Version": "2010-09-09",
+        "ResponseMetadata": {
+          "HTTPHeaders": {},
+          "HTTPStatusCode": 200
+        }
+      }
+    }
   }
 }
diff --git a/tests/aws/services/cloudformation/api/test_templates.validation.json b/tests/aws/services/cloudformation/api/test_templates.validation.json
@@ -50,6 +50,15 @@
   "tests/aws/services/cloudformation/api/test_templates.py::test_get_template_summary": {
     "last_validated_date": "2023-05-24T13:05:00+00:00"
   },
+  "tests/aws/services/cloudformation/api/test_templates.py::test_get_template_summary_failed_stack": {
+    "last_validated_date": "2025-10-07T22:44:53+00:00",
+    "durations_in_seconds": {
+      "setup": 1.0,
+      "call": 134.39,
+      "teardown": 0.0,
+      "total": 135.39
+    }
+  },
   "tests/aws/services/cloudformation/api/test_templates.py::test_get_template_summary_no_resources": {
     "last_validated_date": "2025-10-07T22:28:52+00:00",
     "durations_in_seconds": {
