Update stack template and template body after change set completion

simonrw · simonrw · commit 7572bc8a78f1 · 2025-06-03T22:52:19.000+01:00
Because we were not updating the stack template, when we tried to destroy the stack we would try to delete resources that no longer existed. Now we don't.
diff --git a/localstack-core/localstack/services/cloudformation/v2/provider.py b/localstack-core/localstack/services/cloudformation/v2/provider.py
@@ -153,10 +153,10 @@ def create_change_set(
             # on a CREATE an empty Stack should be generated if we didn't find an active one
             if not active_stack_candidates and change_set_type == ChangeSetType.CREATE:
                 stack = Stack(
-                    context.account_id,
-                    context.region,
-                    request,
-                    structured_template,
+                    account_id=context.account_id,
+                    region_name=context.region,
+                    request_payload=request,
+                    template=structured_template,
                     template_body=template_body,
                 )
                 state.stacks_v2[stack.stack_id] = stack
@@ -218,7 +218,7 @@ def create_change_set(
         after_template = structured_template
 
         # create change set for the stack and apply changes
-        change_set = ChangeSet(stack, request)
+        change_set = ChangeSet(stack, request, template=after_template)
 
         # only set parameters for the changeset, then switch to stack on execute_change_set
         change_set.populate_update_graph(
@@ -287,6 +287,9 @@ def _run(*args):
                 change_set.stack.resolved_resources = result.resources
                 change_set.stack.resolved_parameters = result.parameters
                 change_set.stack.resolved_outputs = result.outputs
+                # if the deployment succeeded, update the stack's template representation to that
+                # which was just deployed
+                change_set.stack.template = change_set.template
             except Exception as e:
                 LOG.error(
                     "Execute change set failed: %s", e, exc_info=LOG.isEnabledFor(logging.WARNING)
