Merge in upstream changes

Author: kddejong

src/cfnlint/config.py

@@ -696,7 +696,6 @@ class ManualArgs(TypedDict, total=False):
     regions: list
     registry_schemas: list[str]
     template_parameters: list[dict[str, Any]]
-    parameters: list[dict[str, Any]]
     parameters: list[ParameterSet]
     parameter_files: list[str]
     templates: list[str]
@@ -756,20 +755,16 @@ def __repr__(self):
                 "ignore_checks": self.ignore_checks,
                 "include_checks": self.include_checks,
                 "include_experimental": self.include_experimental,
-                "configure_rules": self.configure_rules,
-                "registry_schemas": self.registry_schemas,
-                "regions": self.regions,
-                "ignore_bad_template": self.ignore_bad_template,
-                "debug": self.debug,
                 "info": self.info,
                 "mandatory_checks": self.mandatory_checks,
                 "merge_configs": self.merge_configs,
                 "non_zero_exit_code": self.non_zero_exit_code,
-                "patch_specs": self.patch_specs,
                 "override_spec": self.override_spec,
                 "parameter_files": self.parameter_files,
                 "parameters": self.parameters,
+                "patch_specs": self.patch_specs,
                 "regions": self.regions,
+                "registry_schemas": self.registry_schemas,
                 "templates": self.templates,
             }
         )

src/cfnlint/runner/cli.py

@@ -15,7 +15,6 @@
 from cfnlint.config import ConfigMixIn, configure_logging
 from cfnlint.exceptions import CfnLintExitException, UnexpectedRuleException
 from cfnlint.rules import Match, Rules
-from cfnlint.schema import PROVIDER_SCHEMA_MANAGER, patch
 from cfnlint.rules.errors import ConfigError
 from cfnlint.runner.deployment_file.runner import expand_deployment_files
 from cfnlint.runner.parameter_file.runner import expand_parameter_files
@@ -24,7 +23,7 @@
     run_template_by_file_paths,
     run_template_by_pipe,
 )
-from cfnlint.schema import PROVIDER_SCHEMA_MANAGER
+from cfnlint.schema import PROVIDER_SCHEMA_MANAGER, patch
 
 LOGGER = logging.getLogger(__name__)
 

test/unit/module/runner/test_cli.py

@@ -93,7 +93,7 @@ def test_print_help(self, mock_isatty, mock_print_help):
 
         self.assertEqual(e.exception.code, 1)
         mock_print_help.assert_called_once()
-        self.assertEqual(mock_isatty.call_count, 2)
+        self.assertEqual(mock_isatty.call_count, 3)
 
     def test_bad_regions(self):
         config = ConfigMixIn(

test/unit/module/runner/test_runner.py

@@ -9,13 +9,8 @@
 import pytest
 
 from cfnlint.config import ConfigMixIn
-<<<<<<< HEAD
-from cfnlint.runner import PROVIDER_SCHEMA_MANAGER, Runner
-from cfnlint.schema import Schema, reset
-=======
 from cfnlint.runner import Runner
-from cfnlint.schema import PROVIDER_SCHEMA_MANAGER, Schema
->>>>>>> 04a759a4a (Allow for deployment files)
+from cfnlint.schema import PROVIDER_SCHEMA_MANAGER, Schema, reset
 
 
 def patch_registry(path):
@@ -77,7 +72,7 @@ def test_init_schemas(name, registry_path, patch_path, expected):
     with patch.object(
         PROVIDER_SCHEMA_MANAGER, "load_registry_schemas", new=patch_registry
     ):
-        with patch("cfnlint.runner.patch", new=patch_schema):
+        with patch("cfnlint.runner.cli.patch", new=patch_schema):
             Runner(config)
 
             if registry_path:

test/unit/rules/functions/test_basefn.py

@@ -32,26 +32,30 @@ def template():
 
 
 @pytest.mark.parametrize(
-    "name,instance,schema,parameters,expected",
+    "name,rule,instance,parameters,expected",
     [
         (
             "Dynamic references are ignored",
             {
                 "schema": {
                     "enum": ["Foo"],
                 },
-                "patches": [],
             },
             {"Fn::Sub": "{{resolve:ssm:${AWS::AccountId}/${AWS::Region}/ac}}"},
             [],
             [],
         ),
-        ("Everything is fine", {"Fn::Sub": "Foo"}, {"enum": ["Foo"]}, {}, []),
+        (
+            "Everything is fine",
+            {"schema": {"enum": ["Foo"]}},
+            {"Fn::Sub": "Foo"},
+            {},
+            [],
+        ),
         (
             "Resolved Fn::Sub has no strict type validation",
             {
                 "schema": {"type": ["integer"]},
-                "patches": [],
             },
             {"Fn::Sub": "2"},
             [],
@@ -61,10 +65,8 @@ def template():
             "Standard error",
             {
                 "schema": {"enum": ["Foo"]},
-                "patches": [],
             },
             {"Fn::Sub": "Bar"},
-            {"enum": ["Foo"]},
             [],
             [
                 ValidationError(
@@ -83,10 +85,8 @@ def template():
             "Errors with context error",
             {
                 "schema": {"anyOf": [{"enum": ["Foo"]}]},
-                "patches": [],
             },
             {"Fn::Sub": "Bar"},
-            {"anyOf": [{"enum": ["Foo"]}]},
             [],
             [
                 ValidationError(
@@ -116,8 +116,10 @@ def template():
         ),
         (
             "Ref of a parameter with parameter set",
+            {
+                "schema": {"enum": ["Foo"]},
+            },
             {"Ref": "MyString"},
-            {"enum": ["Foo"]},
             [
                 ParameterSet(
                     parameters={"MyString": "Bar"},
@@ -139,8 +141,10 @@ def template():
         ),
         (
             "Fn::Sub of a parameter with parameter set",
+            {
+                "schema": {"enum": ["Foo"]},
+            },
             {"Fn::Sub": "${MyString}"},
-            {"enum": ["Foo"]},
             [
                 ParameterSet(
                     parameters={"MyString": "Bar"},
@@ -161,8 +165,8 @@ def template():
             ],
         ),
     ],
-    indirect=["parameters"],
+    indirect=["rule", "parameters"],
 )
-def test_resolve(name, instance, schema, parameters, expected, validator, rule):
-    errs = list(rule.resolve(validator, schema, instance, {}))
+def test_resolve(name, instance, parameters, rule, expected, validator):
+    errs = list(rule.resolve(validator, rule._schema, instance, {}))
     assert errs == expected, f"{name!r} failed and got errors {errs!r}"