localstack-core 4.3.1.dev35__tar.gz → 4.3.1.dev36__tar.gz

{localstack_core-4.3.1.dev35 → localstack_core-4.3.1.dev36}/.github/workflows/marker-report.yml

@@ -60,7 +60,7 @@ jobs:
       - name: Collect marker report
         if: ${{ !inputs.createIssue }}
         env:
-          PYTEST_ADDOPTS: "-p no:localstack.testing.pytest.fixtures -p no:localstack_snapshot.pytest.snapshot -p no:localstack.testing.pytest.filters -p no:localstack.testing.pytest.fixture_conflicts -p no:tests.fixtures -p no:localstack.testing.pytest.stepfunctions.fixtures -s --co --disable-warnings --marker-report --marker-report-tinybird-upload"
+          PYTEST_ADDOPTS: "-p no:localstack.testing.pytest.fixtures -p no:localstack_snapshot.pytest.snapshot -p no:localstack.testing.pytest.filters -p no:localstack.testing.pytest.fixture_conflicts -p no:tests.fixtures -p no:localstack.testing.pytest.stepfunctions.fixtures -p no:localstack.testing.pytest.cloudformation.fixtures -s --co --disable-warnings --marker-report --marker-report-tinybird-upload"
           MARKER_REPORT_PROJECT_NAME: localstack
           MARKER_REPORT_TINYBIRD_TOKEN: ${{ secrets.MARKER_REPORT_TINYBIRD_TOKEN }}
           MARKER_REPORT_COMMIT_SHA: ${{ github.sha }}
@@ -71,7 +71,7 @@ jobs:
         # makes use of the marker report plugin localstack.testing.pytest.marker_report
       - name: Generate marker report
         env:
-          PYTEST_ADDOPTS: "-p no:localstack.testing.pytest.fixtures -p no:localstack_snapshot.pytest.snapshot -p no:localstack.testing.pytest.filters -p no:localstack.testing.pytest.fixture_conflicts -p no:tests.fixtures -p no:localstack.testing.pytest.stepfunctions.fixtures -s --co --disable-warnings --marker-report --marker-report-path './target'"
+          PYTEST_ADDOPTS: "-p no:localstack.testing.pytest.fixtures -p no:localstack_snapshot.pytest.snapshot -p no:localstack.testing.pytest.filters -p no:localstack.testing.pytest.fixture_conflicts -p no:tests.fixtures -p no:localstack.testing.pytest.stepfunctions.fixtures -p no:localstack.testing.pytest.cloudformation.fixtures -p no: -s --co --disable-warnings --marker-report --marker-report-path './target'"
           MARKER_REPORT_PROJECT_NAME: localstack
           MARKER_REPORT_COMMIT_SHA: ${{ github.sha }}
         run: |

{localstack_core-4.3.1.dev35 → localstack_core-4.3.1.dev36}/.github/workflows/tests-cli.yml

@@ -98,7 +98,7 @@ jobs:
           pip install pytest pytest-tinybird
       - name: Run CLI tests
         env:
-          PYTEST_ADDOPTS: "${{ env.TINYBIRD_PYTEST_ARGS }}-p no:localstack.testing.pytest.fixtures -p no:localstack_snapshot.pytest.snapshot -p no:localstack.testing.pytest.filters -p no:localstack.testing.pytest.fixture_conflicts -p no:localstack.testing.pytest.validation_tracking -p no:localstack.testing.pytest.path_filter -p no:tests.fixtures -p no:localstack.testing.pytest.stepfunctions.fixtures -s"
+          PYTEST_ADDOPTS: "${{ env.TINYBIRD_PYTEST_ARGS }}-p no:localstack.testing.pytest.fixtures -p no:localstack_snapshot.pytest.snapshot -p no:localstack.testing.pytest.filters -p no:localstack.testing.pytest.fixture_conflicts -p no:localstack.testing.pytest.validation_tracking -p no:localstack.testing.pytest.path_filter -p no:tests.fixtures -p no:localstack.testing.pytest.stepfunctions.fixtures -p no:localstack.testing.pytest.cloudformation.fixtures -s"
           TEST_PATH: "tests/cli/"
         run: make test
 

{localstack_core-4.3.1.dev35/localstack-core/localstack_core.egg-info → localstack_core-4.3.1.dev36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.3.1.dev35
+Version: 4.3.1.dev36
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0

{localstack_core-4.3.1.dev35 → localstack_core-4.3.1.dev36}/localstack-core/localstack/services/cloudformation/engine/entities.py

@@ -422,12 +422,17 @@ class StackChangeSet(Stack):
         return result
 
     # V2 only
-    def populate_update_graph(self, before_template: dict | None, after_template: dict | None):
+    def populate_update_graph(
+        self,
+        before_template: Optional[dict],
+        after_template: Optional[dict],
+        before_parameters: Optional[dict],
+        after_parameters: Optional[dict],
+    ) -> None:
         change_set_model = ChangeSetModel(
             before_template=before_template,
             after_template=after_template,
-            # TODO
-            before_parameters=None,
-            after_parameters=None,
+            before_parameters=before_parameters,
+            after_parameters=after_parameters,
         )
         self.update_graph = change_set_model.get_update_model()

{localstack_core-4.3.1.dev35 → localstack_core-4.3.1.dev36}/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model.py

@@ -7,7 +7,6 @@ from typing import Any, Final, Generator, Optional, Union, cast
 
 from typing_extensions import TypeVar
 
-from localstack.aws.api.cloudformation import ChangeAction
 from localstack.utils.strings import camel_to_snake_case
 
 T = TypeVar("T")
@@ -67,15 +66,6 @@ class ChangeType(enum.Enum):
     def __str__(self):
         return self.value
 
-    def to_action(self) -> ChangeAction | None:
-        match self:
-            case self.CREATED:
-                return ChangeAction.Add
-            case self.MODIFIED:
-                return ChangeAction.Modify
-            case self.REMOVED:
-                return ChangeAction.Remove
-
     def for_child(self, child_change_type: ChangeType) -> ChangeType:
         if child_change_type == self:
             return self
@@ -525,7 +515,7 @@ class ChangeSetModel:
 
         node_parameter = self._retrieve_parameter_if_exists(parameter_name=logical_id)
         if isinstance(node_parameter, NodeParameter):
-            return node_parameter.dynamic_value.change_type
+            return node_parameter.change_type
 
         # TODO: this should check the replacement flag for a resource update.
         node_resource = self._retrieve_or_visit_resource(resource_name=logical_id)
@@ -584,19 +574,16 @@ class ChangeSetModel:
     def _visit_array(
         self, scope: Scope, before_array: Maybe[list], after_array: Maybe[list]
     ) -> NodeArray:
-        change_type = ChangeType.UNCHANGED
         array: list[ChangeSetEntity] = list()
         for index, (before_value, after_value) in enumerate(
             zip_longest(before_array, after_array, fillvalue=Nothing)
         ):
-            # TODO: should extract this scoping logic.
             value_scope = scope.open_index(index=index)
             value = self._visit_value(
                 scope=value_scope, before_value=before_value, after_value=after_value
             )
             array.append(value)
-            if value.change_type != ChangeType.UNCHANGED:
-                change_type = ChangeType.MODIFIED
+        change_type = self._change_type_for_parent_of([value.change_type for value in array])
         return NodeArray(scope=scope, change_type=change_type, array=array)
 
     def _visit_object(
@@ -695,28 +682,12 @@ class ChangeSetModel:
         node_property = self._visited_scopes.get(scope)
         if isinstance(node_property, NodeProperty):
             return node_property
-
         value = self._visit_value(
             scope=scope, before_value=before_property, after_value=after_property
         )
-        if self._is_created(before=before_property, after=after_property):
-            node_property = NodeProperty(
-                scope=scope,
-                change_type=ChangeType.CREATED,
-                name=property_name,
-                value=value,
-            )
-        elif self._is_removed(before=before_property, after=after_property):
-            node_property = NodeProperty(
-                scope=scope,
-                change_type=ChangeType.REMOVED,
-                name=property_name,
-                value=value,
-            )
-        else:
-            node_property = NodeProperty(
-                scope=scope, change_type=value.change_type, name=property_name, value=value
-            )
+        node_property = NodeProperty(
+            scope=scope, change_type=value.change_type, name=property_name, value=value
+        )
         self._visited_scopes[scope] = node_property
         return node_property
 
@@ -748,6 +719,13 @@ class ChangeSetModel:
         self._visited_scopes[scope] = node_properties
         return node_properties
 
+    def _visit_type(self, scope: Scope, before_type: Any, after_type: Any) -> TerminalValue:
+        value = self._visit_value(scope=scope, before_value=before_type, after_value=after_type)
+        if not isinstance(value, TerminalValue):
+            # TODO: decide where template schema validation should occur.
+            raise RuntimeError()
+        return value
+
     def _visit_resource(
         self,
         scope: Scope,
@@ -766,8 +744,12 @@ class ChangeSetModel:
         else:
             change_type = ChangeType.UNCHANGED
 
-        # TODO: investigate behaviour with type changes, for now this is filler code.
-        _, type_str = self._safe_access_in(scope, TypeKey, after_resource)
+        scope_type, (before_type, after_type) = self._safe_access_in(
+            scope, TypeKey, before_resource, after_resource
+        )
+        terminal_value_type = self._visit_type(
+            scope=scope_type, before_type=before_type, after_type=after_type
+        )
 
         condition_reference = None
         scope_condition, (before_condition, after_condition) = self._safe_access_in(
@@ -792,7 +774,7 @@ class ChangeSetModel:
             scope=scope,
             change_type=change_type,
             name=resource_name,
-            type_=TerminalValueUnchanged(scope=scope, value=type_str),
+            type_=terminal_value_type,
             condition_reference=condition_reference,
             properties=properties,
         )
@@ -872,36 +854,19 @@ class ChangeSetModel:
             return node_parameter
         # TODO: add logic to compute defaults already in the graph building process?
         dynamic_value = self._visit_dynamic_parameter(parameter_name=parameter_name)
-        if self._is_created(before=before_parameter, after=after_parameter):
-            node_parameter = NodeParameter(
-                scope=scope,
-                change_type=ChangeType.CREATED,
-                name=parameter_name,
-                value=TerminalValueCreated(scope=scope, value=after_parameter),
-                dynamic_value=dynamic_value,
-            )
-        elif self._is_removed(before=before_parameter, after=after_parameter):
-            node_parameter = NodeParameter(
-                scope=scope,
-                change_type=ChangeType.REMOVED,
-                name=parameter_name,
-                value=TerminalValueRemoved(scope=scope, value=before_parameter),
-                dynamic_value=dynamic_value,
-            )
-        else:
-            value = self._visit_value(
-                scope=scope, before_value=before_parameter, after_value=after_parameter
-            )
-            change_type = self._change_type_for_parent_of(
-                change_types=[dynamic_value.change_type, value.change_type]
-            )
-            node_parameter = NodeParameter(
-                scope=scope,
-                change_type=change_type,
-                name=parameter_name,
-                value=value,
-                dynamic_value=dynamic_value,
-            )
+        value = self._visit_value(
+            scope=scope, before_value=before_parameter, after_value=after_parameter
+        )
+        change_type = self._change_type_for_parent_of(
+            change_types=[dynamic_value.change_type, value.change_type]
+        )
+        node_parameter = NodeParameter(
+            scope=scope,
+            change_type=change_type,
+            name=parameter_name,
+            value=value,
+            dynamic_value=dynamic_value,
+        )
         self._visited_scopes[scope] = node_parameter
         return node_parameter
 

localstack_core-4.3.1.dev36/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_describer.py

@@ -0,0 +1,165 @@
+from __future__ import annotations
+
+import json
+from typing import Final, Optional
+
+import localstack.aws.api.cloudformation as cfn_api
+from localstack.services.cloudformation.engine.v2.change_set_model import (
+    NodeIntrinsicFunction,
+    NodeResource,
+    NodeTemplate,
+    PropertiesKey,
+)
+from localstack.services.cloudformation.engine.v2.change_set_model_preproc import (
+    ChangeSetModelPreproc,
+    PreprocEntityDelta,
+    PreprocProperties,
+    PreprocResource,
+)
+
+CHANGESET_KNOWN_AFTER_APPLY: Final[str] = "{{changeSet:KNOWN_AFTER_APPLY}}"
+
+
+class ChangeSetModelDescriber(ChangeSetModelPreproc):
+    _include_property_values: Final[bool]
+    _changes: Final[cfn_api.Changes]
+
+    def __init__(self, node_template: NodeTemplate, include_property_values: bool):
+        super().__init__(node_template=node_template)
+        self._include_property_values = include_property_values
+        self._changes = list()
+
+    def get_changes(self) -> cfn_api.Changes:
+        self._changes.clear()
+        self.process()
+        return self._changes
+
+    def visit_node_intrinsic_function_fn_get_att(
+        self, node_intrinsic_function: NodeIntrinsicFunction
+    ) -> PreprocEntityDelta:
+        # TODO: If we can properly compute the before and after value, why should we
+        #  artificially limit the precision of our output to match AWS's?
+
+        arguments_delta = self.visit(node_intrinsic_function.arguments)
+        before_argument_list = arguments_delta.before
+        after_argument_list = arguments_delta.after
+
+        before = None
+        if before_argument_list:
+            before_logical_name_of_resource = before_argument_list[0]
+            before_attribute_name = before_argument_list[1]
+            before_node_resource = self._get_node_resource_for(
+                resource_name=before_logical_name_of_resource, node_template=self._node_template
+            )
+            before_node_property = self._get_node_property_for(
+                property_name=before_attribute_name, node_resource=before_node_resource
+            )
+            before_property_delta = self.visit(before_node_property)
+            before = before_property_delta.before
+
+        after = None
+        if after_argument_list:
+            after_logical_name_of_resource = after_argument_list[0]
+            after_attribute_name = after_argument_list[1]
+            after_node_resource = self._get_node_resource_for(
+                resource_name=after_logical_name_of_resource, node_template=self._node_template
+            )
+            after_node_property = self._get_node_property_for(
+                property_name=after_attribute_name, node_resource=after_node_resource
+            )
+            after_property_delta = self.visit(after_node_property)
+            if after_property_delta.before == after_property_delta.after:
+                after = after_property_delta.after
+            else:
+                after = CHANGESET_KNOWN_AFTER_APPLY
+
+        return PreprocEntityDelta(before=before, after=after)
+
+    def _register_resource_change(
+        self,
+        logical_id: str,
+        type_: str,
+        before_properties: Optional[PreprocProperties],
+        after_properties: Optional[PreprocProperties],
+    ) -> None:
+        # unchanged: nothing to do.
+        if before_properties == after_properties:
+            return
+
+        action = cfn_api.ChangeAction.Modify
+        if before_properties is None:
+            action = cfn_api.ChangeAction.Add
+        elif after_properties is None:
+            action = cfn_api.ChangeAction.Remove
+
+        resource_change = cfn_api.ResourceChange()
+        resource_change["Action"] = action
+        resource_change["LogicalResourceId"] = logical_id
+        resource_change["ResourceType"] = type_
+        if self._include_property_values and before_properties is not None:
+            before_context_properties = {PropertiesKey: before_properties.properties}
+            before_context_properties_json_str = json.dumps(before_context_properties)
+            resource_change["BeforeContext"] = before_context_properties_json_str
+        if self._include_property_values and after_properties is not None:
+            after_context_properties = {PropertiesKey: after_properties.properties}
+            after_context_properties_json_str = json.dumps(after_context_properties)
+            resource_change["AfterContext"] = after_context_properties_json_str
+        self._changes.append(
+            cfn_api.Change(Type=cfn_api.ChangeType.Resource, ResourceChange=resource_change)
+        )
+
+    def _describe_resource_change(
+        self, name: str, before: Optional[PreprocResource], after: Optional[PreprocResource]
+    ) -> None:
+        if before is not None and after is not None:
+            # Case: change on same type.
+            if before.resource_type == after.resource_type:
+                # Register a Modified if changed.
+                self._register_resource_change(
+                    logical_id=name,
+                    type_=before.resource_type,
+                    before_properties=before.properties,
+                    after_properties=after.properties,
+                )
+            # Case: type migration.
+            # TODO: Add test to assert that on type change the resources are replaced.
+            else:
+                # Register a Removed for the previous type.
+                self._register_resource_change(
+                    logical_id=name,
+                    type_=before.resource_type,
+                    before_properties=before.properties,
+                    after_properties=None,
+                )
+                # Register a Create for the next type.
+                self._register_resource_change(
+                    logical_id=name,
+                    type_=after.resource_type,
+                    before_properties=None,
+                    after_properties=after.properties,
+                )
+        elif before is not None:
+            # Case: removal
+            self._register_resource_change(
+                logical_id=name,
+                type_=before.resource_type,
+                before_properties=before.properties,
+                after_properties=None,
+            )
+        elif after is not None:
+            # Case: addition
+            self._register_resource_change(
+                logical_id=name,
+                type_=after.resource_type,
+                before_properties=None,
+                after_properties=after.properties,
+            )
+
+    def visit_node_resource(
+        self, node_resource: NodeResource
+    ) -> PreprocEntityDelta[PreprocResource, PreprocResource]:
+        delta = super().visit_node_resource(node_resource=node_resource)
+        self._describe_resource_change(
+            name=node_resource.name, before=delta.before, after=delta.after
+        )
+        return delta

localstack_core-4.3.1.dev36/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_executor.py

@@ -0,0 +1,207 @@
+import logging
+import uuid
+from typing import Any, Final, Optional
+
+from localstack.aws.api.cloudformation import ChangeAction
+from localstack.constants import INTERNAL_AWS_SECRET_ACCESS_KEY
+from localstack.services.cloudformation.engine.v2.change_set_model import (
+    NodeResource,
+    NodeTemplate,
+)
+from localstack.services.cloudformation.engine.v2.change_set_model_preproc import (
+    ChangeSetModelPreproc,
+    PreprocEntityDelta,
+    PreprocProperties,
+    PreprocResource,
+)
+from localstack.services.cloudformation.resource_provider import (
+    Credentials,
+    OperationStatus,
+    ProgressEvent,
+    ResourceProviderExecutor,
+    ResourceProviderPayload,
+    get_resource_type,
+)
+
+LOG = logging.getLogger(__name__)
+
+
+class ChangeSetModelExecutor(ChangeSetModelPreproc):
+    account_id: Final[str]
+    region: Final[str]
+
+    def __init__(
+        self,
+        node_template: NodeTemplate,
+        account_id: str,
+        region: str,
+        stack_name: str,
+        stack_id: str,
+    ):
+        super().__init__(node_template)
+        self.account_id = account_id
+        self.region = region
+        self.stack_name = stack_name
+        self.stack_id = stack_id
+        self.resources = {}
+
+    def execute(self) -> dict:
+        self.process()
+        return self.resources
+
+    def visit_node_resource(
+        self, node_resource: NodeResource
+    ) -> PreprocEntityDelta[PreprocResource, PreprocResource]:
+        delta = super().visit_node_resource(node_resource=node_resource)
+        self._execute_on_resource_change(
+            name=node_resource.name, before=delta.before, after=delta.after
+        )
+        return delta
+
+    def _reduce_intrinsic_function_ref_value(self, preproc_value: Any) -> Any:
+        # TODO: this should be implemented to compute the runtime reference value for node entities.
+        return super()._reduce_intrinsic_function_ref_value(preproc_value=preproc_value)
+
+    def _execute_on_resource_change(
+        self, name: str, before: Optional[PreprocResource], after: Optional[PreprocResource]
+    ) -> None:
+        # TODO: this logic is a POC and should be revised.
+        if before is not None and after is not None:
+            # Case: change on same type.
+            if before.resource_type == after.resource_type:
+                # Register a Modified if changed.
+                self._execute_resource_action(
+                    action=ChangeAction.Modify,
+                    logical_resource_id=name,
+                    resource_type=before.resource_type,
+                    before_properties=before.properties,
+                    after_properties=after.properties,
+                )
+            # Case: type migration.
+            # TODO: Add test to assert that on type change the resources are replaced.
+            else:
+                # Register a Removed for the previous type.
+                self._execute_resource_action(
+                    action=ChangeAction.Remove,
+                    logical_resource_id=name,
+                    resource_type=before.resource_type,
+                    before_properties=before.properties,
+                    after_properties=None,
+                )
+                # Register a Create for the next type.
+                self._execute_resource_action(
+                    action=ChangeAction.Add,
+                    logical_resource_id=name,
+                    resource_type=after.resource_type,
+                    before_properties=None,
+                    after_properties=after.properties,
+                )
+        elif before is not None:
+            # Case: removal
+            self._execute_resource_action(
+                action=ChangeAction.Remove,
+                logical_resource_id=name,
+                resource_type=before.resource_type,
+                before_properties=before.properties,
+                after_properties=None,
+            )
+        elif after is not None:
+            # Case: addition
+            self._execute_resource_action(
+                action=ChangeAction.Add,
+                logical_resource_id=name,
+                resource_type=after.resource_type,
+                before_properties=None,
+                after_properties=after.properties,
+            )
+
+    def _execute_resource_action(
+        self,
+        action: ChangeAction,
+        logical_resource_id: str,
+        resource_type: str,
+        before_properties: Optional[PreprocProperties],
+        after_properties: Optional[PreprocProperties],
+    ) -> None:
+        resource_provider_executor = ResourceProviderExecutor(
+            stack_name=self.stack_name, stack_id=self.stack_id
+        )
+        # TODO
+        resource_type = get_resource_type({"Type": resource_type})
+        payload = self.create_resource_provider_payload(
+            action=action,
+            logical_resource_id=logical_resource_id,
+            resource_type=resource_type,
+            before_properties=before_properties,
+            after_properties=after_properties,
+        )
+        resource_provider = resource_provider_executor.try_load_resource_provider(resource_type)
+
+        extra_resource_properties = {}
+        if resource_provider is not None:
+            # TODO: stack events
+            event = resource_provider_executor.deploy_loop(
+                resource_provider, extra_resource_properties, payload
+            )
+        else:
+            event = ProgressEvent(OperationStatus.SUCCESS, resource_model={})
+
+        self.resources.setdefault(logical_resource_id, {"Properties": {}})
+        match event.status:
+            case OperationStatus.SUCCESS:
+                # merge the resources state with the external state
+                # TODO: this is likely a duplicate of updating from extra_resource_properties
+                self.resources[logical_resource_id]["Properties"].update(event.resource_model)
+                self.resources[logical_resource_id].update(extra_resource_properties)
+                # XXX for legacy delete_stack compatibility
+                self.resources[logical_resource_id]["LogicalResourceId"] = logical_resource_id
+                self.resources[logical_resource_id]["Type"] = resource_type
+            case any:
+                raise NotImplementedError(f"Event status '{any}' not handled")
+
+    def create_resource_provider_payload(
+        self,
+        action: ChangeAction,
+        logical_resource_id: str,
+        resource_type: str,
+        before_properties: Optional[PreprocProperties],
+        after_properties: Optional[PreprocProperties],
+    ) -> Optional[ResourceProviderPayload]:
+        # FIXME: use proper credentials
+        creds: Credentials = {
+            "accessKeyId": self.account_id,
+            "secretAccessKey": INTERNAL_AWS_SECRET_ACCESS_KEY,
+            "sessionToken": "",
+        }
+        before_properties_value = before_properties.properties if before_properties else None
+        if action == ChangeAction.Remove:
+            resource_properties = before_properties_value
+            previous_resource_properties = None
+        else:
+            after_properties_value = after_properties.properties if after_properties else None
+            resource_properties = after_properties_value
+            previous_resource_properties = before_properties_value
+        resource_provider_payload: ResourceProviderPayload = {
+            "awsAccountId": self.account_id,
+            "callbackContext": {},
+            "stackId": self.stack_name,
+            "resourceType": resource_type,
+            "resourceTypeVersion": "000000",
+            # TODO: not actually a UUID
+            "bearerToken": str(uuid.uuid4()),
+            "region": self.region,
+            "action": str(action),
+            "requestData": {
+                "logicalResourceId": logical_resource_id,
+                # TODO: assign before and previous according on the action type.
+                "resourceProperties": resource_properties,
+                "previousResourceProperties": previous_resource_properties,
+                "callerCredentials": creds,
+                "providerCredentials": creds,
+                "systemTags": {},
+                "previousSystemTags": {},
+                "stackTags": {},
+                "previousStackTags": {},
+            },
+        }
+        return resource_provider_payload