Create a schema manager for non resource schemas (#4131)

* Create a schema manager for non resource schemas

Author: kddejong

src/cfnlint/rules/functions/Base64.py

@@ -3,9 +3,8 @@
 SPDX-License-Identifier: MIT-0
 """
 
-import cfnlint.data.schemas.other.functions
 from cfnlint.helpers import FUNCTIONS_SINGLE
-from cfnlint.rules.functions._BaseFn import BaseFn, SchemaDetails
+from cfnlint.rules.functions._BaseFn import BaseFn
 
 
 class Base64(BaseFn):
@@ -22,8 +21,5 @@ def __init__(self) -> None:
             "Fn::Base64",
             ("string",),
             tuple(FUNCTIONS_SINGLE),
-            schema_details=SchemaDetails(
-                cfnlint.data.schemas.other.functions, "base64.json"
-            ),
         )
         self.fn_base64 = self.validate

src/cfnlint/rules/functions/Cidr.py

@@ -5,8 +5,7 @@
 
 from __future__ import annotations
 
-import cfnlint.data.schemas.other.functions
-from cfnlint.rules.functions._BaseFn import BaseFn, SchemaDetails
+from cfnlint.rules.functions._BaseFn import BaseFn
 
 
 class Cidr(BaseFn):
@@ -23,8 +22,5 @@ def __init__(self) -> None:
             "Fn::Cidr",
             ("array",),
             None,
-            schema_details=SchemaDetails(
-                cfnlint.data.schemas.other.functions, "cidr.json"
-            ),
         )
         self.fn_cidr = self.validate

src/cfnlint/rules/functions/FindInMap.py

@@ -5,8 +5,7 @@
 
 from __future__ import annotations
 
-import cfnlint.data.schemas.other.functions
-from cfnlint.rules.functions._BaseFn import BaseFn, SchemaDetails, singular_types
+from cfnlint.rules.functions._BaseFn import BaseFn, singular_types
 
 
 class FindInMap(BaseFn):
@@ -22,9 +21,6 @@ def __init__(self) -> None:
         super().__init__(
             "Fn::FindInMap",
             ("array",) + singular_types,
-            schema_details=SchemaDetails(
-                cfnlint.data.schemas.other.functions, "findinmap.json"
-            ),
             resolved_rule="W1034",
         )
         self.fn_findinmap = self.validate

src/cfnlint/rules/functions/GetAtt.py

@@ -10,10 +10,9 @@
 
 import regex as re
 
-import cfnlint.data.schemas.other.functions
 from cfnlint.helpers import ensure_list, is_types_compatible
 from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
-from cfnlint.rules.functions._BaseFn import BaseFn, SchemaDetails, all_types
+from cfnlint.rules.functions._BaseFn import BaseFn, all_types
 from cfnlint.schema import PROVIDER_SCHEMA_MANAGER
 
 
@@ -33,9 +32,6 @@ def __init__(self) -> None:
         super().__init__(
             "Fn::GetAtt",
             all_types,
-            schema_details=SchemaDetails(
-                cfnlint.data.schemas.other.functions, "getatt.json"
-            ),
         )
 
     def _resolve_getatt(

src/cfnlint/rules/functions/If.py

@@ -8,10 +8,9 @@
 from collections import deque
 from typing import Any
 
-import cfnlint.data.schemas.other.functions
 from cfnlint.context.conditions.exceptions import Unsatisfiable
 from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
-from cfnlint.rules.functions._BaseFn import BaseFn, SchemaDetails, all_types
+from cfnlint.rules.functions._BaseFn import BaseFn, all_types
 
 
 class If(BaseFn):
@@ -27,9 +26,6 @@ def __init__(self) -> None:
         super().__init__(
             "Fn::If",
             all_types,
-            schema_details=SchemaDetails(
-                cfnlint.data.schemas.other.functions, "if.json"
-            ),
         )
         self.child_rules["W1028"] = None
 

src/cfnlint/rules/functions/ImportValue.py

@@ -5,9 +5,8 @@
 
 from typing import Any, Iterator
 
-import cfnlint.data.schemas.other.functions
 from cfnlint.jsonschema import ValidationError, Validator
-from cfnlint.rules.functions._BaseFn import BaseFn, SchemaDetails, singular_types
+from cfnlint.rules.functions._BaseFn import BaseFn, singular_types
 
 
 class ImportValue(BaseFn):
@@ -23,9 +22,6 @@ def __init__(self) -> None:
         super().__init__(
             "Fn::ImportValue",
             singular_types,
-            schema_details=SchemaDetails(
-                cfnlint.data.schemas.other.functions, "importvalue.json"
-            ),
         )
         self.child_rules = {
             "W6001": None,

src/cfnlint/rules/functions/Join.py

@@ -7,10 +7,9 @@
 
 from typing import Any
 
-import cfnlint.data.schemas.other.functions
 from cfnlint.jsonschema import ValidationResult
 from cfnlint.jsonschema.protocols import Validator
-from cfnlint.rules.functions._BaseFn import BaseFn, SchemaDetails
+from cfnlint.rules.functions._BaseFn import BaseFn
 
 
 class Join(BaseFn):
@@ -27,9 +26,6 @@ def __init__(self) -> None:
             "Fn::Join",
             ("string",),
             resolved_rule="W1032",
-            schema_details=SchemaDetails(
-                cfnlint.data.schemas.other.functions, "join.json"
-            ),
         )
         self.child_rules.update(
             {

src/cfnlint/rules/functions/Length.py

@@ -7,9 +7,8 @@
 
 from typing import Any
 
-import cfnlint.data.schemas.other.functions
 from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
-from cfnlint.rules.functions._BaseFn import BaseFn, SchemaDetails
+from cfnlint.rules.functions._BaseFn import BaseFn
 
 
 class Length(BaseFn):
@@ -25,9 +24,6 @@ def __init__(self) -> None:
         super().__init__(
             "Fn::Length",
             ("integer",),
-            schema_details=SchemaDetails(
-                cfnlint.data.schemas.other.functions, "length.json"
-            ),
         )
 
     def fn_length(

src/cfnlint/rules/functions/Ref.py

@@ -7,10 +7,9 @@
 
 from typing import Any
 
-import cfnlint.data.schemas.other.functions
 from cfnlint.helpers import VALID_PARAMETER_TYPES, VALID_PARAMETER_TYPES_LIST
 from cfnlint.jsonschema import ValidationError, Validator
-from cfnlint.rules.functions._BaseFn import BaseFn, SchemaDetails, all_types
+from cfnlint.rules.functions._BaseFn import BaseFn, all_types
 
 
 class Ref(BaseFn):
@@ -27,9 +26,6 @@ def __init__(self) -> None:
             "Ref",
             all_types,
             resolved_rule="W1030",
-            schema_details=SchemaDetails(
-                cfnlint.data.schemas.other.functions, "ref.json"
-            ),
         )
         self._all_refs = [
             "W2010",

src/cfnlint/rules/functions/Select.py

@@ -5,8 +5,7 @@
 
 from __future__ import annotations
 
-import cfnlint.data.schemas.other.functions
-from cfnlint.rules.functions._BaseFn import BaseFn, SchemaDetails, all_types
+from cfnlint.rules.functions._BaseFn import BaseFn, all_types
 
 
 class Select(BaseFn):
@@ -22,9 +21,6 @@ def __init__(self) -> None:
         super().__init__(
             "Fn::Select",
             all_types,
-            schema_details=SchemaDetails(
-                cfnlint.data.schemas.other.functions, "select.json"
-            ),
             resolved_rule="W1035",
         )
         self.fn_select = self.validate

src/cfnlint/rules/functions/Split.py

@@ -11,10 +11,9 @@
 
 import regex as re
 
-import cfnlint.data.schemas.other.functions
 from cfnlint.helpers import REGEX_DYN_REF
 from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
-from cfnlint.rules.functions._BaseFn import BaseFn, SchemaDetails
+from cfnlint.rules.functions._BaseFn import BaseFn
 
 
 class Split(BaseFn):
@@ -30,9 +29,6 @@ def __init__(self) -> None:
         super().__init__(
             "Fn::Split",
             ("array",),
-            schema_details=SchemaDetails(
-                cfnlint.data.schemas.other.functions, "split.json"
-            ),
             resolved_rule="W1033",
         )
 

src/cfnlint/rules/functions/Sub.py

@@ -10,10 +10,9 @@
 
 import regex as re
 
-import cfnlint.data.schemas.other.functions
 from cfnlint.helpers import REGEX_SUB_PARAMETERS, is_function
 from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
-from cfnlint.rules.functions._BaseFn import BaseFn, SchemaDetails
+from cfnlint.rules.functions._BaseFn import BaseFn
 
 
 class Sub(BaseFn):
@@ -30,9 +29,6 @@ def __init__(self) -> None:
             "Fn::Sub",
             ("string",),
             resolved_rule="W1031",
-            schema_details=SchemaDetails(
-                cfnlint.data.schemas.other.functions, "sub.json"
-            ),
         )
         self.child_rules.update(
             {

src/cfnlint/rules/functions/ToJsonString.py

@@ -7,10 +7,9 @@
 
 from typing import Any
 
-import cfnlint.data.schemas.other.functions
 from cfnlint.helpers import TRANSFORM_LANGUAGE_EXTENSION
 from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
-from cfnlint.rules.functions._BaseFn import BaseFn, SchemaDetails
+from cfnlint.rules.functions._BaseFn import BaseFn
 
 
 class ToJsonString(BaseFn):
@@ -27,9 +26,6 @@ def __init__(self) -> None:
             "Fn::ToJsonString",
             ("string",),
             resolved_rule="W1040",
-            schema_details=SchemaDetails(
-                cfnlint.data.schemas.other.functions, "tojsonstring.json"
-            ),
         )
 
     def fn_tojsonstring(

src/cfnlint/rules/functions/_BaseFn.py

@@ -8,11 +8,10 @@
 from collections import deque
 from typing import Any, Tuple
 
-import jsonpatch
-
 from cfnlint.helpers import ToPy, ensure_list, is_types_compatible
 from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
 from cfnlint.rules.jsonschema.CfnLintJsonSchema import CfnLintJsonSchema, SchemaDetails
+from cfnlint.schema import OTHER_SCHEMA_MANAGER
 from cfnlint.schema.resolver import RefResolver
 
 all_types = ("array", "boolean", "integer", "number", "object", "string")
@@ -34,16 +33,10 @@ def __init__(
         self.functions = functions or tuple([])
         self.resolved_rule = resolved_rule
         self.child_rules[self.resolved_rule] = None
-        self.config_definition = {
-            "patches": {"default": [], "type": "list", "itemtype": "object"}
-        }
-
-    def configure(self, configs=None, experimental=False):
-        super().configure(configs, experimental)
-
-        jsonpatch.JsonPatch(self.config.get("patches")).apply(
-            self._schema, in_place=True
-        )
+        if name and name != "Fn::GetAZs":
+            self._schema = OTHER_SCHEMA_MANAGER.get_schema(
+                f"other.functions.{name.replace('Fn::', '').lower()}"
+            )
 
     def key_value(self, instance: dict[str, Any]) -> Tuple[str, Any]:
         return list(instance.keys())[0], instance.get(self.fn.name)

src/cfnlint/runner.py

@@ -23,7 +23,7 @@
 from cfnlint.helpers import REGIONS
 from cfnlint.rules import Match, Rules
 from cfnlint.rules.errors import ConfigError, ParseError, TransformError
-from cfnlint.schema import PROVIDER_SCHEMA_MANAGER
+from cfnlint.schema import PROVIDER_SCHEMA_MANAGER, patch
 from cfnlint.template.template import Template
 
 LOGGER = logging.getLogger(__name__)
@@ -241,9 +241,7 @@ def __init__(self, config: ConfigMixIn) -> None:
                 PROVIDER_SCHEMA_MANAGER.load_registry_schemas(path)
         # now we can patch after loading all registry schemas
         if self.config.override_spec:
-            PROVIDER_SCHEMA_MANAGER.patch(
-                self.config.override_spec, self.config.regions
-            )
+            patch(self.config.override_spec, self.config.regions)
 
     def _get_rules(self) -> None:
         """

src/cfnlint/schema/__init__.py

@@ -4,12 +4,16 @@
     "GetAtt",
     "GetAttType",
     "PROVIDER_SCHEMA_MANAGER",
+    "OTHER_SCHEMA_MANAGER",
     "Schema",
     "SchemaPatch",
+    "patch",
+    "reset",
 ]
 
 from cfnlint.schema._exceptions import ResourceNotFoundError
 from cfnlint.schema._getatts import AttributeDict
+from cfnlint.schema._patch import SchemaPatch, patch, reset
 from cfnlint.schema._schema import Schema
 from cfnlint.schema.manager import PROVIDER_SCHEMA_MANAGER
-from cfnlint.schema.patch import SchemaPatch
+from cfnlint.schema.other_schema_manager import OTHER_SCHEMA_MANAGER

src/cfnlint/schema/_exceptions.py

@@ -9,3 +9,8 @@
 class ResourceNotFoundError(Exception):
     def __init__(self, resource_type: str, region: str):
         super().__init__(f"Resource type '{resource_type}' is not found in '{region}'")
+
+
+class SchemaNotFoundError(Exception):
+    def __init__(self, path: str):
+        super().__init__(f"Schema '{path}' is not found")