localstack-core 4.7.1.dev22__tar.gz → 4.7.1.dev23__tar.gz

{localstack_core-4.7.1.dev22 → localstack_core-4.7.1.dev23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.7.1.dev22
+Version: 4.7.1.dev23
 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.dev22 → localstack_core-4.7.1.dev23}/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import abc
 import enum
 from itertools import zip_longest
-from typing import Any, Final, Generator, Optional, TypedDict, Union, cast
+from typing import TYPE_CHECKING, Any, Final, Generator, Optional, TypedDict, Union, cast
 
 from typing_extensions import TypeVar
 
@@ -11,6 +11,9 @@ from localstack.aws.api.cloudformation import ChangeAction
 from localstack.services.cloudformation.resource_provider import ResourceProviderExecutor
 from localstack.utils.strings import camel_to_snake_case
 
+if TYPE_CHECKING:
+    from localstack.services.cloudformation.v2.entities import EngineParameter
+
 T = TypeVar("T")
 
 
@@ -536,13 +539,14 @@ class ChangeSetModel:
         before_template: Optional[dict],
         after_template: Optional[dict],
         before_parameters: Optional[dict],
-        after_parameters: Optional[dict],
+        after_parameters: Optional[dict[str, EngineParameter]],
     ):
         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._visited_scopes = dict()
+        # TODO: move this modeling process to the `get_update_model` method as constructors shouldn't do work
         self._node_template = self._model(
             before_template=self._before_template, after_template=self._after_template
         )
@@ -1008,9 +1012,26 @@ class ChangeSetModel:
 
     def _visit_dynamic_parameter(self, parameter_name: str) -> ChangeSetEntity:
         scope = Scope("Dynamic").open_scope("Parameters")
-        scope_parameter, (before_parameter, after_parameter) = self._safe_access_in(
+        scope_parameter, (before_parameter_dct, after_parameter_dct) = self._safe_access_in(
             scope, parameter_name, self._before_parameters, self._after_parameters
         )
+
+        before_parameter = Nothing
+        if not is_nothing(before_parameter_dct):
+            before_parameter = (
+                before_parameter_dct.get("resolved_value")
+                or before_parameter_dct["given_value"]
+                or before_parameter_dct.get("default_value")
+            )
+
+        after_parameter = Nothing
+        if not is_nothing(after_parameter_dct):
+            after_parameter = (
+                after_parameter_dct.get("resolved_value")
+                or after_parameter_dct["given_value"]
+                or after_parameter_dct.get("default_value")
+            )
+
         parameter = self._visit_value(
             scope=scope_parameter, before_value=before_parameter, after_value=after_parameter
         )

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

@@ -14,12 +14,10 @@ from localstack.aws.api.cloudformation import (
 from localstack.constants import INTERNAL_AWS_SECRET_ACCESS_KEY
 from localstack.services.cloudformation.analytics import track_resource_operation
 from localstack.services.cloudformation.deployment_utils import log_not_available_message
-from localstack.services.cloudformation.engine.parameters import resolve_ssm_parameter
 from localstack.services.cloudformation.engine.template_deployer import REGEX_OUTPUT_APIGATEWAY
 from localstack.services.cloudformation.engine.v2.change_set_model import (
     NodeDependsOn,
     NodeOutput,
-    NodeParameter,
     NodeResource,
     TerminalValueCreated,
     TerminalValueModified,
@@ -52,7 +50,6 @@ EventOperationFromAction = {"Add": "CREATE", "Modify": "UPDATE", "Remove": "DELE
 @dataclass
 class ChangeSetModelExecutorResult:
     resources: dict[str, ResolvedResource]
-    parameters: dict
     outputs: dict
     exports: dict
 
@@ -65,7 +62,6 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
     # TODO: add typing for resolved resources and parameters.
     resources: Final[dict[str, ResolvedResource]]
     outputs: Final[dict]
-    resolved_parameters: Final[dict]
     exports: Final[dict]
     _deferred_actions: list[DeferredAction]
 
@@ -73,7 +69,6 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
         super().__init__(change_set=change_set)
         self.resources = dict()
         self.outputs = dict()
-        self.resolved_parameters = dict()
         self.exports = dict()
         self._deferred_actions = list()
         self.resource_provider_executor = ResourceProviderExecutor(
@@ -96,7 +91,6 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
 
         return ChangeSetModelExecutorResult(
             resources=self.resources,
-            parameters=self.resolved_parameters,
             outputs=self.outputs,
             exports=self.exports,
         )
@@ -104,29 +98,6 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
     def _defer_action(self, action: DeferredAction):
         self._deferred_actions.append(action)
 
-    def visit_node_parameter(self, node_parameter: NodeParameter) -> PreprocEntityDelta:
-        delta = super().visit_node_parameter(node_parameter)
-
-        # handle dynamic references, e.g. references to SSM parameters
-        # TODO: support more parameter types
-        parameter_type: str = node_parameter.type_.value
-        if parameter_type.startswith("AWS::SSM"):
-            if parameter_type in [
-                "AWS::SSM::Parameter::Value<String>",
-                "AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>",
-                "AWS::SSM::Parameter::Value<CommaDelimitedList>",
-            ]:
-                delta.after = resolve_ssm_parameter(
-                    account_id=self._change_set.account_id,
-                    region_name=self._change_set.region_name,
-                    stack_parameter_value=delta.after,
-                )
-            else:
-                raise Exception(f"Unsupported stack parameter type: {parameter_type}")
-
-        self.resolved_parameters[node_parameter.name] = delta.after
-        return delta
-
     def _get_physical_id(self, logical_resource_id, strict: bool = True) -> str | None:
         physical_resource_id = None
         try:
@@ -147,12 +118,13 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
 
     def _process_event(
         self,
+        *,
         action: ChangeAction,
         logical_resource_id,
         event_status: OperationStatus,
+        resource_type: str,
         special_action: str = None,
         reason: str = None,
-        resource_type=None,
     ):
         status_from_action = special_action or EventOperationFromAction[action.value]
         if event_status == OperationStatus.SUCCESS:
@@ -162,7 +134,7 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
 
         self._change_set.stack.set_resource_status(
             logical_resource_id=logical_resource_id,
-            physical_resource_id=self._get_physical_id(logical_resource_id, False),
+            physical_resource_id=self._get_physical_id(logical_resource_id, False) or "",
             resource_type=resource_type,
             status=ResourceStatus(status),
             resource_status_reason=reason,
@@ -216,11 +188,11 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
             delta = super().visit_node_resource(node_resource=node_resource)
         except Exception as e:
             self._process_event(
-                node_resource.change_type.to_change_action(),
-                node_resource.name,
-                OperationStatus.FAILED,
-                reason=str(e),
+                action=node_resource.change_type.to_change_action(),
+                logical_resource_id=node_resource.name,
+                event_status=OperationStatus.FAILED,
                 resource_type=node_resource.type_.value,
+                reason=str(e),
             )
             raise e
 
@@ -275,7 +247,12 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                 # XXX hacky, stick the previous resources' properties into the payload
                 before_properties = self._merge_before_properties(name, before)
 
-                self._process_event(ChangeAction.Modify, name, OperationStatus.IN_PROGRESS)
+                self._process_event(
+                    action=ChangeAction.Modify,
+                    logical_resource_id=name,
+                    event_status=OperationStatus.IN_PROGRESS,
+                    resource_type=before.resource_type,
+                )
                 if after.requires_replacement:
                     event = self._execute_resource_action(
                         action=ChangeAction.Add,
@@ -285,15 +262,20 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                         after_properties=after.properties,
                     )
                     self._process_event(
-                        ChangeAction.Modify,
-                        name,
-                        event.status,
-                        reason=event.message,
+                        action=ChangeAction.Modify,
+                        logical_resource_id=name,
+                        event_status=event.status,
                         resource_type=before.resource_type,
+                        reason=event.message,
                     )
 
                     def cleanup():
-                        self._process_event(ChangeAction.Remove, name, OperationStatus.IN_PROGRESS)
+                        self._process_event(
+                            action=ChangeAction.Remove,
+                            logical_resource_id=name,
+                            event_status=OperationStatus.IN_PROGRESS,
+                            resource_type=before.resource_type,
+                        )
                         event = self._execute_resource_action(
                             action=ChangeAction.Remove,
                             logical_resource_id=name,
@@ -302,11 +284,11 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                             after_properties=None,
                         )
                         self._process_event(
-                            ChangeAction.Remove,
-                            name,
-                            event.status,
-                            reason=event.message,
+                            action=ChangeAction.Remove,
+                            logical_resource_id=name,
+                            event_status=event.status,
                             resource_type=before.resource_type,
+                            reason=event.message,
                         )
 
                     self._defer_action(cleanup)
@@ -319,11 +301,11 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                         after_properties=after.properties,
                     )
                     self._process_event(
-                        ChangeAction.Modify,
-                        name,
-                        event.status,
-                        reason=event.message,
+                        action=ChangeAction.Modify,
+                        logical_resource_id=name,
+                        event_status=event.status,
                         resource_type=before.resource_type,
+                        reason=event.message,
                     )
             # Case: type migration.
             # TODO: Add test to assert that on type change the resources are replaced.
@@ -341,11 +323,11 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                         after_properties=None,
                     )
                     self._process_event(
-                        ChangeAction.Modify,
-                        name,
-                        event.status,
-                        reason=event.message,
+                        action=ChangeAction.Modify,
+                        logical_resource_id=name,
+                        event_status=event.status,
                         resource_type=before.resource_type,
+                        reason=event.message,
                     )
 
                 self._defer_action(perform_deletion)
@@ -358,11 +340,11 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                     after_properties=after.properties,
                 )
                 self._process_event(
-                    ChangeAction.Modify,
-                    name,
-                    event.status,
-                    reason=event.message,
+                    action=ChangeAction.Modify,
+                    logical_resource_id=name,
+                    event_status=event.status,
                     resource_type=before.resource_type,
+                    reason=event.message,
                 )
         elif not is_nothing(before):
             # Case: removal
@@ -372,10 +354,10 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
 
             def perform_deletion():
                 self._process_event(
-                    ChangeAction.Remove,
-                    name,
-                    OperationStatus.IN_PROGRESS,
+                    action=ChangeAction.Remove,
+                    logical_resource_id=name,
                     resource_type=before.resource_type,
+                    event_status=OperationStatus.IN_PROGRESS,
                 )
                 event = self._execute_resource_action(
                     action=ChangeAction.Remove,
@@ -385,20 +367,20 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                     after_properties=None,
                 )
                 self._process_event(
-                    ChangeAction.Remove,
-                    name,
-                    event.status,
-                    reason=event.message,
+                    action=ChangeAction.Remove,
+                    logical_resource_id=name,
+                    event_status=event.status,
                     resource_type=before.resource_type,
+                    reason=event.message,
                 )
 
             self._defer_action(perform_deletion)
         elif not is_nothing(after):
             # Case: addition
             self._process_event(
-                ChangeAction.Add,
-                name,
-                OperationStatus.IN_PROGRESS,
+                action=ChangeAction.Add,
+                logical_resource_id=name,
+                event_status=OperationStatus.IN_PROGRESS,
                 resource_type=after.resource_type,
             )
             event = self._execute_resource_action(
@@ -409,11 +391,11 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                 after_properties=after.properties,
             )
             self._process_event(
-                ChangeAction.Add,
-                name,
-                event.status,
-                reason=event.message,
+                action=ChangeAction.Add,
+                logical_resource_id=name,
+                event_status=event.status,
                 resource_type=after.resource_type,
+                reason=event.message,
             )
 
     def _merge_before_properties(

{localstack_core-4.7.1.dev22 → localstack_core-4.7.1.dev23}/localstack-core/localstack/services/cloudformation/v2/entities.py

@@ -1,4 +1,3 @@
-import copy
 from datetime import datetime, timezone
 from typing import NotRequired, Optional, TypedDict
 
@@ -11,7 +10,6 @@ from localstack.aws.api.cloudformation import (
     CreateStackSetInput,
     ExecutionStatus,
     Output,
-    Parameter,
     ResourceStatus,
     StackDriftInformation,
     StackDriftStatus,
@@ -24,6 +22,9 @@ from localstack.aws.api.cloudformation import (
     StackStatus,
     StackStatusReason,
 )
+from localstack.aws.api.cloudformation import (
+    Parameter as ApiParameter,
+)
 from localstack.aws.api.cloudformation import (
     Stack as ApiStack,
 )
@@ -38,6 +39,18 @@ from localstack.utils.aws import arns
 from localstack.utils.strings import long_uid, short_uid
 
 
+# TODO: turn into class/dataclass
+class EngineParameter(TypedDict):
+    """
+    Parameters supplied by the user. The resolved value field is populated by the engine
+    """
+
+    type_: str
+    given_value: NotRequired[str | None]
+    resolved_value: NotRequired[str | None]
+    default_value: NotRequired[str | None]
+
+
 class ResolvedResource(TypedDict):
     LogicalResourceId: str
     Type: str
@@ -49,7 +62,7 @@ class ResolvedResource(TypedDict):
 
 class Stack:
     stack_name: str
-    parameters: list[Parameter]
+    parameters: list[ApiParameter]
     change_set_id: str | None
     status: StackStatus
     status_reason: StackStatusReason | None
@@ -60,6 +73,7 @@ class Stack:
     capabilities: list[Capability]
     enable_termination_protection: bool
     processed_template: dict | None
+    template_body: str | None
 
     # state after deploy
     resolved_parameters: dict[str, str]
@@ -73,15 +87,10 @@ class Stack:
         account_id: str,
         region_name: str,
         request_payload: CreateChangeSetInput | CreateStackInput,
-        template: dict | None = None,
-        template_body: str | None = None,
         initial_status: StackStatus = StackStatus.CREATE_IN_PROGRESS,
     ):
         self.account_id = account_id
         self.region_name = region_name
-        self.template = template
-        self.template_original = copy.deepcopy(self.template)
-        self.template_body = template_body
         self.status = initial_status
         self.status_reason = None
         self.change_set_ids = []
@@ -90,6 +99,7 @@ class Stack:
         self.change_set_id = None
         self.enable_termination_protection = False
         self.processed_template = None
+        self.template_body = None
 
         self.stack_name = request_payload["StackName"]
         self.parameters = request_payload.get("Parameters", [])
@@ -119,7 +129,13 @@ class Stack:
         if reason:
             self.status_reason = reason
 
-        self._store_event(self.stack_name, self.stack_id, status.value, status_reason=reason)
+        self._store_event(
+            resource_id=self.stack_name,
+            resource_type="AWS::CloudFormation::Stack",
+            physical_resource_id=self.stack_id,
+            status=status,
+            status_reason=reason,
+        )
 
     def set_resource_status(
         self,
@@ -148,34 +164,34 @@ class Stack:
             self.resource_states.pop(logical_resource_id)
         else:
             self.resource_states[logical_resource_id] = resource_description
-        self._store_event(logical_resource_id, physical_resource_id, status, resource_status_reason)
+
+        self._store_event(
+            resource_id=logical_resource_id,
+            resource_type=resource_type,
+            physical_resource_id=physical_resource_id,
+            status=status,
+            status_reason=resource_status_reason,
+        )
 
     def _store_event(
         self,
         resource_id: str = None,
-        physical_res_id: str = None,
-        status: str = "",
+        resource_type: str | None = "",
+        physical_resource_id: str = None,
+        status: StackStatus | ResourceStatus = "",
         status_reason: str = "",
     ):
-        resource_id = resource_id
-        physical_res_id = physical_res_id
-        resource_type = (
-            self.template.get("Resources", {})
-            .get(resource_id, {})
-            .get("Type", "AWS::CloudFormation::Stack")
+        event = StackEvent(
+            EventId=long_uid(),
+            Timestamp=datetime.now(tz=timezone.utc),
+            StackId=self.stack_id,
+            StackName=self.stack_name,
+            LogicalResourceId=resource_id,
+            PhysicalResourceId=physical_resource_id,
+            ResourceStatus=status,
+            ResourceType=resource_type,
         )
 
-        event: StackEvent = {
-            "EventId": long_uid(),
-            "Timestamp": datetime.now(tz=timezone.utc),
-            "StackId": self.stack_id,
-            "StackName": self.stack_name,
-            "LogicalResourceId": resource_id,
-            "PhysicalResourceId": physical_res_id,
-            "ResourceStatus": status,
-            "ResourceType": resource_type,
-        }
-
         if status_reason:
             event["ResourceStatusReason"] = status_reason
 
@@ -200,7 +216,6 @@ class Stack:
             "Tags": [],
             "NotificationARNs": [],
             "Capabilities": self.capabilities,
-            "Parameters": self.parameters,
         }
         # TODO: confirm the logic for this
         if change_set_id := self.change_set_id:
@@ -238,20 +253,25 @@ class ChangeSet:
     status_reason: str | None
     execution_status: ExecutionStatus
     creation_time: datetime
+    processed_template: dict | None
+    resolved_parameters: list[ApiParameter]
 
     def __init__(
         self,
         stack: Stack,
         request_payload: ChangeSetRequestPayload,
+        template_body: str,
         template: dict | None = None,
     ):
         self.stack = stack
+        self.template_body = template_body
         self.template = template
         self.status = ChangeSetStatus.CREATE_IN_PROGRESS
         self.status_reason = None
         self.execution_status = ExecutionStatus.AVAILABLE
         self.update_model = None
         self.creation_time = datetime.now(tz=timezone.utc)
+        self.resolved_parameters = []
 
         self.change_set_name = request_payload["ChangeSetName"]
         self.change_set_type = request_payload.get("ChangeSetType", ChangeSetType.UPDATE)
@@ -261,6 +281,7 @@ class ChangeSet:
             account_id=self.stack.account_id,
             region_name=self.stack.region_name,
         )
+        self.processed_template = None
 
     def set_update_model(self, update_model: UpdateModel) -> None:
         self.update_model = update_model