Improve schema validation error messages

codebasin/__main__.py

@@ -283,10 +283,7 @@ def _main():
                 raise RuntimeError(f"Analysis file {path} must end in .toml.")
 
         with open(path, "rb") as f:
-            try:
-                analysis_toml = util._load_toml(f, "analysis")
-            except BaseException:
-                raise ValueError("Analysis file failed validation")
+            analysis_toml = util._load_toml(f, "analysis")
 
         if "codebase" in analysis_toml:
             if "exclude" in analysis_toml["codebase"]:

codebasin/config.py

@@ -85,10 +85,11 @@ def load_importcfg():
         with open(path, "rb") as f:
             try:
                 _importcfg_toml = util._load_toml(f, "cbiconfig")
-                for name, compiler in _importcfg_toml["compiler"].items():
-                    _importcfg[name] = compiler["options"]
-            except BaseException:
-                log.error("Configuration file failed validation")
+            except ValueError as e:
+                log.error(str(e))
+                return
+        for name, compiler in _importcfg_toml["compiler"].items():
+            _importcfg[name] = compiler["options"]
 
 
 class Compiler:

codebasin/util.py

@@ -85,7 +85,7 @@ def _validate_json(json_object: object, schema_name: str) -> bool:
         If the JSON fails to validate, or the schema name is unrecognized.
 
     RuntimeError
-        If the schema file cannot be located.
+        If the schema file cannot be located, or the schema is invalid.
     """
     schema_paths = {
         "analysis": "schema/analysis.schema",
@@ -106,8 +106,8 @@ def _validate_json(json_object: object, schema_name: str) -> bool:
 
     try:
         jsonschema.validate(instance=json_object, schema=schema)
-    except jsonschema.exceptions.ValidationError:
-        msg = f"JSON failed schema validation against {schema_path}"
+    except jsonschema.exceptions.ValidationError as e:
+        msg = f"Failed schema validation against {schema_path}: {e.message}"
         raise ValueError(msg)
     except jsonschema.exceptions.SchemaError:
         msg = f"{schema_path} is not a valid schema"