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

localstack/services/cloudformation/engine/v2/change_set_model_validator.py

@@ -1,9 +1,12 @@
 import re
 from typing import Any
 
+from botocore.exceptions import ParamValidationError
+
 from localstack.services.cloudformation.engine.v2.change_set_model import (
-    Maybe,
     NodeIntrinsicFunction,
+    NodeProperty,
+    NodeResource,
     NodeTemplate,
     Nothing,
     is_nothing,
@@ -23,23 +26,15 @@ class ChangeSetModelValidator(ChangeSetModelPreproc):
     def visit_node_template(self, node_template: NodeTemplate):
         self.visit(node_template.mappings)
         self.visit(node_template.resources)
+        self.visit(node_template.parameters)
 
     def visit_node_intrinsic_function_fn_get_att(
         self, node_intrinsic_function: NodeIntrinsicFunction
     ) -> PreprocEntityDelta:
-        arguments_delta = self.visit(node_intrinsic_function.arguments)
-        before_arguments: Maybe[str | list[str]] = arguments_delta.before
-        after_arguments: Maybe[str | list[str]] = arguments_delta.after
-
-        before = self._before_cache.get(node_intrinsic_function.scope, Nothing)
-        if is_nothing(before) and not is_nothing(before_arguments):
-            before = ".".join(before_arguments)
-
-        after = self._after_cache.get(node_intrinsic_function.scope, Nothing)
-        if is_nothing(after) and not is_nothing(after_arguments):
-            after = ".".join(after_arguments)
-
-        return PreprocEntityDelta(before=before, after=after)
+        try:
+            return super().visit_node_intrinsic_function_fn_get_att(node_intrinsic_function)
+        except RuntimeError:
+            return self.visit(node_intrinsic_function.arguments)
 
     def visit_node_intrinsic_function_fn_sub(
         self, node_intrinsic_function: NodeIntrinsicFunction
@@ -139,3 +134,50 @@ class ChangeSetModelValidator(ChangeSetModelPreproc):
         if is_nothing(after) and not is_nothing(arguments_after):
             after = _compute_sub(args=arguments_after, select_before=False)
         return PreprocEntityDelta(before=before, after=after)
+
+    def visit_node_intrinsic_function_fn_transform(
+        self, node_intrinsic_function: NodeIntrinsicFunction
+    ):
+        # TODO Research this issue:
+        # Function is already resolved in the template reaching this point
+        # But transformation is still present in update model
+        return self.visit(node_intrinsic_function.arguments)
+
+    def visit_node_intrinsic_function_fn_split(
+        self, node_intrinsic_function: NodeIntrinsicFunction
+    ) -> PreprocEntityDelta:
+        try:
+            # If an argument is a Parameter it should be resolved, any other case, ignore it
+            return super().visit_node_intrinsic_function_fn_split(node_intrinsic_function)
+        except RuntimeError:
+            return self.visit(node_intrinsic_function.arguments)
+
+    def visit_node_intrinsic_function_fn_select(
+        self, node_intrinsic_function: NodeIntrinsicFunction
+    ) -> PreprocEntityDelta:
+        try:
+            # If an argument is a Parameter it should be resolved, any other case, ignore it
+            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)
+
+    def visit_node_property(self, node_property: NodeProperty) -> PreprocEntityDelta:
+        try:
+            return super().visit_node_property(node_property)
+        except ParamValidationError:
+            return self.visit(node_property.value)
+
+    # ignore errors from dynamic replacements
+    def _maybe_perform_dynamic_replacements(self, delta: PreprocEntityDelta) -> PreprocEntityDelta:
+        try:
+            return super()._maybe_perform_dynamic_replacements(delta)
+        except Exception:
+            return delta

localstack/services/cloudformation/engine/v2/change_set_model_visitor.py

@@ -54,6 +54,7 @@ class ChangeSetModelVisitor(abc.ABC):
         # entities (parameters, mappings, conditions, etc.). Then compute the output fields; computing
         # only the output fields would only result in the deployment logic of the referenced outputs
         # being evaluated, hence enforce the visiting of all the resources first.
+        self.visit(node_template.conditions)
         self.visit(node_template.resources)
         self.visit(node_template.outputs)
 

localstack/services/cloudformation/engine/v2/resolving.py

@@ -1,3 +1,4 @@
+import json
 import logging
 import re
 from dataclasses import dataclass
@@ -6,11 +7,12 @@ from typing import Any
 from botocore.exceptions import ClientError
 
 from localstack.aws.connect import connect_to
-from localstack.utils import json
 
 LOG = logging.getLogger(__name__)
 
-REGEX_DYNAMIC_REF = re.compile(r"{{resolve:([^:]+):(.+)}}")
+# CloudFormation allows using dynamic references in `Fn::Sub` expressions, so we must make sure
+# we don't capture the parameter usage by excluding ${} characters
+REGEX_DYNAMIC_REF = re.compile(r"{{resolve:([^:]+):([^${}]+)}}")
 
 
 @dataclass
@@ -21,7 +23,7 @@ class DynamicReference:
 
 def extract_dynamic_reference(value: Any) -> DynamicReference | None:
     if isinstance(value, str):
-        if dynamic_ref_match := REGEX_DYNAMIC_REF.match(value):
+        if dynamic_ref_match := REGEX_DYNAMIC_REF.search(value):
             return DynamicReference(dynamic_ref_match[1], dynamic_ref_match[2])
     return None
 
@@ -90,9 +92,9 @@ def perform_dynamic_reference_lookup(
                 raise RuntimeError(
                     f"JSON value for {reference.service_name}.{reference.reference_key} not present"
                 )
-            return json_secret[json_key]
+            return str(json_secret[json_key])
         else:
-            return secret_value
+            return str(secret_value)
 
     LOG.warning(
         "Unsupported service for dynamic parameter: service_name=%s", reference.service_name

localstack/services/cloudformation/engine/yaml_parser.py

@@ -1,5 +1,7 @@
 import yaml
 
+from localstack.services.cloudformation.engine.validations import ValidationError
+
 
 def construct_raw(_, node):
     return node.value
@@ -60,5 +62,10 @@ customloader = NoDatesSafeLoader
 yaml.add_multi_constructor("!", shorthand_constructor, customloader)
 
 
-def parse_yaml(input_data: str):
-    return yaml.load(input_data, customloader)
+def parse_yaml(input_data: str) -> dict:
+    parsed = yaml.load(input_data, Loader=customloader)
+
+    if not isinstance(parsed, dict):
+        raise ValidationError("Template format error: unsupported structure.")
+
+    return parsed

localstack/services/cloudformation/provider.py

@@ -159,7 +159,7 @@ def find_stack_instance(stack_set: StackSet, account: str, region: str):
 
 def stack_not_found_error(stack_name: str):
     # FIXME
-    raise ValidationError("Stack with id %s does not exist" % stack_name)
+    raise ValidationError(f"Stack with id {stack_name} does not exist")
 
 
 def not_found_error(message: str):
@@ -305,8 +305,8 @@ class CloudformationProvider(CloudformationApi):
             deployer.deploy_stack()
         except Exception as e:
             stack.set_stack_status("CREATE_FAILED")
-            msg = 'Unable to create stack "%s": %s' % (stack.stack_name, e)
-            LOG.exception("%s")
+            msg = f'Unable to create stack "{stack.stack_name}": {e}'
+            LOG.error("%s", exc_info=LOG.isEnabledFor(logging.DEBUG))
             raise ValidationError(msg) from e
 
         return CreateStackOutput(StackId=stack.stack_id)
@@ -423,7 +423,7 @@ class CloudformationProvider(CloudformationApi):
         except Exception as e:
             stack.set_stack_status("UPDATE_FAILED")
             msg = f'Unable to update stack "{stack_name}": {e}'
-            LOG.exception("%s", msg)
+            LOG.error("%s", msg, exc_info=LOG.isEnabledFor(logging.DEBUG))
             raise ValidationError(msg) from e
 
         return UpdateStackOutput(StackId=stack.stack_id)
@@ -605,6 +605,8 @@ class CloudformationProvider(CloudformationApi):
         req_params = request
         change_set_type = req_params.get("ChangeSetType", "UPDATE")
         stack_name = req_params.get("StackName")
+        if not stack_name:
+            raise ValidationError("Member must have length greater than or equal to 1")
         change_set_name = req_params.get("ChangeSetName")
         template_body = req_params.get("TemplateBody")
         # s3 or secretsmanager url
@@ -1052,7 +1054,7 @@ class CloudformationProvider(CloudformationApi):
                 Description=valid_template.get("Description"), Parameters=parameters
             )
         except Exception as e:
-            LOG.exception("Error validating template")
+            LOG.error("Error validating template", exc_info=LOG.isEnabledFor(logging.DEBUG))
             raise ValidationError("Template Validation Error") from e
 
     # =======================================

localstack/services/cloudformation/resource_provider.py

@@ -518,10 +518,14 @@ class ResourceProviderExecutor:
                 try:
                     return resource_provider.update(request)
                 except NotImplementedError:
+                    feature_request_url = "https://github.com/localstack/localstack/issues/new?template=feature-request.yml"
                     LOG.warning(
-                        'Unable to update resource type "%s", id "%s"',
+                        'Unable to update resource type "%s", id "%s", '
+                        "the update operation is not implemented for this resource. "
+                        "Please consider submitting a feature request at this URL: %s",
                         request.resource_type,
                         request.logical_resource_id,
+                        feature_request_url,
                     )
                     if request.previous_state is None:
                         # this is an issue with our update detection. We should never be in this state.
@@ -563,6 +567,8 @@ class ResourceProviderExecutor:
     @staticmethod
     def try_load_resource_provider(resource_type: str) -> ResourceProvider | None:
         # TODO: unify namespace of plugins
+        if resource_type and resource_type.startswith("Custom"):
+            resource_type = "AWS::CloudFormation::CustomResource"
 
         # 1. try to load pro resource provider
         # prioritise pro resource providers