localstack-core 4.7.1.dev79__tar.gz → 4.7.1.dev81__tar.gz

{localstack_core-4.7.1.dev79/localstack-core/localstack_core.egg-info → localstack_core-4.7.1.dev81}/PKG-INFO

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

{localstack_core-4.7.1.dev79 → localstack_core-4.7.1.dev81}/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model.py

@@ -372,17 +372,20 @@ class NodeTransform(ChangeSetNode):
 class NodeResources(ChangeSetNode):
     resources: Final[list[NodeResource]]
     fn_transform: Final[Maybe[NodeIntrinsicFunctionFnTransform]]
+    fn_foreaches: Final[list[NodeForEach]]
 
     def __init__(
         self,
         scope: Scope,
         resources: list[NodeResource],
         fn_transform: Maybe[NodeIntrinsicFunctionFnTransform],
+        fn_foreaches: list[NodeForEach],
     ):
-        change_type = parent_change_type_of(resources)
+        change_type = parent_change_type_of(resources + [fn_transform] + fn_foreaches)
         super().__init__(scope=scope, change_type=change_type)
         self.resources = resources
         self.fn_transform = fn_transform
+        self.fn_foreaches = fn_foreaches
 
 
 class NodeResource(ChangeSetNode):
@@ -492,6 +495,20 @@ class NodeIntrinsicFunctionFnTransform(NodeIntrinsicFunction):
         self.after_siblings = after_siblings
 
 
+class NodeForEach(ChangeSetNode):
+    def __init__(
+        self,
+        scope: Scope,
+        change_type: Final[ChangeType],
+        arguments: Final[ChangeSetEntity],
+    ):
+        super().__init__(
+            scope=scope,
+            change_type=change_type,
+        )
+        self.arguments = arguments
+
+
 class NodeObject(ChangeSetNode):
     bindings: Final[dict[str, ChangeSetEntity]]
 
@@ -709,6 +726,18 @@ class ChangeSetModel:
         self._visited_scopes[scope] = node_intrinsic_function
         return node_intrinsic_function
 
+    def _visit_foreach(
+        self, scope: Scope, before_arguments: Maybe[list], after_arguments: Maybe[list]
+    ) -> NodeForEach:
+        node_foreach = self._visited_scopes.get(scope)
+        if isinstance(node_foreach, NodeForEach):
+            return node_foreach
+        arguments_scope = scope.open_scope("args")
+        arguments = self._visit_array(
+            arguments_scope, before_array=before_arguments, after_array=after_arguments
+        )
+        return NodeForEach(scope=scope, change_type=arguments.change_type, arguments=arguments)
+
     def _resolve_intrinsic_function_fn_sub(self, arguments: ChangeSetEntity) -> ChangeType:
         # TODO: This routine should instead export the implicit Ref and GetAtt calls within the first
         #       string template parameter and compute the respective change set types. Currently,
@@ -1165,6 +1194,7 @@ class ChangeSetModel:
         resources: list[NodeResource] = []
         resource_names = self._safe_keys_of(before_resources, after_resources)
         fn_transform = Nothing
+        fn_foreaches = []
         for resource_name in resource_names:
             resource_scope, (before_resource, after_resource) = self._safe_access_in(
                 scope, resource_name, before_resources, after_resources
@@ -1177,6 +1207,14 @@ class ChangeSetModel:
                     after_arguments=after_resource,
                 )
                 continue
+            elif resource_name.startswith("Fn::ForEach"):
+                fn_for_each = self._visit_foreach(
+                    scope=resource_scope,
+                    before_arguments=before_resource,
+                    after_arguments=after_resource,
+                )
+                fn_foreaches.append(fn_for_each)
+                continue
             resource = self._visit_resource(
                 scope=resource_scope,
                 resource_name=resource_name,
@@ -1184,7 +1222,12 @@ class ChangeSetModel:
                 after_resource=after_resource,
             )
             resources.append(resource)
-        return NodeResources(scope=scope, resources=resources, fn_transform=fn_transform)
+        return NodeResources(
+            scope=scope,
+            resources=resources,
+            fn_transform=fn_transform,
+            fn_foreaches=fn_foreaches,
+        )
 
     def _visit_mapping(
         self, scope: Scope, name: str, before_mapping: Maybe[dict], after_mapping: Maybe[dict]

{localstack_core-4.7.1.dev79 → localstack_core-4.7.1.dev81}/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_executor.py

@@ -53,6 +53,7 @@ EventOperationFromAction = {"Add": "CREATE", "Modify": "UPDATE", "Remove": "DELE
 class ChangeSetModelExecutorResult:
     resources: dict[str, ResolvedResource]
     outputs: list[Output]
+    failure_message: str | None = None
 
 
 class DeferredAction(Protocol):
@@ -65,6 +66,16 @@ class Deferred:
     action: DeferredAction
 
 
+class TriggerRollback(Exception):
+    """
+    Sentinel exception to signal that the deployment should be stopped for a reason
+    """
+
+    def __init__(self, logical_resource_id: str, reason: str | None):
+        self.logical_resource_id = logical_resource_id
+        self.reason = reason
+
+
 class ChangeSetModelExecutor(ChangeSetModelPreproc):
     # TODO: add typing for resolved resources and parameters.
     resources: Final[dict[str, ResolvedResource]]
@@ -83,10 +94,23 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
 
     def execute(self) -> ChangeSetModelExecutorResult:
         # constructive process
-        self.process()
+        failure_message = None
+        try:
+            self.process()
+        except TriggerRollback as e:
+            failure_message = e.reason
+        except Exception as e:
+            failure_message = str(e)
 
         if self._deferred_actions:
-            self._change_set.stack.set_stack_status(StackStatus.UPDATE_COMPLETE_CLEANUP_IN_PROGRESS)
+            if failure_message:
+                # TODO: differentiate between update and create
+                self._change_set.stack.set_stack_status(StackStatus.ROLLBACK_IN_PROGRESS)
+            else:
+                # TODO: correct status
+                self._change_set.stack.set_stack_status(
+                    StackStatus.UPDATE_COMPLETE_CLEANUP_IN_PROGRESS
+                )
 
             # perform all deferred actions such as deletions. These must happen in reverse from their
             # defined order so that resource dependencies are honoured
@@ -95,9 +119,12 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                 LOG.debug("executing deferred action: '%s'", deferred.name)
                 deferred.action()
 
+        if failure_message:
+            # TODO: differentiate between update and create
+            self._change_set.stack.set_stack_status(StackStatus.ROLLBACK_COMPLETE)
+
         return ChangeSetModelExecutorResult(
-            resources=self.resources,
-            outputs=self.outputs,
+            resources=self.resources, outputs=self.outputs, failure_message=failure_message
         )
 
     def _defer_action(self, name: str, action: DeferredAction):
@@ -137,9 +164,10 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
         else:
             status = f"{status_from_action}_{event_status.name}"
 
+        physical_resource_id = self._get_physical_id(logical_resource_id, False)
         self._change_set.stack.set_resource_status(
             logical_resource_id=logical_resource_id,
-            physical_resource_id=self._get_physical_id(logical_resource_id, False) or "",
+            physical_resource_id=physical_resource_id,
             resource_type=resource_type,
             status=ResourceStatus(status),
             resource_status_reason=reason,
@@ -219,10 +247,24 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
         # Update the latest version of this resource for downstream references.
         if not is_nothing(after):
             after_logical_id = after.logical_id
-            after_physical_id: str = self._after_resource_physical_id(
-                resource_logical_id=after_logical_id
-            )
-            after.physical_resource_id = after_physical_id
+            resource = self.resources[after_logical_id]
+            resource_failed_to_deploy = resource["ResourceStatus"] in {
+                ResourceStatus.CREATE_FAILED,
+                ResourceStatus.UPDATE_FAILED,
+            }
+            if not resource_failed_to_deploy:
+                after_physical_id: str = self._after_resource_physical_id(
+                    resource_logical_id=after_logical_id
+                )
+                after.physical_resource_id = after_physical_id
+            after.status = resource["ResourceStatus"]
+
+            # terminate the deployment process
+            if resource_failed_to_deploy:
+                raise TriggerRollback(
+                    logical_resource_id=after_logical_id,
+                    reason=resource.get("ResourceStatusReason"),
+                )
         return delta
 
     def visit_node_output(
@@ -291,6 +333,7 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                             resource_type=before.resource_type,
                             before_properties=before_properties,
                             after_properties=None,
+                            part_of_replacement=True,
                         )
                         self._process_event(
                             action=ChangeAction.Remove,
@@ -425,6 +468,7 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
         resource_type: str,
         before_properties: PreprocProperties | None,
         after_properties: PreprocProperties | None,
+        part_of_replacement: bool = False,
     ) -> ProgressEvent:
         LOG.debug("Executing resource action: %s for resource '%s'", action, logical_resource_id)
         payload = self.create_resource_provider_payload(
@@ -481,6 +525,19 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                 message=f"Resource type {resource_type} not supported",
             )
 
+        if part_of_replacement and action == ChangeAction.Remove:
+            # Early return as we don't want to update internal state of the executor if this is a
+            # cleanup of an old resource. The new resource has already been created and the state
+            # updated
+            return event
+
+        status_from_action = EventOperationFromAction[action.value]
+        resolved_resource = ResolvedResource(
+            Properties=event.resource_model,
+            LogicalResourceId=logical_resource_id,
+            Type=resource_type,
+            LastUpdatedTimestamp=datetime.now(UTC),
+        )
         match event.status:
             case OperationStatus.SUCCESS:
                 # merge the resources state with the external state
@@ -495,33 +552,30 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
 
                 # Don't update the resolved resources if we have deleted that resource
                 if action != ChangeAction.Remove:
-                    status_from_action = EventOperationFromAction[action.value]
                     physical_resource_id = (
                         extra_resource_properties["PhysicalResourceId"]
                         if resource_provider
                         else MOCKED_REFERENCE
                     )
-                    resolved_resource = ResolvedResource(
-                        Properties=event.resource_model,
-                        LogicalResourceId=logical_resource_id,
-                        Type=resource_type,
-                        LastUpdatedTimestamp=datetime.now(UTC),
-                        ResourceStatus=ResourceStatus(f"{status_from_action}_COMPLETE"),
-                        PhysicalResourceId=physical_resource_id,
+                    resolved_resource["PhysicalResourceId"] = physical_resource_id
+                    resolved_resource["ResourceStatus"] = ResourceStatus(
+                        f"{status_from_action}_COMPLETE"
                     )
                     # TODO: do we actually need this line?
                     resolved_resource.update(extra_resource_properties)
 
-                    self.resources[logical_resource_id] = resolved_resource
-
             case OperationStatus.FAILED:
                 reason = event.message
                 LOG.warning(
                     "Resource provider operation failed: '%s'",
                     reason,
                 )
+                resolved_resource["ResourceStatus"] = ResourceStatus(f"{status_from_action}_FAILED")
+                resolved_resource["ResourceStatusReason"] = reason
             case other:
                 raise NotImplementedError(f"Event status '{other}' not handled")
+
+        self.resources[logical_resource_id] = resolved_resource
         return event
 
     def create_resource_provider_payload(

{localstack_core-4.7.1.dev79 → localstack_core-4.7.1.dev81}/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_preproc.py

@@ -9,6 +9,7 @@ from typing import Any, Final, Generic, TypeVar
 from botocore.exceptions import ClientError
 
 from localstack import config
+from localstack.aws.api.cloudformation import ResourceStatus
 from localstack.aws.api.ec2 import AvailabilityZoneList, DescribeAvailabilityZonesResult
 from localstack.aws.connect import connect_to
 from localstack.services.cloudformation.engine.v2.change_set_model import (
@@ -52,6 +53,7 @@ from localstack.services.cloudformation.stores import (
     exports_map,
 )
 from localstack.services.cloudformation.v2.entities import ChangeSet
+from localstack.services.cloudformation.v2.types import ResolvedResource
 from localstack.utils.aws.arns import get_partition
 from localstack.utils.objects import get_value_from_path
 from localstack.utils.run import to_str
@@ -113,6 +115,7 @@ class PreprocResource:
     properties: PreprocProperties
     depends_on: list[str] | None
     requires_replacement: bool
+    status: ResourceStatus | None
 
     def __init__(
         self,
@@ -123,6 +126,7 @@ class PreprocResource:
         properties: PreprocProperties,
         depends_on: list[str] | None,
         requires_replacement: bool,
+        status: ResourceStatus | None = None,
     ):
         self.logical_id = logical_id
         self.physical_resource_id = physical_resource_id
@@ -131,6 +135,7 @@ class PreprocResource:
         self.properties = properties
         self.depends_on = depends_on
         self.requires_replacement = requires_replacement
+        self.status = status
 
     @staticmethod
     def _compare_conditions(c1: bool, c2: bool):
@@ -486,9 +491,9 @@ class ChangeSetModelPreproc(ChangeSetModelVisitor):
             delta: PreprocEntityDelta = self.visit(change_set_entity=change_set_entity)
             delta_before = delta.before
             delta_after = delta.after
-            if not is_nothing(before) and not is_nothing(delta_before) and delta_before is not None:
+            if not is_nothing(before) and not is_nothing(delta_before):
                 before[name] = delta_before
-            if not is_nothing(after) and not is_nothing(delta_after) and delta_after is not None:
+            if not is_nothing(after) and not is_nothing(delta_after):
                 after[name] = delta_after
         return PreprocEntityDelta(before=before, after=after)
 
@@ -946,11 +951,17 @@ class ChangeSetModelPreproc(ChangeSetModelVisitor):
         return delta
 
     def _resource_physical_resource_id_from(
-        self, logical_resource_id: str, resolved_resources: dict
-    ) -> str:
+        self, logical_resource_id: str, resolved_resources: dict[str, ResolvedResource]
+    ) -> str | None:
         # TODO: typing around resolved resources is needed and should be reflected here.
         resolved_resource = resolved_resources.get(logical_resource_id, {})
-        physical_resource_id: str | None = resolved_resource.get("PhysicalResourceId")
+        if resolved_resource.get("ResourceStatus") not in {
+            ResourceStatus.CREATE_COMPLETE,
+            ResourceStatus.UPDATE_COMPLETE,
+        }:
+            return None
+
+        physical_resource_id = resolved_resource.get("PhysicalResourceId")
         if not isinstance(physical_resource_id, str):
             raise RuntimeError(f"No PhysicalResourceId found for resource '{logical_resource_id}'")
         return physical_resource_id

{localstack_core-4.7.1.dev79 → localstack_core-4.7.1.dev81}/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_transform.py

@@ -23,6 +23,7 @@ from localstack.services.cloudformation.engine.v2.change_set_model import (
     ChangeType,
     FnTransform,
     Maybe,
+    NodeForEach,
     NodeGlobalTransform,
     NodeIntrinsicFunction,
     NodeIntrinsicFunctionFnTransform,
@@ -356,6 +357,9 @@ class ChangeSetModelTransform(ChangeSetModelPreproc):
 
         return result_template
 
+    def visit_node_for_each(self, node_foreach: NodeForEach) -> PreprocEntityDelta:
+        return PreprocEntityDelta()
+
     def visit_node_intrinsic_function_fn_transform(
         self, node_intrinsic_function: NodeIntrinsicFunctionFnTransform
     ) -> PreprocEntityDelta:
@@ -411,7 +415,12 @@ class ChangeSetModelTransform(ChangeSetModelPreproc):
                 node_intrinsic_function=node_resource.fn_transform
             )
 
-        return super().visit_node_resource(node_resource)
+        try:
+            if delta := super().visit_node_resource(node_resource):
+                return delta
+            return super().visit_node_properties(node_resource.properties)
+        except RuntimeError:
+            return super().visit_node_properties(node_resource.properties)
 
     def visit_node_resources(self, node_resources: NodeResources) -> PreprocEntityDelta:
         if not is_nothing(node_resources.fn_transform):

{localstack_core-4.7.1.dev79 → localstack_core-4.7.1.dev81}/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_validator.py

@@ -4,6 +4,7 @@ from typing import Any
 from localstack.services.cloudformation.engine.v2.change_set_model import (
     Maybe,
     NodeIntrinsicFunction,
+    NodeResource,
     NodeTemplate,
     Nothing,
     is_nothing,
@@ -165,3 +166,11 @@ class ChangeSetModelValidator(ChangeSetModelPreproc):
             return super().visit_node_intrinsic_function_fn_select(node_intrinsic_function)
         except RuntimeError:
             return self.visit(node_intrinsic_function.arguments)
+
+    def visit_node_resource(self, node_resource: NodeResource) -> PreprocEntityDelta:
+        try:
+            if delta := super().visit_node_resource(node_resource):
+                return delta
+            return super().visit_node_properties(node_resource.properties)
+        except RuntimeError:
+            return super().visit_node_properties(node_resource.properties)

{localstack_core-4.7.1.dev79 → localstack_core-4.7.1.dev81}/localstack-core/localstack/services/cloudformation/v2/entities.py

@@ -9,6 +9,7 @@ from localstack.aws.api.cloudformation import (
     CreateStackInput,
     CreateStackSetInput,
     ExecutionStatus,
+    Output,
     ResourceStatus,
     StackEvent,
     StackInstanceComprehensiveStatus,
@@ -51,9 +52,9 @@ class Stack:
     template_body: str | None
 
     # state after deploy
-    resolved_parameters: dict[str, str]
+    resolved_parameters: dict[str, EngineParameter]
     resolved_resources: dict[str, ResolvedResource]
-    resolved_outputs: dict[str, str]
+    resolved_outputs: list[Output]
     resource_states: dict[str, StackResource]
     resolved_exports: dict[str, str]
 
@@ -94,7 +95,7 @@ class Stack:
         # state after deploy
         self.resolved_parameters = {}
         self.resolved_resources = {}
-        self.resolved_outputs = {}
+        self.resolved_outputs = []
         self.resource_states = {}
         self.events = []
         self.resolved_exports = {}

{localstack_core-4.7.1.dev79 → localstack_core-4.7.1.dev81}/localstack-core/localstack/services/cloudformation/v2/provider.py

@@ -52,6 +52,7 @@ from localstack.aws.api.cloudformation import (
     NextToken,
     Parameter,
     PhysicalResourceId,
+    ResourceStatus,
     RetainExceptOnCreate,
     RetainResources,
     RoleARN,
@@ -349,6 +350,7 @@ class CloudformationProviderV2(CloudformationProvider):
         # the transformations.
         update_model.before_runtime_cache.update(raw_update_model.before_runtime_cache)
         update_model.after_runtime_cache.update(raw_update_model.after_runtime_cache)
+        change_set.set_update_model(update_model)
 
         # perform validations
         validator = ChangeSetModelValidator(
@@ -361,7 +363,6 @@ class CloudformationProviderV2(CloudformationProvider):
             if transform.global_transforms:
                 # global transforms should always be considered "MODIFIED"
                 update_model.node_template.change_type = ChangeType.MODIFIED
-        change_set.set_update_model(update_model)
         change_set.processed_template = transformed_after_template
 
     @handler("CreateChangeSet", expand=False)
@@ -557,15 +558,15 @@ class CloudformationProviderV2(CloudformationProvider):
         )
 
         def _run(*args):
-            try:
-                result = change_set_executor.execute()
+            result = change_set_executor.execute()
+            change_set.stack.resolved_parameters = change_set.resolved_parameters
+            change_set.stack.resolved_resources = result.resources
+            if not result.failure_message:
                 new_stack_status = StackStatus.UPDATE_COMPLETE
                 if change_set.change_set_type == ChangeSetType.CREATE:
                     new_stack_status = StackStatus.CREATE_COMPLETE
                 change_set.stack.set_stack_status(new_stack_status)
                 change_set.set_execution_status(ExecutionStatus.EXECUTE_COMPLETE)
-                change_set.stack.resolved_resources = result.resources
-                change_set.stack.resolved_parameters = change_set.resolved_parameters
                 change_set.stack.resolved_outputs = result.outputs
 
                 change_set.stack.resolved_exports = {}
@@ -582,20 +583,15 @@ class CloudformationProviderV2(CloudformationProvider):
                 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
-            except Exception as e:
+            else:
                 LOG.error(
                     "Execute change set failed: %s",
-                    e,
+                    result.failure_message,
                     exc_info=LOG.isEnabledFor(logging.DEBUG) and config.CFN_VERBOSE_ERRORS,
                 )
-                new_stack_status = StackStatus.UPDATE_FAILED
-                if change_set.change_set_type == ChangeSetType.CREATE:
-                    new_stack_status = StackStatus.CREATE_FAILED
-
-                change_set.stack.set_stack_status(new_stack_status)
+                # stack status is taken care of in the executor
                 change_set.set_execution_status(ExecutionStatus.EXECUTE_FAILED)
-                change_set.stack.change_set_id = change_set.change_set_id
-                change_set.stack.change_set_ids.append(change_set.change_set_id)
+                change_set.stack.deletion_time = datetime.now(tz=UTC)
 
         start_worker_thread(_run)
 
@@ -787,6 +783,8 @@ class CloudformationProviderV2(CloudformationProvider):
         if change_set.status == ChangeSetStatus.FAILED:
             return CreateStackOutput(StackId=stack.stack_id)
 
+        stack.processed_template = change_set.processed_template
+
         # deployment process
         stack.set_stack_status(StackStatus.CREATE_IN_PROGRESS)
         change_set_executor = ChangeSetModelExecutor(change_set)
@@ -794,9 +792,16 @@ class CloudformationProviderV2(CloudformationProvider):
         def _run(*args):
             try:
                 result = change_set_executor.execute()
-                stack.set_stack_status(StackStatus.CREATE_COMPLETE)
                 stack.resolved_resources = result.resources
                 stack.resolved_outputs = result.outputs
+                if all(
+                    resource["ResourceStatus"] == ResourceStatus.CREATE_COMPLETE
+                    for resource in stack.resolved_resources.values()
+                ):
+                    stack.set_stack_status(StackStatus.CREATE_COMPLETE)
+                else:
+                    stack.set_stack_status(StackStatus.CREATE_FAILED)
+
                 # if the deployment succeeded, update the stack's template representation to that
                 # which was just deployed
                 stack.template = change_set.template
@@ -807,7 +812,6 @@ class CloudformationProviderV2(CloudformationProvider):
                 for output in result.outputs:
                     if export_name := output.get("ExportName"):
                         stack.resolved_exports[export_name] = output["OutputValue"]
-                stack.processed_template = change_set.processed_template
             except Exception as e:
                 LOG.error(
                     "Create Stack set failed: %s",
@@ -857,7 +861,6 @@ class CloudformationProviderV2(CloudformationProvider):
         stack_description = ApiStack(
             Description=stack.description,
             CreationTime=stack.creation_time,
-            DeletionTime=stack.deletion_time,
             StackId=stack.stack_id,
             StackName=stack.stack_name,
             StackStatus=stack.status,
@@ -873,6 +876,8 @@ class CloudformationProviderV2(CloudformationProvider):
         if stack.status != StackStatus.REVIEW_IN_PROGRESS:
             # TODO: actually track updated time
             stack_description["LastUpdatedTime"] = stack.creation_time
+        if stack.deletion_time:
+            stack_description["DeletionTime"] = stack.deletion_time
         if stack.capabilities:
             stack_description["Capabilities"] = stack.capabilities
         # TODO: confirm the logic for this
@@ -1489,6 +1494,8 @@ class CloudformationProviderV2(CloudformationProvider):
             stack.deletion_time = datetime.now(tz=UTC)
             return
 
+        stack.set_stack_status(StackStatus.DELETE_IN_PROGRESS)
+
         previous_update_model = None
         if stack.change_set_id:
             if previous_change_set := find_change_set_v2(state, stack.change_set_id):
@@ -1511,7 +1518,6 @@ class CloudformationProviderV2(CloudformationProvider):
 
         def _run(*args):
             try:
-                stack.set_stack_status(StackStatus.DELETE_IN_PROGRESS)
                 change_set_executor.execute()
                 stack.set_stack_status(StackStatus.DELETE_COMPLETE)
                 stack.deletion_time = datetime.now(tz=UTC)

{localstack_core-4.7.1.dev79 → localstack_core-4.7.1.dev81}/localstack-core/localstack/services/cloudformation/v2/types.py

@@ -28,6 +28,7 @@ class ResolvedResource(TypedDict):
     LogicalResourceId: str
     Type: str
     Properties: dict
-    ResourceStatus: ResourceStatus
-    PhysicalResourceId: str | None
-    LastUpdatedTimestamp: datetime | None
+    LastUpdatedTimestamp: datetime
+    ResourceStatus: NotRequired[ResourceStatus]
+    PhysicalResourceId: NotRequired[str]
+    ResourceStatusReason: NotRequired[str]

{localstack_core-4.7.1.dev79 → localstack_core-4.7.1.dev81}/localstack-core/localstack/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.7.1.dev79'
-__version_tuple__ = version_tuple = (4, 7, 1, 'dev79')
+__version__ = version = '4.7.1.dev81'
+__version_tuple__ = version_tuple = (4, 7, 1, 'dev81')
 
-__commit_id__ = commit_id = 'g3ce30649a'
+__commit_id__ = commit_id = 'g167994765'

{localstack_core-4.7.1.dev79 → localstack_core-4.7.1.dev81/localstack-core/localstack_core.egg-info}/PKG-INFO

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

{localstack_core-4.7.1.dev79 → localstack_core-4.7.1.dev81}/localstack-core/localstack_core.egg-info/SOURCES.txt

@@ -1225,6 +1225,7 @@ localstack-core/localstack/testing/pytest/util.py
 localstack-core/localstack/testing/pytest/validation_tracking.py
 localstack-core/localstack/testing/pytest/cloudformation/__init__.py
 localstack-core/localstack/testing/pytest/cloudformation/fixtures.py
+localstack-core/localstack/testing/pytest/cloudformation/transformers.py
 localstack-core/localstack/testing/pytest/stepfunctions/__init__.py
 localstack-core/localstack/testing/pytest/stepfunctions/fixtures.py
 localstack-core/localstack/testing/pytest/stepfunctions/utils.py