localstack-core 4.7.1.dev32__tar.gz → 4.7.1.dev34__tar.gz

{localstack_core-4.7.1.dev32 → localstack_core-4.7.1.dev34}/PKG-INFO

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

@@ -322,18 +322,40 @@ def resolve_condition(
                 case "Fn::Select":
                     index = v[0]
                     options = v[1]
-                    for i, option in enumerate(options):
-                        if isinstance(option, dict):
-                            options[i] = resolve_condition(
-                                account_id,
-                                region_name,
-                                option,
-                                conditions,
-                                parameters,
-                                mappings,
-                                stack_name,
-                            )
-                    return options[index]
+
+                    if isinstance(options, dict):
+                        options = resolve_condition(
+                            account_id,
+                            region_name,
+                            options,
+                            conditions,
+                            parameters,
+                            mappings,
+                            stack_name,
+                        )
+
+                    if isinstance(options, list):
+                        for i, option in enumerate(options):
+                            if isinstance(option, dict):
+                                options[i] = resolve_condition(
+                                    account_id,
+                                    region_name,
+                                    option,
+                                    conditions,
+                                    parameters,
+                                    mappings,
+                                    stack_name,
+                                )
+
+                        return options[index]
+
+                    if index != 0:
+                        raise Exception(
+                            f"Template error: Fn::Select  cannot select nonexistent value at index {index}"
+                        )
+
+                    return options
+
                 case "Fn::Sub":
                     # we can assume anything in there is a ref
                     if isinstance(v, str):

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

@@ -4,17 +4,18 @@ import abc
 import enum
 from collections.abc import Generator
 from itertools import zip_longest
-from typing import TYPE_CHECKING, Any, Final, TypedDict, cast
+from typing import Any, Final, TypedDict, cast
 
 from typing_extensions import TypeVar
 
 from localstack.aws.api.cloudformation import ChangeAction
 from localstack.services.cloudformation.resource_provider import ResourceProviderExecutor
+from localstack.services.cloudformation.v2.types import (
+    EngineParameter,
+    engine_parameter_value,
+)
 from localstack.utils.strings import camel_to_snake_case
 
-if TYPE_CHECKING:
-    from localstack.services.cloudformation.v2.entities import EngineParameter
-
 T = TypeVar("T")
 
 
@@ -356,6 +357,8 @@ class NodeResource(ChangeSetNode):
     condition_reference: Final[Maybe[TerminalValue]]
     depends_on: Final[Maybe[NodeDependsOn]]
     requires_replacement: Final[bool]
+    deletion_policy: Final[Maybe[ChangeSetTerminal]]
+    update_replace_policy: Final[Maybe[ChangeSetTerminal]]
 
     def __init__(
         self,
@@ -367,6 +370,8 @@ class NodeResource(ChangeSetNode):
         condition_reference: Maybe[TerminalValue],
         depends_on: Maybe[NodeDependsOn],
         requires_replacement: bool,
+        deletion_policy: Maybe[ChangeSetTerminal],
+        update_replace_policy: Maybe[ChangeSetTerminal],
     ):
         super().__init__(scope=scope, change_type=change_type)
         self.name = name
@@ -375,6 +380,8 @@ class NodeResource(ChangeSetNode):
         self.condition_reference = condition_reference
         self.depends_on = depends_on
         self.requires_replacement = requires_replacement
+        self.deletion_policy = deletion_policy
+        self.update_replace_policy = update_replace_policy
 
 
 class NodeProperties(ChangeSetNode):
@@ -481,6 +488,8 @@ ValueKey: Final[str] = "Value"
 ExportKey: Final[str] = "Export"
 OutputsKey: Final[str] = "Outputs"
 DependsOnKey: Final[str] = "DependsOn"
+DeletionPolicyKey: Final[str] = "DeletionPolicy"
+UpdateReplacePolicyKey: Final[str] = "UpdateReplacePolicy"
 # TODO: expand intrinsic functions set.
 RefKey: Final[str] = "Ref"
 RefConditionKey: Final[str] = "Condition"
@@ -902,6 +911,30 @@ class ChangeSetModel:
             raise RuntimeError()
         return value
 
+    def _visit_deletion_policy(
+        self, scope: Scope, before_deletion_policy: Any, after_deletion_policy: Any
+    ) -> TerminalValue:
+        value = self._visit_value(
+            scope=scope, before_value=before_deletion_policy, after_value=after_deletion_policy
+        )
+        if not isinstance(value, TerminalValue):
+            # TODO: decide where template schema validation should occur.
+            raise RuntimeError()
+        return value
+
+    def _visit_update_replace_policy(
+        self, scope: Scope, before_update_replace_policy: Any, after_deletion_policy: Any
+    ) -> TerminalValue:
+        value = self._visit_value(
+            scope=scope,
+            before_value=before_update_replace_policy,
+            after_value=after_deletion_policy,
+        )
+        if not isinstance(value, TerminalValue):
+            # TODO: decide where template schema validation should occur.
+            raise RuntimeError()
+        return value
+
     def _visit_resource(
         self,
         scope: Scope,
@@ -947,8 +980,30 @@ class ChangeSetModel:
             after_properties=after_properties,
         )
 
+        deletion_policy = Nothing
+        scope_deletion_policy, (before_deletion_policy, after_deletion_policy) = (
+            self._safe_access_in(scope, DeletionPolicyKey, before_resource, after_resource)
+        )
+        if before_deletion_policy or after_deletion_policy:
+            deletion_policy = self._visit_deletion_policy(
+                scope_deletion_policy, before_deletion_policy, after_deletion_policy
+            )
+
+        update_replace_policy = Nothing
+        scope_update_replace_policy, (before_update_replace_policy, after_update_replace_policy) = (
+            self._safe_access_in(scope, UpdateReplacePolicyKey, before_resource, after_resource)
+        )
+        if before_update_replace_policy or after_update_replace_policy:
+            update_replace_policy = self._visit_update_replace_policy(
+                scope_update_replace_policy,
+                before_update_replace_policy,
+                after_update_replace_policy,
+            )
+
         change_type = change_type_of(
-            before_resource, after_resource, [properties, condition_reference, depends_on]
+            before_resource,
+            after_resource,
+            [properties, condition_reference, depends_on, deletion_policy, update_replace_policy],
         )
         requires_replacement = self._resolve_requires_replacement(
             node_properties=properties, resource_type=terminal_value_type
@@ -962,6 +1017,8 @@ class ChangeSetModel:
             condition_reference=condition_reference,
             depends_on=depends_on,
             requires_replacement=requires_replacement,
+            deletion_policy=deletion_policy,
+            update_replace_policy=update_replace_policy,
         )
         self._visited_scopes[scope] = node_resource
         return node_resource
@@ -1019,18 +1076,14 @@ class ChangeSetModel:
 
         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")
+            before_parameter = before_parameter_dct.get("resolved_value") or engine_parameter_value(
+                before_parameter_dct
             )
 
         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")
+            after_parameter = after_parameter_dct.get("resolved_value") or engine_parameter_value(
+                after_parameter_dct
             )
 
         parameter = self._visit_value(

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

@@ -8,6 +8,7 @@ from typing import Final, Protocol
 from localstack import config
 from localstack.aws.api.cloudformation import (
     ChangeAction,
+    Output,
     ResourceStatus,
     StackStatus,
 )
@@ -50,8 +51,7 @@ EventOperationFromAction = {"Add": "CREATE", "Modify": "UPDATE", "Remove": "DELE
 @dataclass
 class ChangeSetModelExecutorResult:
     resources: dict[str, ResolvedResource]
-    outputs: dict
-    exports: dict
+    outputs: list[Output]
 
 
 class DeferredAction(Protocol):
@@ -61,15 +61,13 @@ class DeferredAction(Protocol):
 class ChangeSetModelExecutor(ChangeSetModelPreproc):
     # TODO: add typing for resolved resources and parameters.
     resources: Final[dict[str, ResolvedResource]]
-    outputs: Final[dict]
-    exports: Final[dict]
+    outputs: Final[list[Output]]
     _deferred_actions: list[DeferredAction]
 
     def __init__(self, change_set: ChangeSet):
         super().__init__(change_set=change_set)
         self.resources = dict()
-        self.outputs = dict()
-        self.exports = dict()
+        self.outputs = []
         self._deferred_actions = list()
         self.resource_provider_executor = ResourceProviderExecutor(
             stack_name=change_set.stack.stack_name,
@@ -92,7 +90,6 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
         return ChangeSetModelExecutorResult(
             resources=self.resources,
             outputs=self.outputs,
-            exports=self.exports,
         )
 
     def _defer_action(self, action: DeferredAction):
@@ -228,11 +225,15 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
         if is_nothing(after) or (isinstance(after, PreprocOutput) and after.condition is False):
             return delta
 
-        # TODO validate export name duplication in same template and all exports
-        if delta.after.export:
-            self.exports[delta.after.export.get("Name")] = delta.after.value
-
-        self.outputs[delta.after.name] = delta.after.value
+        output = Output(
+            OutputKey=delta.after.name,
+            OutputValue=delta.after.value,
+            # TODO
+            # Description=delta.after.description
+        )
+        if after.export:
+            output["ExportName"] = after.export["Name"]
+        self.outputs.append(output)
         return delta
 
     def _execute_resource_change(

{localstack_core-4.7.1.dev32 → localstack_core-4.7.1.dev34}/localstack-core/localstack/services/cloudformation/v2/entities.py

@@ -9,10 +9,7 @@ from localstack.aws.api.cloudformation import (
     CreateStackInput,
     CreateStackSetInput,
     ExecutionStatus,
-    Output,
     ResourceStatus,
-    StackDriftInformation,
-    StackDriftStatus,
     StackEvent,
     StackInstanceComprehensiveStatus,
     StackInstanceDetailedStatus,
@@ -25,9 +22,6 @@ from localstack.aws.api.cloudformation import (
 from localstack.aws.api.cloudformation import (
     Parameter as ApiParameter,
 )
-from localstack.aws.api.cloudformation import (
-    Stack as ApiStack,
-)
 from localstack.services.cloudformation.engine.entities import (
     StackIdentifier,
 )
@@ -35,33 +29,14 @@ from localstack.services.cloudformation.engine.v2.change_set_model import (
     ChangeType,
     UpdateModel,
 )
+from localstack.services.cloudformation.v2.types import ResolvedResource
 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
-    Properties: dict
-    ResourceStatus: ResourceStatus
-    PhysicalResourceId: str | None
-    LastUpdatedTimestamp: datetime | None
-
-
 class Stack:
     stack_name: str
+    description: str | None
     parameters: list[ApiParameter]
     change_set_id: str | None
     status: StackStatus
@@ -123,6 +98,7 @@ class Stack:
         self.resource_states = {}
         self.events = []
         self.resolved_exports = {}
+        self.description = None
 
     def set_stack_status(self, status: StackStatus, reason: StackStatusReason | None = None):
         self.status = status
@@ -197,44 +173,6 @@ class Stack:
 
         self.events.insert(0, event)
 
-    def describe_details(self) -> ApiStack:
-        result = {
-            "CreationTime": self.creation_time,
-            "DeletionTime": self.deletion_time,
-            "StackId": self.stack_id,
-            "StackName": self.stack_name,
-            "StackStatus": self.status,
-            "StackStatusReason": self.status_reason,
-            # fake values
-            "DisableRollback": False,
-            "DriftInformation": StackDriftInformation(
-                StackDriftStatus=StackDriftStatus.NOT_CHECKED
-            ),
-            "EnableTerminationProtection": self.enable_termination_protection,
-            "LastUpdatedTime": self.creation_time,
-            "RollbackConfiguration": {},
-            "Tags": [],
-            "NotificationARNs": [],
-            "Capabilities": self.capabilities,
-        }
-        # TODO: confirm the logic for this
-        if change_set_id := self.change_set_id:
-            result["ChangeSetId"] = change_set_id
-
-        if self.resolved_outputs:
-            describe_outputs = []
-            for key, value in self.resolved_outputs.items():
-                describe_outputs.append(
-                    Output(
-                        # TODO(parity): Description, ExportName
-                        # TODO(parity): what happens on describe stack when the stack has not been deployed yet?
-                        OutputKey=key,
-                        OutputValue=value,
-                    )
-                )
-            result["Outputs"] = describe_outputs
-        return result
-
     def is_active(self) -> bool:
         return self.status != StackStatus.DELETE_COMPLETE
 
@@ -255,6 +193,7 @@ class ChangeSet:
     creation_time: datetime
     processed_template: dict | None
     resolved_parameters: list[ApiParameter]
+    description: str | None
 
     def __init__(
         self,
@@ -275,6 +214,7 @@ class ChangeSet:
 
         self.change_set_name = request_payload["ChangeSetName"]
         self.change_set_type = request_payload.get("ChangeSetType", ChangeSetType.UPDATE)
+        self.description = request_payload.get("Description")
         self.change_set_id = arns.cloudformation_change_set_arn(
             self.change_set_name,
             change_set_id=short_uid(),