Remove transform section of a template

pinzon · pinzon · commit ebe637a87846 · 2025-08-07T17:35:56.000-05:00
diff --git a/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_transform.py b/localstack-core/localstack/services/cloudformation/engine/v2/change_set_model_transform.py
@@ -4,6 +4,7 @@
 from typing import Any, Final, Optional, TypedDict
 
 import boto3
+import jsonpath_ng
 from botocore.exceptions import ClientError
 from samtranslator.translator.transform import transform as transform_sam
 
@@ -199,7 +200,6 @@ def _apply_global_macro_transformation(
             stack_parameters=parameters,
             transformation_parameters=transformation_parameters,
         )
-        # The type annotation on the v1 util appears to be incorrect.
         return transformed_template  # noqa
 
     def _apply_global_transform(
@@ -256,31 +256,32 @@ def transform(self) -> tuple[dict, dict]:
 
         transformed_before_template = self._before_template
         if transform_before and not is_nothing(self._before_template):
-            transformed_before_template = self._before_cache.get(_SCOPE_TRANSFORM_TEMPLATE_OUTCOME)
-            if not transformed_before_template:
-                transformed_before_template = self._before_template
-                for before_global_transform in transform_before:
-                    if not is_nothing(before_global_transform.name):
-                        transformed_before_template = self._apply_global_transform(
-                            global_transform=before_global_transform,
-                            parameters=parameters_before,
-                            template=transformed_before_template,
-                        )
-                self._before_cache[_SCOPE_TRANSFORM_TEMPLATE_OUTCOME] = transformed_before_template
+            transformed_before_template = self._before_template
+            for before_global_transform in transform_before:
+                if not is_nothing(before_global_transform.name):
+                    transformed_before_template = self._apply_global_transform(
+                        global_transform=before_global_transform,
+                        parameters=parameters_before,
+                        template=transformed_before_template,
+                    )
+
+            # Macro transformations won't remove the transform from the template
+            transformed_before_template.pop("Transform", "")
+            self._before_cache[_SCOPE_TRANSFORM_TEMPLATE_OUTCOME] = transformed_before_template
 
         transformed_after_template = self._after_template
         if transform_after and not is_nothing(self._after_template):
-            transformed_after_template = self._after_cache.get(_SCOPE_TRANSFORM_TEMPLATE_OUTCOME)
-            if not transformed_after_template:
-                transformed_after_template = self._after_template
-                for after_global_transform in transform_after:
-                    if not is_nothing(after_global_transform.name):
-                        transformed_after_template = self._apply_global_transform(
-                            global_transform=after_global_transform,
-                            parameters=parameters_after,
-                            template=transformed_after_template,
-                        )
-                self._after_cache[_SCOPE_TRANSFORM_TEMPLATE_OUTCOME] = transformed_after_template
+            transformed_after_template = self._after_template
+            for after_global_transform in transform_after:
+                if not is_nothing(after_global_transform.name):
+                    transformed_after_template = self._apply_global_transform(
+                        global_transform=after_global_transform,
+                        parameters=parameters_after,
+                        template=transformed_after_template,
+                    )
+            # Macro transformations won't remove the transform from the template
+            transformed_after_template.pop("Transform", "")
+            self._after_cache[_SCOPE_TRANSFORM_TEMPLATE_OUTCOME] = transformed_after_template
 
         self._save_runtime_cache()
 
@@ -394,7 +395,6 @@ def _normalize_transform(obj):
     def _replace_at_jsonpath(self, template, node, result):
         path = node.scope.to_jsonpath()
         parent_path = ".".join(path.split(".")[:-1])
-        import jsonpath_ng
 
         pattern = jsonpath_ng.parse(parent_path)
         result_template = pattern.update(template, result)
diff --git a/tests/aws/services/cloudformation/test_template_engine.py b/tests/aws/services/cloudformation/test_template_engine.py
@@ -632,7 +632,6 @@ def test_macro_deployment(
         snapshot.match("stack_outputs", stack_with_macro.outputs)
         snapshot.match("stack_resource_descriptions", description)
 
-    @skip_if_v2_provider(reason="CFNV2:Macros")
     @markers.aws.validated
     @markers.snapshot.skip_snapshot_verify(
         paths=[
