localstack-core 4.7.1.dev49__py3-none-any.whl → 4.10.1.dev12__py3-none-any.whl

localstack/services/cloudformation/service_models.py

@@ -13,8 +13,8 @@ class DependencyNotYetSatisfied(Exception):
     """Exception indicating that a resource dependency is not (yet) deployed/available."""
 
     def __init__(self, resource_ids, message=None):
-        message = message or "Unresolved dependencies: %s" % resource_ids
-        super(DependencyNotYetSatisfied, self).__init__(message)
+        message = message or f"Unresolved dependencies: {resource_ids}"
+        super().__init__(message)
         resource_ids = resource_ids if isinstance(resource_ids, list) else [resource_ids]
         self.resource_ids = resource_ids
 

localstack/services/cloudformation/v2/entities.py

@@ -9,6 +9,7 @@ from localstack.aws.api.cloudformation import (
     CreateStackInput,
     CreateStackSetInput,
     ExecutionStatus,
+    Output,
     ResourceStatus,
     StackEvent,
     StackInstanceComprehensiveStatus,
@@ -18,18 +19,19 @@ from localstack.aws.api.cloudformation import (
     StackSetOperation,
     StackStatus,
     StackStatusReason,
+    Tag,
 )
 from localstack.aws.api.cloudformation import (
     Parameter as ApiParameter,
 )
 from localstack.services.cloudformation.engine.entities import (
-    StackIdentifier,
+    StackIdentifierV2,
 )
 from localstack.services.cloudformation.engine.v2.change_set_model import (
     ChangeType,
     UpdateModel,
 )
-from localstack.services.cloudformation.v2.types import ResolvedResource
+from localstack.services.cloudformation.v2.types import EngineParameter, ResolvedResource
 from localstack.utils.aws import arns
 from localstack.utils.strings import long_uid, short_uid
 
@@ -39,6 +41,7 @@ class Stack:
     description: str | None
     parameters: list[ApiParameter]
     change_set_id: str | None
+    change_set_ids: set[str]
     status: StackStatus
     status_reason: StackStatusReason | None
     stack_id: str
@@ -47,13 +50,15 @@ class Stack:
     events: list[StackEvent]
     capabilities: list[Capability]
     enable_termination_protection: bool
+    template: dict | None
     processed_template: dict | None
     template_body: str | None
+    tags: list[Tag]
 
     # 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]
 
@@ -63,24 +68,27 @@ class Stack:
         region_name: str,
         request_payload: CreateChangeSetInput | CreateStackInput,
         initial_status: StackStatus = StackStatus.CREATE_IN_PROGRESS,
+        tags: list[Tag] | None = None,
     ):
         self.account_id = account_id
         self.region_name = region_name
         self.status = initial_status
         self.status_reason = None
-        self.change_set_ids = []
+        self.change_set_ids = set()
         self.creation_time = datetime.now(tz=UTC)
         self.deletion_time = None
         self.change_set_id = None
         self.enable_termination_protection = False
+        self.template = None
         self.processed_template = None
         self.template_body = None
+        self.tags = tags or []
 
         self.stack_name = request_payload["StackName"]
         self.parameters = request_payload.get("Parameters", [])
         self.stack_id = arns.cloudformation_stack_arn(
             self.stack_name,
-            stack_id=StackIdentifier(
+            stack_id=StackIdentifierV2(
                 account_id=self.account_id, region=self.region_name, stack_name=self.stack_name
             ).generate(tags=request_payload.get("Tags")),
             account_id=self.account_id,
@@ -94,7 +102,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 = {}
@@ -192,8 +200,9 @@ class ChangeSet:
     execution_status: ExecutionStatus
     creation_time: datetime
     processed_template: dict | None
-    resolved_parameters: list[ApiParameter]
+    resolved_parameters: dict[str, EngineParameter]
     description: str | None
+    tags: list[Tag]
 
     def __init__(
         self,
@@ -210,7 +219,8 @@ class ChangeSet:
         self.execution_status = ExecutionStatus.AVAILABLE
         self.update_model = None
         self.creation_time = datetime.now(tz=UTC)
-        self.resolved_parameters = []
+        self.resolved_parameters = {}
+        self.tags = request_payload.get("Tags") or []
 
         self.change_set_name = request_payload["ChangeSetName"]
         self.change_set_type = request_payload.get("ChangeSetType", ChangeSetType.UPDATE)