localstack · dominikschubert · Jun 28, 2023 · Jun 7, 2023 · Jun 12, 2023 · Jun 12, 2023
diff --git a/localstack/services/cloudformation/engine/entities.py b/localstack/services/cloudformation/engine/entities.py
@@ -104,6 +104,7 @@ def __init__(
         self.events = []
         # list of stack change sets
         self.change_sets = []
+        # self.evaluated_conditions = {}
 
     def set_resolved_parameters(self, resolved_parameters: dict[str, Parameter]):
         self.resolved_parameters = resolved_parameters
@@ -247,21 +248,14 @@ def resources(self):  # TODO: not actually resources, split apart
             {k: map_to_legacy_structure(k, v) for k, v in self.resolved_parameters.items()}
         )
 
-        # TODO: conditions and mappings don't really belong here and should be handled separately
+        # TODO: conditions don't really belong here and should be handled separately
         for name, value in self.conditions.items():
             if name not in result:
                 result[name] = {
                     "Type": "Parameter",
                     "LogicalResourceId": name,
                     "Properties": {"Value": value},
                 }
-        for name, value in self.mappings.items():
-            if name not in result:
-                result[name] = {
-                    "Type": "Parameter",
-                    "LogicalResourceId": name,
-                    "Properties": {"Value": value},
-                }
 
         return result
 

diff --git a/localstack/services/cloudformation/engine/template_deployer.py b/localstack/services/cloudformation/engine/template_deployer.py
diff --git a/localstack/services/cloudformation/engine/template_preparer.py b/localstack/services/cloudformation/engine/template_preparer.py
@@ -40,12 +40,14 @@ def template_to_json(template: str) -> str:
 
 
 # TODO: consider moving to transformers.py as well
-def transform_template(template: dict, parameters: list, stack_name: str, resources: dict) -> dict:
+def transform_template(
+    template: dict, parameters: list, stack_name: str, resources: dict, mappings: dict
+) -> dict:
     result = dict(template)
 
     # apply 'Fn::Transform' intrinsic functions (note: needs to be applied before global
     #  transforms below, as some utils - incl samtransformer - expect them to be resolved already)
-    result = apply_transform_intrinsic_functions(result, stack_name, resources)
+    result = apply_transform_intrinsic_functions(result, stack_name, resources, mappings)
 
     # apply global transforms
     transformations = format_transforms(result.get("Transform", []))

diff --git a/localstack/services/cloudformation/engine/transformers.py b/localstack/services/cloudformation/engine/transformers.py
@@ -39,7 +39,9 @@ def transform(self, parameters: dict) -> TransformResult:
 transformers: Dict[str, Type] = {"AWS::Include": AwsIncludeTransformer}
 
 
-def apply_transform_intrinsic_functions(template: dict, stack_name: str, resources: dict) -> dict:
+def apply_transform_intrinsic_functions(
+    template: dict, stack_name: str, resources: dict, mappings: dict
+) -> dict:
     """Resolve constructs using the 'Fn::Transform' intrinsic function."""
     from localstack.services.cloudformation.engine.template_deployer import resolve_refs_recursively
 
@@ -51,7 +53,7 @@ def _visit(obj, **_):
             if transformer_class:
                 transformer = transformer_class()
                 parameters = transform.get("Parameters") or {}
-                parameters = resolve_refs_recursively(stack_name, resources, parameters)
+                parameters = resolve_refs_recursively(stack_name, resources, mappings, parameters)
                 return transformer.transform(parameters)
         return obj
 

diff --git a/localstack/services/cloudformation/provider.py b/localstack/services/cloudformation/provider.py
@@ -189,6 +189,7 @@ def create_stack(self, context: RequestContext, request: CreateStackInput) -> Cr
                 "Requires capabilities : [CAPABILITY_AUTO_EXPAND]"
             )
 
+        # resolve stack parameters
         new_parameters: dict[str, Parameter] = param_resolver.convert_stack_parameters_to_dict(
             request.get("Parameters")
         )
@@ -199,11 +200,16 @@ def create_stack(self, context: RequestContext, request: CreateStackInput) -> Cr
             old_parameters={},
         )
 
+        # handle conditions
         stack = Stack(request, template)
 
         try:
             template = template_preparer.transform_template(
-                template, list(resolved_parameters.values()), stack.stack_name, stack.resources
+                template,
+                list(resolved_parameters.values()),
+                stack.stack_name,
+                stack.resources,
+                stack.mappings,
             )
         except FailedTransformationException as e:
             stack.add_stack_event(
@@ -283,7 +289,11 @@ def update_stack(
 
         try:
             template = template_preparer.transform_template(
-                template, list(resolved_parameters.values()), stack.stack_name, stack.resources
+                template,
+                list(resolved_parameters.values()),
+                stack.stack_name,
+                stack.resources,
+                stack.mappings,
             )
         except FailedTransformationException as e:
             stack.add_stack_event(
@@ -506,7 +516,7 @@ def create_change_set(
             )
             raise ValidationError(msg)
 
-        # apply template transformations
+        # resolve parameters
         new_parameters: dict[str, Parameter] = param_resolver.convert_stack_parameters_to_dict(
             request.get("Parameters")
         )
@@ -526,15 +536,24 @@ def create_change_set(
         temp_stack = Stack(req_params_copy, template)
         temp_stack.set_resolved_parameters(resolved_parameters)
 
+        # TODO: everything below should be async
+        # apply template transformations
         transformed_template = template_preparer.transform_template(
-            template, parameters, stack_name=temp_stack.stack_name, resources=temp_stack.resources
+            template,
+            parameters,
+            stack_name=temp_stack.stack_name,
+            resources=temp_stack.resources,
+            mappings=temp_stack.mappings,
         )
 
         # create change set for the stack and apply changes
         change_set = StackChangeSet(stack, req_params, transformed_template)
         # only set parameters for the changeset, then switch to stack on execute_change_set
         change_set.set_resolved_parameters(resolved_parameters)
 
+        # TODO: evaluate conditions
+        # change_set.set_resolved_conditions(resolved_conditions)
+
         deployer = template_deployer.TemplateDeployer(change_set)
         changes = deployer.construct_changes(
             stack,

diff --git a/localstack/services/cloudformation/resource_provider.py b/localstack/services/cloudformation/resource_provider.py
@@ -397,12 +397,13 @@ def update(self, request: ResourceRequest[Properties]) -> ProgressEvent[Properti
                 request.logical_resource_id,
             )
             # TODO: should not really claim the update was successful, but the
-            # API does not really let us signal this in any other way.
+            #   API does not really let us signal this in any other way.
             return ProgressEvent(
                 status=OperationStatus.SUCCESS, resource_model=request.desired_state
             )
 
         LOG.info("Updating resource %s of type %s", request.logical_resource_id, self.resource_type)
+
         resource_provider.update_resource(
             self.all_resources[request.logical_resource_id],
             stack_name=request.stack_name,
@@ -431,6 +432,11 @@ def create_or_delete(self, request: ResourceRequest[Properties]) -> ProgressEven
             },
             region_name=request.region_name,
         )
+        # TODO: only really necessary for the create and update operation
+        resource_provider.add_defaults(
+            self.all_resources[request.logical_resource_id], request.stack_name
+        )
+
         func_details = resource_provider.get_deploy_templates()
         # TODO: be less strict about the return value of func_details
         LOG.debug(

diff --git a/tests/integration/cloudformation/engine/__init__.py b/tests/integration/cloudformation/engine/__init__.py