localstack-core 4.3.1.dev57__tar.gz → 4.3.1.dev58__tar.gz

{localstack_core-4.3.1.dev57 → localstack_core-4.3.1.dev58}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.3.1.dev57
+Version: 4.3.1.dev58
 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.dev57 → localstack_core-4.3.1.dev58}/localstack-core/localstack/services/cloudformation/api_utils.py

@@ -4,6 +4,7 @@ from urllib.parse import urlparse
 
 from localstack import config, constants
 from localstack.aws.connect import connect_to
+from localstack.services.cloudformation.engine.validations import ValidationError
 from localstack.services.s3.utils import (
     extract_bucket_name_and_key_from_headers_and_path,
     normalize_bucket_name,
@@ -32,6 +33,61 @@ def prepare_template_body(req_data: dict) -> str | bytes | None:  # TODO: mutati
     return modified_template_body
 
 
+def extract_template_body(request: dict) -> str:
+    """
+    Given a request payload, fetch the body of the template either from S3 or from the payload itself
+    """
+    if template_body := request.get("TemplateBody"):
+        if request.get("TemplateURL"):
+            raise ValidationError(
+                "Specify exactly one of 'TemplateBody' or 'TemplateUrl'"
+            )  # TODO: check proper message
+
+        return template_body
+
+    elif template_url := request.get("TemplateURL"):
+        template_url = convert_s3_to_local_url(template_url)
+        return get_remote_template_body(template_url)
+
+    else:
+        raise ValidationError(
+            "Specify exactly one of 'TemplateBody' or 'TemplateUrl'"
+        )  # TODO: check proper message
+
+
+def get_remote_template_body(url: str) -> str:
+    response = run_safe(lambda: safe_requests.get(url, verify=False))
+    # check error codes, and code 301 - fixes https://github.com/localstack/localstack/issues/1884
+    status_code = 0 if response is None else response.status_code
+    if 200 <= status_code < 300:
+        # request was ok
+        return response.text
+    elif response is None or status_code == 301 or status_code >= 400:
+        # check if this is an S3 URL, then get the file directly from there
+        url = convert_s3_to_local_url(url)
+        if is_local_service_url(url):
+            parsed_path = urlparse(url).path.lstrip("/")
+            parts = parsed_path.partition("/")
+            client = connect_to().s3
+            LOG.debug(
+                "Download CloudFormation template content from local S3: %s - %s",
+                parts[0],
+                parts[2],
+            )
+            result = client.get_object(Bucket=parts[0], Key=parts[2])
+            body = to_str(result["Body"].read())
+            return body
+        raise RuntimeError(
+            "Unable to fetch template body (code %s) from URL %s" % (status_code, url)
+        )
+    else:
+        raise RuntimeError(
+            f"Bad status code from fetching template from url '{url}' ({status_code})",
+            url,
+            status_code,
+        )
+
+
 def get_template_body(req_data: dict) -> str:
     body = req_data.get("TemplateBody")
     if body:

{localstack_core-4.3.1.dev57 → localstack_core-4.3.1.dev58}/localstack-core/localstack/services/cloudformation/engine/entities.py

@@ -49,7 +49,7 @@ class StackInstance:
         self.stack = None
 
 
-class StackMetadata(TypedDict):
+class CreateChangeSetInput(TypedDict):
     StackName: str
     Capabilities: list[Capability]
     ChangeSetName: Optional[str]
@@ -83,7 +83,7 @@ class Stack:
         self,
         account_id: str,
         region_name: str,
-        metadata: Optional[StackMetadata] = None,
+        metadata: Optional[CreateChangeSetInput] = None,
         template: Optional[StackTemplate] = None,
         template_body: Optional[str] = None,
     ):

{localstack_core-4.3.1.dev57 → localstack_core-4.3.1.dev58}/localstack-core/localstack/services/cloudformation/engine/template_deployer.py

@@ -35,7 +35,6 @@ from localstack.services.cloudformation.resource_provider import (
     ProgressEvent,
     ResourceProviderExecutor,
     ResourceProviderPayload,
-    get_resource_type,
 )
 from localstack.services.cloudformation.service_models import (
     DependencyNotYetSatisfied,
@@ -364,7 +363,7 @@ def _resolve_refs_recursively(
             )
             resource = resources.get(resource_logical_id)
 
-            resource_type = get_resource_type(resource)
+            resource_type = resource["Type"]
             resolved_getatt = get_attr_from_model_instance(
                 resource,
                 attribute_name,
@@ -812,7 +811,7 @@ def resolve_placeholders_in_string(
             resolved = get_attr_from_model_instance(
                 resources[logical_resource_id],
                 attr_name,
-                get_resource_type(resources[logical_resource_id]),
+                resources[logical_resource_id]["Type"],
                 logical_resource_id,
             )
             if resolved is None:
@@ -1295,7 +1294,7 @@ class TemplateDeployer:
             action, logical_resource_id=resource_id
         )
 
-        resource_provider = executor.try_load_resource_provider(get_resource_type(resource))
+        resource_provider = executor.try_load_resource_provider(resource["Type"])
         if resource_provider is not None:
             # add in-progress event
             resource_status = f"{get_action_name_for_resource_change(action)}_IN_PROGRESS"
@@ -1407,7 +1406,7 @@ class TemplateDeployer:
             resource["Properties"] = resource.get(
                 "Properties", clone_safe(resource)
             )  # TODO: why is there a fallback?
-            resource["ResourceType"] = get_resource_type(resource)
+            resource["ResourceType"] = resource["Type"]
 
         ordered_resource_ids = list(
             order_resources(
@@ -1438,7 +1437,7 @@ class TemplateDeployer:
                     len(resources),
                     resource["ResourceType"],
                 )
-                resource_provider = executor.try_load_resource_provider(get_resource_type(resource))
+                resource_provider = executor.try_load_resource_provider(resource["Type"])
                 if resource_provider is not None:
                     event = executor.deploy_loop(
                         resource_provider, resource, resource_provider_payload

{localstack_core-4.3.1.dev57 → localstack_core-4.3.1.dev58}/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_executor.py

@@ -1,12 +1,13 @@
+import copy
 import logging
 import uuid
-from typing import Any, Final, Optional
+from typing import Final, Optional
 
-from localstack.aws.api.cloudformation import ChangeAction
+from localstack.aws.api.cloudformation import ChangeAction, StackStatus
 from localstack.constants import INTERNAL_AWS_SECRET_ACCESS_KEY
 from localstack.services.cloudformation.engine.v2.change_set_model import (
+    NodeParameter,
     NodeResource,
-    NodeTemplate,
 )
 from localstack.services.cloudformation.engine.v2.change_set_model_preproc import (
     ChangeSetModelPreproc,
@@ -20,8 +21,8 @@ from localstack.services.cloudformation.resource_provider import (
     ProgressEvent,
     ResourceProviderExecutor,
     ResourceProviderPayload,
-    get_resource_type,
 )
+from localstack.services.cloudformation.v2.entities import ChangeSet
 
 LOG = logging.getLogger(__name__)
 
@@ -32,22 +33,27 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
 
     def __init__(
         self,
-        node_template: NodeTemplate,
-        account_id: str,
-        region: str,
-        stack_name: str,
-        stack_id: str,
+        change_set: ChangeSet,
     ):
-        super().__init__(node_template)
-        self.account_id = account_id
-        self.region = region
-        self.stack_name = stack_name
-        self.stack_id = stack_id
+        self.node_template = change_set.update_graph
+        super().__init__(self.node_template)
+        self.account_id = change_set.stack.account_id
+        self.region = change_set.stack.region_name
+        self.stack = change_set.stack
+        self.stack_name = self.stack.stack_name
+        self.stack_id = self.stack.stack_id
         self.resources = {}
+        self.resolved_parameters = {}
 
-    def execute(self) -> dict:
+    # TODO: use a structured type for the return value
+    def execute(self) -> tuple[dict, dict]:
         self.process()
-        return self.resources
+        return self.resources, self.resolved_parameters
+
+    def visit_node_parameter(self, node_parameter: NodeParameter) -> PreprocEntityDelta:
+        delta = super().visit_node_parameter(node_parameter=node_parameter)
+        self.resolved_parameters[node_parameter.name] = delta.after
+        return delta
 
     def visit_node_resource(
         self, node_resource: NodeResource
@@ -58,9 +64,22 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
         )
         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 _reduce_intrinsic_function_ref_value(self, preproc_value: PreprocResource | str) -> str:
+        # TODO: why is this here?
+        # if preproc_value is None:
+        #     return None
+        name = preproc_value
+        if isinstance(preproc_value, PreprocResource):
+            name = preproc_value.name
+        resource = self.resources.get(name)
+        if resource is None:
+            raise NotImplementedError(f"No resource '{preproc_value.name}' found")
+        physical_resource_id = resource.get("PhysicalResourceId")
+        if not physical_resource_id:
+            raise NotImplementedError(
+                f"no physical resource id found for resource '{preproc_value.name}'"
+            )
+        return physical_resource_id
 
     def _execute_on_resource_change(
         self, name: str, before: Optional[PreprocResource], after: Optional[PreprocResource]
@@ -70,22 +89,27 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
             # Case: change on same type.
             if before.resource_type == after.resource_type:
                 # Register a Modified if changed.
+                # XXX hacky, stick the previous resources' properties into the payload
+                before_properties = self._merge_before_properties(name, before)
+
                 self._execute_resource_action(
                     action=ChangeAction.Modify,
                     logical_resource_id=name,
                     resource_type=before.resource_type,
-                    before_properties=before.properties,
+                    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:
+                # XXX hacky, stick the previous resources' properties into the payload
+                before_properties = self._merge_before_properties(name, before)
                 # 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,
+                    before_properties=before_properties,
                     after_properties=None,
                 )
                 # Register a Create for the next type.
@@ -98,11 +122,15 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                 )
         elif before is not None:
             # Case: removal
+            # XXX hacky, stick the previous resources' properties into the payload
+            # XXX hacky, stick the previous resources' properties into the payload
+            before_properties = self._merge_before_properties(name, before)
+
             self._execute_resource_action(
                 action=ChangeAction.Remove,
                 logical_resource_id=name,
                 resource_type=before.resource_type,
-                before_properties=before.properties,
+                before_properties=before_properties,
                 after_properties=None,
             )
         elif after is not None:
@@ -115,6 +143,17 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                 after_properties=after.properties,
             )
 
+    def _merge_before_properties(
+        self, name: str, preproc_resource: PreprocResource
+    ) -> PreprocProperties:
+        if previous_resource_properties := self.stack.resolved_resources.get(name, {}).get(
+            "Properties"
+        ):
+            return PreprocProperties(properties=previous_resource_properties)
+
+        # XXX fall back to returning the input value
+        return copy.deepcopy(preproc_resource.properties)
+
     def _execute_resource_action(
         self,
         action: ChangeAction,
@@ -123,11 +162,10 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
         before_properties: Optional[PreprocProperties],
         after_properties: Optional[PreprocProperties],
     ) -> None:
+        LOG.debug("Executing resource action: %s for resource '%s'", action, logical_resource_id)
         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,
@@ -140,9 +178,22 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
         extra_resource_properties = {}
         if resource_provider is not None:
             # TODO: stack events
-            event = resource_provider_executor.deploy_loop(
-                resource_provider, extra_resource_properties, payload
-            )
+            try:
+                event = resource_provider_executor.deploy_loop(
+                    resource_provider, extra_resource_properties, payload
+                )
+            except Exception as e:
+                reason = str(e)
+                LOG.warning(
+                    "Resource provider operation failed: '%s'",
+                    reason,
+                    exc_info=LOG.isEnabledFor(logging.DEBUG),
+                )
+                if self.stack.status == StackStatus.CREATE_IN_PROGRESS:
+                    self.stack.set_stack_status(StackStatus.CREATE_FAILED, reason=reason)
+                elif self.stack.status == StackStatus.UPDATE_IN_PROGRESS:
+                    self.stack.set_stack_status(StackStatus.UPDATE_FAILED, reason=reason)
+                return
         else:
             event = ProgressEvent(OperationStatus.SUCCESS, resource_model={})
 
@@ -156,6 +207,18 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
                 # XXX for legacy delete_stack compatibility
                 self.resources[logical_resource_id]["LogicalResourceId"] = logical_resource_id
                 self.resources[logical_resource_id]["Type"] = resource_type
+            case OperationStatus.FAILED:
+                reason = event.message
+                LOG.warning(
+                    "Resource provider operation failed: '%s'",
+                    reason,
+                )
+                if self.stack.status == StackStatus.CREATE_IN_PROGRESS:
+                    self.stack.set_stack_status(StackStatus.CREATE_FAILED, reason=reason)
+                elif self.stack.status == StackStatus.UPDATE_IN_PROGRESS:
+                    self.stack.set_stack_status(StackStatus.UPDATE_FAILED, reason=reason)
+                else:
+                    raise NotImplementedError(f"Unhandled stack status: '{self.stack.status}'")
             case any:
                 raise NotImplementedError(f"Event status '{any}' not handled")
 
@@ -174,13 +237,21 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
             "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
+        after_properties_value = after_properties.properties if after_properties else None
+
+        match action:
+            case ChangeAction.Add:
+                resource_properties = after_properties_value or {}
+                previous_resource_properties = None
+            case ChangeAction.Modify | ChangeAction.Dynamic:
+                resource_properties = after_properties_value or {}
+                previous_resource_properties = before_properties_value or {}
+            case ChangeAction.Remove:
+                resource_properties = before_properties_value or {}
+                previous_resource_properties = None
+            case _:
+                raise NotImplementedError(f"Action '{action}' not handled")
+
         resource_provider_payload: ResourceProviderPayload = {
             "awsAccountId": self.account_id,
             "callbackContext": {},
@@ -193,7 +264,6 @@ class ChangeSetModelExecutor(ChangeSetModelPreproc):
             "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,

{localstack_core-4.3.1.dev57 → localstack_core-4.3.1.dev58}/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_preproc.py

@@ -173,20 +173,20 @@ class ChangeSetModelPreproc(ChangeSetModelVisitor):
                 return condition
         return None
 
-    def _resolve_reference(self, logica_id: str) -> PreprocEntityDelta:
-        node_condition = self._get_node_condition_if_exists(condition_name=logica_id)
+    def _resolve_reference(self, logical_id: str) -> PreprocEntityDelta:
+        node_condition = self._get_node_condition_if_exists(condition_name=logical_id)
         if isinstance(node_condition, NodeCondition):
             condition_delta = self.visit(node_condition)
             return condition_delta
 
-        node_parameter = self._get_node_parameter_if_exists(parameter_name=logica_id)
+        node_parameter = self._get_node_parameter_if_exists(parameter_name=logical_id)
         if isinstance(node_parameter, NodeParameter):
             parameter_delta = self.visit(node_parameter)
             return parameter_delta
 
         # TODO: check for KNOWN AFTER APPLY values for logical ids coming from intrinsic functions as arguments.
         node_resource = self._get_node_resource_for(
-            resource_name=logica_id, node_template=self._node_template
+            resource_name=logical_id, node_template=self._node_template
         )
         resource_delta = self.visit(node_resource)
         before = resource_delta.before
@@ -210,11 +210,11 @@ class ChangeSetModelPreproc(ChangeSetModelVisitor):
     ) -> PreprocEntityDelta:
         before = None
         if before_logical_id is not None:
-            before_delta = self._resolve_reference(logica_id=before_logical_id)
+            before_delta = self._resolve_reference(logical_id=before_logical_id)
             before = before_delta.before
         after = None
         if after_logical_id is not None:
-            after_delta = self._resolve_reference(logica_id=after_logical_id)
+            after_delta = self._resolve_reference(logical_id=after_logical_id)
             after = after_delta.after
         return PreprocEntityDelta(before=before, after=after)
 
@@ -335,7 +335,7 @@ class ChangeSetModelPreproc(ChangeSetModelVisitor):
 
         def _compute_delta_for_if_statement(args: list[Any]) -> PreprocEntityDelta:
             condition_name = args[0]
-            boolean_expression_delta = self._resolve_reference(logica_id=condition_name)
+            boolean_expression_delta = self._resolve_reference(logical_id=condition_name)
             return PreprocEntityDelta(
                 before=args[1] if boolean_expression_delta.before else args[2],
                 after=args[1] if boolean_expression_delta.after else args[2],
@@ -404,7 +404,7 @@ class ChangeSetModelPreproc(ChangeSetModelVisitor):
         delta = self.visit(node_condition.body)
         return delta
 
-    def _reduce_intrinsic_function_ref_value(self, preproc_value: Any) -> Any:
+    def _reduce_intrinsic_function_ref_value(self, preproc_value: PreprocResource | str) -> str:
         if isinstance(preproc_value, PreprocResource):
             value = preproc_value.name
         else:
@@ -420,16 +420,23 @@ class ChangeSetModelPreproc(ChangeSetModelVisitor):
         before_logical_id = arguments_delta.before
         before = None
         if before_logical_id is not None:
-            before_delta = self._resolve_reference(logica_id=before_logical_id)
+            before_delta = self._resolve_reference(logical_id=before_logical_id)
             before_value = before_delta.before
-            before = self._reduce_intrinsic_function_ref_value(before_value)
+            if isinstance(before_value, str):
+                before = before_value
+            else:
+                before = self._reduce_intrinsic_function_ref_value(before_value)
 
         after_logical_id = arguments_delta.after
         after = None
         if after_logical_id is not None:
-            after_delta = self._resolve_reference(logica_id=after_logical_id)
+            after_delta = self._resolve_reference(logical_id=after_logical_id)
             after_value = after_delta.after
-            after = self._reduce_intrinsic_function_ref_value(after_value)
+            # TODO: swap isinstance to be a structured type check
+            if isinstance(after_value, str):
+                after = after_value
+            else:
+                after = self._reduce_intrinsic_function_ref_value(after_value)
 
         return PreprocEntityDelta(before=before, after=after)
 

{localstack_core-4.3.1.dev57 → localstack_core-4.3.1.dev58}/localstack-core/localstack/services/cloudformation/resource_provider.py

@@ -444,9 +444,7 @@ class ResourceProviderExecutor:
         max_iterations = max(ceil(max_timeout / sleep_time), 2)
 
         for current_iteration in range(max_iterations):
-            resource_type = get_resource_type(
-                {"Type": raw_payload["resourceType"]}
-            )  # TODO: simplify signature of get_resource_type to just take the type
+            resource_type = raw_payload["resourceType"]
             resource["SpecifiedProperties"] = raw_payload["requestData"]["resourceProperties"]
 
             try:

{localstack_core-4.3.1.dev57 → localstack_core-4.3.1.dev58}/localstack-core/localstack/services/cloudformation/stores.py

@@ -3,6 +3,8 @@ from typing import Optional
 
 from localstack.aws.api.cloudformation import StackStatus
 from localstack.services.cloudformation.engine.entities import Stack, StackChangeSet, StackSet
+from localstack.services.cloudformation.v2.entities import ChangeSet as ChangeSetV2
+from localstack.services.cloudformation.v2.entities import Stack as StackV2
 from localstack.services.stores import AccountRegionBundle, BaseStore, LocalAttribute
 
 LOG = logging.getLogger(__name__)
@@ -11,6 +13,9 @@ LOG = logging.getLogger(__name__)
 class CloudFormationStore(BaseStore):
     # maps stack ID to stack details
     stacks: dict[str, Stack] = LocalAttribute(default=dict)
+    stacks_v2: dict[str, StackV2] = LocalAttribute(default=dict)
+
+    change_sets: dict[str, ChangeSetV2] = LocalAttribute(default=dict)
 
     # maps stack set ID to stack set details
     stack_sets: dict[str, StackSet] = LocalAttribute(default=dict)