Replace cerberus with jsonschema for configuration validation

.github/workflows/tox.yml

@@ -27,27 +27,27 @@ jobs:
           - tox_env: docs
             python-version: 3.9
           - tox_env: py38
-            PREFIX: PYTEST_REQPASS=461
+            PREFIX: PYTEST_REQPASS=453
             python-version: 3.8
             cover: true
           - tox_env: py39
-            PREFIX: PYTEST_REQPASS=461
+            PREFIX: PYTEST_REQPASS=453
             python-version: 3.9
             cover: true
           - tox_env: py310
-            PREFIX: PYTEST_REQPASS=461
+            PREFIX: PYTEST_REQPASS=453
             python-version: "3.10"
             cover: true
           - tox_env: py311
             os: ubuntu-20.04
             python-version: "~3.11.0-0" # see https://github.com/actions/setup-python/issues/213#issuecomment-1146676713
             cover: true
           - tox_env: py39-devel
-            PREFIX: PYTEST_REQPASS=461
+            PREFIX: PYTEST_REQPASS=453
             python-version: 3.9
             cover: true
           - tox_env: py310-devel
-            PREFIX: PYTEST_REQPASS=461
+            PREFIX: PYTEST_REQPASS=453
             python-version: "3.10"
             # see https://github.com/ansible-community/molecule/issues/3291
             experimental: true

.pre-commit-config.yaml

@@ -92,12 +92,12 @@ repos:
       - id: pylint
         additional_dependencies:
           - ansible-compat>=2.2.0
-          - cerberus
           - click
           - click-help-colors
           - cookiecutter
           - enrich>=1.2.7
           - filelock
+          - jsonschema
           - pexpect
           - testinfra
   - repo: https://github.com/jazzband/pip-tools

mypy.ini

@@ -6,10 +6,6 @@ disallow_untyped_calls = True
 warn_redundant_casts = True
 no_implicit_optional = True
 
-# 3rd party ignores, to remove once they add hints
-[mypy-cerberus.*]
-ignore_missing_imports = True
-
 [mypy-click_completion]
 ignore_missing_imports = True
 
@@ -19,6 +15,9 @@ ignore_missing_imports = True
 [mypy-cookiecutter.*]
 ignore_missing_imports = True
 
+[mypy-jsonschema.*]
+ignore_missing_imports = True
+
 [mypy-pexpect]
 ignore_missing_imports = True
 

requirements.txt

@@ -13,7 +13,6 @@ arrow==1.2.2
 attrs==21.4.0
 babel==2.10.3
 binaryornot==0.4.4
-cerberus==1.3.2
 certifi==2022.6.15
 cffi==1.15.0
 chardet==4.0.0
@@ -84,6 +83,3 @@ tomli==2.0.1
 typing-extensions==4.2.0
 urllib3==1.26.9
 zipp==3.8.0
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools

setup.cfg

@@ -59,11 +59,11 @@ zip_safe = False
 # These are required in actual runtime:
 install_requires =
     ansible-compat >= 2.2.0
-    cerberus >= 1.3.1, !=1.3.3, !=1.3.4
     click >= 8.0, < 9
     click-help-colors >= 0.9
     cookiecutter >= 1.7.3  # dependency issues in older versions
     enrich >= 1.2.7
+    jsonschema >= 4.9.1
     Jinja2 >= 2.11.3
     packaging
     pluggy >= 0.7.1, < 2.0

src/molecule/config.py

@@ -305,7 +305,6 @@ def _combine(self, env=os.environ, keep_string=None) -> MutableMapping:
         for base_config in base_configs:
             with util.open_file(base_config) as stream:
                 s = stream.read()
-                self._preflight(s)
                 interpolated_config = self._interpolate(s, env, keep_string)
                 defaults = util.merge_dicts(
                     defaults, util.safe_load(interpolated_config)
@@ -314,7 +313,6 @@ def _combine(self, env=os.environ, keep_string=None) -> MutableMapping:
         if self.molecule_file:
             with util.open_file(self.molecule_file) as stream:
                 s = stream.read()
-                self._preflight(s)
                 interpolated_config = self._interpolate(s, env, keep_string)
                 defaults = util.merge_dicts(
                     defaults, util.safe_load(interpolated_config)
@@ -429,13 +427,6 @@ def _get_defaults(self) -> MutableMapping:
             },
         }
 
-    def _preflight(self, data: MutableMapping):
-        env = set_env_from_file(os.environ.copy(), self.env_file)
-        errors, data = schema_v3.pre_validate(data, env, MOLECULE_KEEP_STRING)
-        if errors:
-            msg = f"Failed to pre-validate.\n\n{errors}"
-            util.sysexit_with_message(msg, detail=data)
-
     def _validate(self):
         msg = f"Validating schema {self.molecule_file}."
         LOG.debug(msg)