localstack-core 4.5.1.dev61__py3-none-any.whl → 4.5.1.dev63__py3-none-any.whl

localstack/services/cloudformation/engine/v2/change_set_model.py

@@ -147,6 +147,22 @@ class ChangeSetNode(ChangeSetEntity, abc.ABC): ...
 class ChangeSetTerminal(ChangeSetEntity, abc.ABC): ...
 
 
+class UpdateModel:
+    # TODO: may be expanded to keep track of other runtime values such as resolved_parameters.
+
+    node_template: Final[NodeTemplate]
+    before_runtime_cache: Final[dict]
+    after_runtime_cache: Final[dict]
+
+    def __init__(
+        self,
+        node_template: NodeTemplate,
+    ):
+        self.node_template = node_template
+        self.before_runtime_cache = dict()
+        self.after_runtime_cache = dict()
+
+
 class NodeTemplate(ChangeSetNode):
     transform: Final[NodeTransform]
     mappings: Final[NodeMappings]
@@ -515,9 +531,8 @@ class ChangeSetModel:
         )
         # TODO: need to do template preprocessing e.g. parameter resolution, conditions etc.
 
-    def get_update_model(self) -> NodeTemplate:
-        # TODO: rethink naming of this for outer utils
-        return self._node_template
+    def get_update_model(self) -> UpdateModel:
+        return UpdateModel(node_template=self._node_template)
 
     def _visit_terminal_value(
         self, scope: Scope, before_value: Maybe[Any], after_value: Maybe[Any]
@@ -548,8 +563,9 @@ class ChangeSetModel:
         node_intrinsic_function = self._visited_scopes.get(scope)
         if isinstance(node_intrinsic_function, NodeIntrinsicFunction):
             return node_intrinsic_function
+        arguments_scope = scope.open_scope("args")
         arguments = self._visit_value(
-            scope=scope, before_value=before_arguments, after_value=after_arguments
+            scope=arguments_scope, before_value=before_arguments, after_value=after_arguments
         )
         if is_created(before=before_arguments, after=after_arguments):
             change_type = ChangeType.CREATED
@@ -777,7 +793,7 @@ class ChangeSetModel:
                     self._safe_access_in(scope, dominant_type_name, before_value, after_value)
                 )
                 value = self._visit_intrinsic_function(
-                    scope=scope,
+                    scope=intrinsic_function_scope,
                     intrinsic_function=dominant_type_name,
                     before_arguments=before_arguments,
                     after_arguments=after_arguments,
@@ -937,7 +953,7 @@ class ChangeSetModel:
                 scope, mapping_name, before_mappings, after_mappings
             )
             mapping = self._visit_mapping(
-                scope=scope,
+                scope=scope_mapping,
                 name=mapping_name,
                 before_mapping=before_mapping,
                 after_mapping=after_mapping,

localstack/services/cloudformation/engine/v2/change_set_model_describer.py

@@ -8,6 +8,7 @@ from localstack.services.cloudformation.engine.v2.change_set_model import (
     NodeIntrinsicFunction,
     NodeProperty,
     NodeResource,
+    NodeResources,
     PropertiesKey,
     is_nothing,
 )
@@ -40,6 +41,20 @@ class ChangeSetModelDescriber(ChangeSetModelPreproc):
         self.process()
         return self._changes
 
+    def _setup_runtime_cache(self) -> None:
+        # The describer can output {{changeSet:KNOWN_AFTER_APPLY}} values as not every field
+        # is computable at describe time. Until a filtering logic or executor override logic
+        # is available, the describer cannot benefit of previous evaluations to compute
+        # change set resource changes.
+        pass
+
+    def _save_runtime_cache(self) -> None:
+        # The describer can output {{changeSet:KNOWN_AFTER_APPLY}} values as not every field
+        # is computable at describe time. Until a filtering logic or executor override logic
+        # is available, there are no benefits in having the describer saving its runtime cache
+        # for future changes chains.
+        pass
+
     def _resolve_attribute(self, arguments: str | list[str], select_before: bool) -> str:
         if select_before:
             return super()._resolve_attribute(arguments=arguments, select_before=select_before)
@@ -57,7 +72,8 @@ class ChangeSetModelDescriber(ChangeSetModelPreproc):
         attribute_name = arguments_list[1]
 
         node_resource = self._get_node_resource_for(
-            resource_name=logical_name_of_resource, node_template=self._node_template
+            resource_name=logical_name_of_resource,
+            node_template=self._change_set.update_model.node_template,
         )
         node_property: Optional[NodeProperty] = self._get_node_property_for(
             property_name=attribute_name, node_resource=node_resource
@@ -182,6 +198,13 @@ class ChangeSetModelDescriber(ChangeSetModelPreproc):
                 after_properties=after.properties,
             )
 
+    def visit_node_resources(self, node_resources: NodeResources) -> None:
+        for node_resource in node_resources.resources:
+            delta_resource = self.visit(node_resource)
+            self._describe_resource_change(
+                name=node_resource.name, before=delta_resource.before, after=delta_resource.after
+            )
+
     def visit_node_resource(
         self, node_resource: NodeResource
     ) -> PreprocEntityDelta[PreprocResource, PreprocResource]:
@@ -189,7 +212,4 @@ class ChangeSetModelDescriber(ChangeSetModelPreproc):
         after_resource = delta.after
         if not is_nothing(after_resource) and after_resource.physical_resource_id is None:
             after_resource.physical_resource_id = CHANGESET_KNOWN_AFTER_APPLY
-        self._describe_resource_change(
-            name=node_resource.name, before=delta.before, after=delta.after
-        )
         return delta

localstack/services/cloudformation/engine/v2/change_set_model_executor.py

@@ -159,7 +159,8 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
             depends_on_resource_logical_ids.update(array_identifiers_delta.after)
         for depends_on_resource_logical_id in depends_on_resource_logical_ids:
             node_resource = self._get_node_resource_for(
-                resource_name=depends_on_resource_logical_id, node_template=self._node_template
+                resource_name=depends_on_resource_logical_id,
+                node_template=self._change_set.update_model.node_template,
             )
             self.visit(node_resource)