Remove extra_context concept from change set model

simonrw · simonrw · commit 05fbb4ff58e0 · 2025-04-15T15:32:57.000+01:00
diff --git a/localstack-core/localstack/services/cloudformation/engine/entities.py b/localstack-core/localstack/services/cloudformation/engine/entities.py
@@ -434,6 +434,5 @@ def populate_update_graph(
             after_template=after_template,
             before_parameters=before_parameters,
             after_parameters=after_parameters,
-            extra_context={"previous_resources": self.resources},
         )
         self.update_graph = change_set_model.get_update_model()
diff --git a/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model.py b/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model.py
@@ -118,7 +118,6 @@ class NodeTemplate(ChangeSetNode):
     conditions: Final[NodeConditions]
     resources: Final[NodeResources]
     outputs: Final[NodeOutputs]
-    extra_context: Final[dict]
 
     def __init__(
         self,
@@ -129,15 +128,13 @@ def __init__(
         conditions: NodeConditions,
         resources: NodeResources,
         outputs: NodeOutputs,
-        extra_context: dict | None = None,
     ):
         super().__init__(scope=scope, change_type=change_type)
         self.mappings = mappings
         self.parameters = parameters
         self.conditions = conditions
         self.resources = resources
         self.outputs = outputs
-        self.extra_context = extra_context
 
 
 class NodeDivergence(ChangeSetNode):
@@ -402,13 +399,11 @@ def __init__(
         after_template: Optional[dict],
         before_parameters: Optional[dict],
         after_parameters: Optional[dict],
-        extra_context: Optional[dict] = None,
     ):
         self._before_template = before_template or Nothing
         self._after_template = after_template or Nothing
         self._before_parameters = before_parameters or Nothing
         self._after_parameters = after_parameters or Nothing
-        self._extra_context = extra_context or {}
         self._visited_scopes = dict()
         self._node_template = self._model(
             before_template=self._before_template, after_template=self._after_template
@@ -1060,7 +1055,6 @@ def _model(self, before_template: Maybe[dict], after_template: Maybe[dict]) -> N
             conditions=conditions,
             resources=resources,
             outputs=outputs,
-            extra_context=self._extra_context,
         )
 
     def _retrieve_condition_if_exists(self, condition_name: str) -> Optional[NodeCondition]:
diff --git a/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_executor.py b/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_executor.py
@@ -146,13 +146,13 @@ def _execute_on_resource_change(
     def _merge_before_properties(
         self, name: str, preproc_resource: PreprocResource
     ) -> PreprocProperties:
-        before_properties = copy.deepcopy(preproc_resource.properties)
-        if previous_properties := self._node_template.extra_context.get(
-            "previous_resources", {}
-        ).get(name):
-            before_properties = PreprocProperties(previous_properties["Properties"])
+        if previous_resource_properties := self.stack.resolved_resources.get(name, {}).get(
+            "Properties"
+        ):
+            return PreprocProperties(properties=previous_resource_properties)
 
-        return before_properties
+        # XXX fall back to returning the input value
+        return copy.deepcopy(preproc_resource.properties)
 
     def _execute_resource_action(
         self,
diff --git a/localstack-core/localstack/services/cloudformation/v2/entities.py b/localstack-core/localstack/services/cloudformation/v2/entities.py
@@ -33,7 +33,7 @@
 
 
 class ResolvedResource(TypedDict):
-    pass
+    Properties: dict
 
 
 class Stack:
@@ -167,7 +167,6 @@ def populate_update_graph(
             after_template=after_template,
             before_parameters=before_parameters,
             after_parameters=after_parameters,
-            extra_context={"previous_resources": self.stack.resolved_resources},
         )
         self.update_graph = change_set_model.get_update_model()
 

Original file line number	Diff line number	Diff line change
`@@ -434,6 +434,5 @@ def populate_update_graph(`
`434`	`434`	`after_template=after_template,`
`435`	`435`	`before_parameters=before_parameters,`
`436`	`436`	`after_parameters=after_parameters,`
`437`		`- extra_context={"previous_resources": self.resources},`
`438`	`437`	`)`
`439`	`438`	`self.update_graph = change_set_model.get_update_model()`