From e838e547f11347cdf334d7312a0c761383d90ad8 Mon Sep 17 00:00:00 2001 From: Kevin DeJong Date: Wed, 2 Oct 2024 09:29:10 -0700 Subject: [PATCH 1/3] Update Transform section to original Transforms --- src/cfnlint/context/__init__.py | 7 ++++++- src/cfnlint/template/transforms/transform.py | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/cfnlint/context/__init__.py b/src/cfnlint/context/__init__.py index 0d4e0154ef..8b2940f3fd 100644 --- a/src/cfnlint/context/__init__.py +++ b/src/cfnlint/context/__init__.py @@ -1,3 +1,8 @@ __all__ = ["Context", "create_context_for_template"] -from cfnlint.context.context import Context, Path, create_context_for_template +from cfnlint.context.context import ( + Context, + Path, + Transforms, + create_context_for_template, +) diff --git a/src/cfnlint/template/transforms/transform.py b/src/cfnlint/template/transforms/transform.py index 62d1f9b76e..8ab49998d0 100644 --- a/src/cfnlint/template/transforms/transform.py +++ b/src/cfnlint/template/transforms/transform.py @@ -9,7 +9,7 @@ from typing import Any, Callable, Mapping from cfnlint.conditions import Conditions -from cfnlint.context import create_context_for_template +from cfnlint.context import Transforms, create_context_for_template from cfnlint.graph import Graph from cfnlint.helpers import format_json_string from cfnlint.match import Match @@ -63,5 +63,7 @@ def transform(self, cfn: Any) -> list[Match]: LOGGER.info("Transformed template: \n%s", format_json_string(cfn.template)) cfn.graph = Graph(cfn) cfn.conditions = Conditions(cfn) - cfn.context = create_context_for_template(cfn) + cfn.context = create_context_for_template(cfn).evolve( + transforms=Transforms(cfn.transform_pre["Transform"]) + ) return matches From ceb645c052d70dcecab6f56b395035cdc230cbda Mon Sep 17 00:00:00 2001 From: Kevin DeJong Date: Wed, 2 Oct 2024 09:30:21 -0700 Subject: [PATCH 2/3] Update Transform section to original Transforms --- src/cfnlint/rules/resources/properties/Pattern.py | 2 +- src/cfnlint/template/transforms/transform.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/cfnlint/rules/resources/properties/Pattern.py b/src/cfnlint/rules/resources/properties/Pattern.py index 52b758727a..a8a2055b00 100644 --- a/src/cfnlint/rules/resources/properties/Pattern.py +++ b/src/cfnlint/rules/resources/properties/Pattern.py @@ -50,7 +50,7 @@ def pattern( self, validator: Validator, patrn: str, instance: Any, schema: Any ) -> ValidationResult: # https://github.com/aws-cloudformation/cfn-lint/issues/3640 - if validator.context.transforms.has_sam_transform(): + if validator.cfn.has_serverless_transform(): for _, param in validator.context.parameters.items(): if param.is_ssm_parameter(): if param.ssm_path == instance: diff --git a/src/cfnlint/template/transforms/transform.py b/src/cfnlint/template/transforms/transform.py index 8ab49998d0..62d1f9b76e 100644 --- a/src/cfnlint/template/transforms/transform.py +++ b/src/cfnlint/template/transforms/transform.py @@ -9,7 +9,7 @@ from typing import Any, Callable, Mapping from cfnlint.conditions import Conditions -from cfnlint.context import Transforms, create_context_for_template +from cfnlint.context import create_context_for_template from cfnlint.graph import Graph from cfnlint.helpers import format_json_string from cfnlint.match import Match @@ -63,7 +63,5 @@ def transform(self, cfn: Any) -> list[Match]: LOGGER.info("Transformed template: \n%s", format_json_string(cfn.template)) cfn.graph = Graph(cfn) cfn.conditions = Conditions(cfn) - cfn.context = create_context_for_template(cfn).evolve( - transforms=Transforms(cfn.transform_pre["Transform"]) - ) + cfn.context = create_context_for_template(cfn) return matches From 75484e29da04e1777bba64ee6d80aa626c95e39f Mon Sep 17 00:00:00 2001 From: Kevin DeJong Date: Wed, 2 Oct 2024 09:31:10 -0700 Subject: [PATCH 3/3] Update Transform section to original Transforms --- src/cfnlint/context/__init__.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/cfnlint/context/__init__.py b/src/cfnlint/context/__init__.py index 8b2940f3fd..0d4e0154ef 100644 --- a/src/cfnlint/context/__init__.py +++ b/src/cfnlint/context/__init__.py @@ -1,8 +1,3 @@ __all__ = ["Context", "create_context_for_template"] -from cfnlint.context.context import ( - Context, - Path, - Transforms, - create_context_for_template, -) +from cfnlint.context.context import Context, Path, create_context_for_template