More additions to testing

Author: kddejong

src/cfnlint/config.py

@@ -250,17 +250,6 @@ def comma_separated_arg(string):
     return string.split(",")
 
 
-class key_value(argparse.Action):
-    def __call__(self, parser, namespace, values, option_string=None):
-        setattr(namespace, self.dest, dict())
-
-        for value in values:
-            # split it into key and value
-            key, value = value.split("=", 1)
-            # assign into dictionary
-            getattr(namespace, self.dest)[key.strip()] = value.strip()
-
-
 def _ensure_value(namespace, name, value):
     if getattr(namespace, name, None) is None:
         setattr(namespace, name, value)
@@ -324,7 +313,7 @@ def __call__(self, parser, namespace, values, option_string=None):
             setattr(namespace, self.dest, items)
         except Exception:  # pylint: disable=W0703
             parser.print_help()
-            parser.exit()
+            parser.exit(32)
 
 
 class ExtendKeyValuePairs(argparse.Action):
@@ -366,7 +355,7 @@ def __call__(self, parser, namespace, values, option_string=None):
             setattr(namespace, self.dest, result)
         except Exception:  # pylint: disable=W0703
             parser.print_help()
-            parser.exit()
+            parser.exit(1)
 
 
 class ExtendAction(argparse.Action):
@@ -460,9 +449,8 @@ def error(self, message):
             action="extend",
         )
         parameter_group.add_argument(
-            "-tp",
-            "--template-parameters",
-            dest="template_parameters",
+            "--parameters",
+            dest="parameters",
             nargs="+",
             default=[],
             action="extend_key_value",
@@ -693,7 +681,7 @@ class ManualArgs(TypedDict, total=False):
     non_zero_exit_code: str
     output_file: str
     regions: list
-    template_parameters: list[dict[str, Any]]
+    parameters: list[dict[str, Any]]
 
 
 # pylint: disable=too-many-public-methods
@@ -730,7 +718,7 @@ def __repr__(self):
                 "non_zero_exit_code": self.non_zero_exit_code,
                 "override_spec": self.override_spec,
                 "regions": self.regions,
-                "template_parameters": self.template_parameters,
+                "parameters": self.parameters,
                 "templates": self.templates,
             }
         )
@@ -890,12 +878,12 @@ def append_rules(self):
         )
 
     @property
-    def template_parameters(self):
-        return self._get_argument_value("template_parameters", True, True)
+    def parameters(self):
+        return self._get_argument_value("parameters", True, True)
 
-    @template_parameters.setter
-    def template_parameters(self, template_parameters: list[dict[str, Any]]):
-        self._manual_args["template_parameters"] = template_parameters
+    @parameters.setter
+    def parameters(self, parameters: list[dict[str, Any]]):
+        self._manual_args["parameters"] = parameters
 
     @property
     def override_spec(self):

src/cfnlint/rules/deployment_files/Parameters.py

@@ -32,7 +32,7 @@ def __init__(self):
         )
 
     def _is_type_a_list(self, parameter_type: str) -> bool:
-        return "List" in parameter_type and "CommaDelimitedList" not in parameter_type
+        return "List" in parameter_type
 
     def _build_schema(self, instance: Any) -> dict[str, Any]:
         if not isinstance(instance, dict):
@@ -58,32 +58,23 @@ def _build_schema(self, instance: Any) -> dict[str, Any]:
             if not isinstance(parameter_type, str):
                 continue
 
+            schema_constraints = {}
+            if "AllowedValues" in parameter_object:
+                schema_constraints["enum"] = parameter_object["AllowedValues"]
+            if "Pattern" in parameter_object:
+                schema_constraints["pattern"] = parameter_object["Pattern"]
+
             if self._is_type_a_list(parameter_type):
                 schema["properties"][parameter_name] = {
                     "type": "array",
                     "items": {
                         "type": singular_types,
                     },
                 }
-                if "AllowedValues" in parameter_object:
-                    schema["properties"][parameter_name]["items"]["enum"] = (
-                        parameter_object["AllowedValues"]
-                    )
-                if "Pattern" in parameter_object:
-                    if self._is_type_a_list(parameter_type):
-                        schema["properties"][parameter_name]["items"]["pattern"] = (
-                            parameter_object["Pattern"]
-                        )
+                schema["properties"][parameter_name]["items"].update(schema_constraints)
             else:
                 schema["properties"][parameter_name]["type"] = singular_types
-                if "AllowedValues" in parameter_object:
-                    schema["properties"][parameter_name]["enum"] = parameter_object[
-                        "AllowedValues"
-                    ]
-                if "Pattern" in parameter_object:
-                    schema["properties"][parameter_name]["pattern"] = parameter_object[
-                        "Pattern"
-                    ]
+                schema["properties"][parameter_name].update(schema_constraints)
 
         return schema
 

src/cfnlint/runner/__init__.py

@@ -15,7 +15,7 @@
 ]
 
 from cfnlint.runner.cli import Runner, main
-from cfnlint.runner.deployment_file import run_deployment_file
+from cfnlint.runner.deployment_file import run_deployment_files
 from cfnlint.runner.exceptions import (
     CfnLintExitException,
     InvalidRegionException,

src/cfnlint/runner/cli.py

@@ -307,7 +307,7 @@ def cli(self) -> None:
 
         if self.config.templates and self.config.deployment_files:
             self.config.parser.print_help()
-            sys.exit(1)
+            sys.exit(32)
 
         try:
             self._cli_output(list(self.run()))

src/cfnlint/runner/deployment_file/__init__.py

@@ -3,6 +3,6 @@
 SPDX-License-Identifier: MIT-0
 """
 
-__all__ = ["run_deployment_file"]
+__all__ = ["run_deployment_files"]
 
-from cfnlint.runner.deployment_file.runner import run_deployment_file
+from cfnlint.runner.deployment_file.runner import run_deployment_files

src/cfnlint/runner/deployment_file/runner.py

@@ -68,7 +68,7 @@ def run_deployment_file(
             )
             template_path = Path(filename).parent / deployment_data.template_file_path
         template_config = deepcopy(config)
-        template_config.template_parameters = [deployment_data.parameters]
+        template_config.parameters = [deployment_data.parameters]
 
         yield from run_template_by_file_path(
             filename=template_path,

src/cfnlint/runner/template/runner.py

@@ -107,10 +107,10 @@ def _run_template(
 ) -> Iterator[Match]:
 
     config.set_template_args(template)
-    if config.template_parameters:
+    if config.parameters:
         matches: list[Match] = []
-        for template_parameters in config.template_parameters:
-            cfn = Template(filename, template, config.regions, template_parameters)
+        for parameters in config.parameters:
+            cfn = Template(filename, template, config.regions, parameters)
             matches.extend(list(_run_template_per_config(cfn, config, rules)))
         yield from _dedup(iter(matches))
     else:

test/integration/test_run_deployment_files.py

@@ -121,6 +121,14 @@ def test_create_parser_rule_configuration(self):
             {"E3012": {"key": "value", "strict": "true"}, "E3001": {"key": "value"}},
         )
 
+    @patch("argparse.ArgumentParser.print_help")
+    def test_bad_rule_configuration(self, mock_print_help):
+        with self.assertRaises(SystemExit) as e:
+            cfnlint.config.CliArgs(["-x", "E3012:key;value"])
+
+        self.assertEqual(e.exception.code, 32)
+        mock_print_help.assert_called_once()
+
     def test_exit_code_parameter(self):
         """Test values of exit code"""
 

test/unit/module/config/test_cli_args.py

@@ -277,3 +277,56 @@ def test_config_merge(self, yaml_mock):
         )
         # template file wins over config file
         self.assertEqual(config.ignore_checks, ["W3001", "E3001"])
+
+    @patch("cfnlint.config.ConfigFileArgs._read_config", create=True)
+    def test_parameters(self, yaml_mock):
+        yaml_mock.side_effect = [{}, {}]
+        config = cfnlint.config.ConfigMixIn(["--parameters", "Foo=Bar"])
+
+        # test defaults
+        self.assertEqual(config.parameters, [{"Foo": "Bar"}])
+
+    @patch("cfnlint.config.ConfigFileArgs._read_config", create=True)
+    def test_parameters_lists(self, yaml_mock):
+        yaml_mock.side_effect = [{}, {}]
+        config = cfnlint.config.ConfigMixIn(["--parameters", "A=1", "B=2"])
+
+        # test defaults
+        self.assertEqual(config.parameters, [{"A": "1", "B": "2"}])
+
+    @patch("cfnlint.config.ConfigFileArgs._read_config", create=True)
+    def test_parameters_lists_bad_value(self, yaml_mock):
+        yaml_mock.side_effect = [{}, {}]
+
+        with patch("sys.exit") as exit:
+            cfnlint.config.ConfigMixIn(
+                [
+                    "--parameters",
+                    "A",
+                ]
+            )
+            exit.assert_called_once_with(1)
+
+    @patch("cfnlint.config.ConfigFileArgs._read_config", create=True)
+    def test_template_files(self, yaml_mock):
+        yaml_mock.side_effect = [{}, {}]
+        config = cfnlint.config.ConfigMixIn(["--deployment-files", "file1.json"])
+
+        # test defaults
+        self.assertEqual(config.deployment_files, ["file1.json"])
+
+    @patch("argparse.ArgumentParser.print_help")
+    def test_templates_with_deployment_files(self, mock_print_help):
+
+        with self.assertRaises(SystemExit) as e:
+            cfnlint.config.ConfigMixIn(
+                [
+                    "--deployment-files",
+                    "test/fixtures/templates/good/generic.yaml",
+                    "--template",
+                    "test/fixtures/templates/good/generic.yaml",
+                ]
+            )
+
+        self.assertEqual(e.exception.code, 32)
+        mock_print_help.assert_called_once()