Skip findinmap resolution when hitting a Sub

aws-cloudformation · Dec 5, 2024 · 48172e3 · 48172e3
1 parent 58dc21c
commit 48172e3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/cfnlint/jsonschema/_resolvers_cfn.py b/src/cfnlint/jsonschema/_resolvers_cfn.py
@@ -201,6 +201,9 @@ def find_in_map(validator: Validator, instance: Any) -> ResolutionResult:
             ):
                 continue
 
+            second_level_fn, _ = is_function(instance[2])
+            if second_level_fn == "Fn::Sub":
+                continue
             for second_level_key, second_v, err in validator.resolve_value(instance[2]):
                 if validator.is_type(second_level_key, "integer"):
                     second_level_key = str(second_level_key)

diff --git a/test/unit/module/jsonschema/test_resolvers_cfn.py b/test/unit/module/jsonschema/test_resolvers_cfn.py
@@ -480,6 +480,17 @@ def test_invalid_functions(name, instance, response):
             {"Fn::FindInMap": ["transformSecondKey", "first", "third"]},
             [],
         ),
+        (
+            "Valid FindInMap using a Sub",
+            {
+                "Fn::FindInMap": [
+                    "transformSecondKey",
+                    "first",
+                    {"Fn::Sub": "${AWS::AccountId}Extra"},
+                ]
+            },
+            [],
+        ),
         (
             "Valid Sub with a resolvable values",
             {"Fn::Sub": ["${a}-${b}", {"a": "foo", "b": "bar"}]},