schema: additionalKeysAreSpecs (#49221)

Currently we validate all keys as specs, but it's meant to validate only additional keys in all cases.

lib/spack/spack/schema/__init__.py

@@ -7,8 +7,7 @@
 import warnings
 
 import jsonschema
-
+import jsonschema.validators
-import llnl.util.lang
 
 from spack.error import SpecSyntaxError
 
@@ -18,22 +17,24 @@ class DeprecationMessage(typing.NamedTuple):
     error: bool
 
 
-# jsonschema is imported lazily as it is heavy to import
-# and increases the start-up time
-def _make_validator():
 def _validate_spec(validator, is_spec, instance, schema):
-        """Check if the attributes on instance are valid specs."""
+    """Check if all additional keys are valid specs."""
     import spack.spec_parser
 
     if not validator.is_type(instance, "object"):
         return
 
+    properties = schema.get("properties") or {}
+
     for spec_str in instance:
+        if spec_str in properties:
+            continue
         try:
             spack.spec_parser.parse(spec_str)
         except SpecSyntaxError:
             yield jsonschema.ValidationError(f"the key '{spec_str}' is not a valid spec")
 
+
 def _deprecated_properties(validator, deprecated, instance, schema):
     if not (validator.is_type(instance, "object") or validator.is_type(instance, "array")):
         return
@@ -64,15 +65,13 @@ def _deprecated_properties(validator, deprecated, instance, schema):
     if errors:
         yield jsonschema.ValidationError("\n".join(errors))
 
-    return jsonschema.validators.extend(
+
+Validator = jsonschema.validators.extend(
     jsonschema.Draft7Validator,
-        {"validate_spec": _validate_spec, "deprecatedProperties": _deprecated_properties},
+    {"additionalKeysAreSpecs": _validate_spec, "deprecatedProperties": _deprecated_properties},
 )
 
 
-Validator = llnl.util.lang.Singleton(_make_validator)
-
-
 def _append(string: str) -> bool:
     """Test if a spack YAML string is an append.
 

lib/spack/spack/schema/modules.py

@@ -39,7 +39,7 @@
         "load": array_of_strings,
         "suffixes": {
             "type": "object",
-            "validate_spec": True,
+            "additionalKeysAreSpecs": True,
             "additionalProperties": {"type": "string"},  # key
         },
         "environment": spack.schema.environment.definition,
@@ -64,7 +64,7 @@
 tcl_configuration = {
     "type": "object",
     "default": {},
-    "validate_spec": True,
+    "additionalKeysAreSpecs": True,
     "properties": {**common_props},
     "additionalProperties": module_file_configuration,
 }
@@ -72,7 +72,7 @@
 lmod_configuration = {
     "type": "object",
     "default": {},
-    "validate_spec": True,
+    "additionalKeysAreSpecs": True,
     "properties": {
         **common_props,
         "core_compilers": array_of_strings,
@@ -80,7 +80,7 @@
         "core_specs": array_of_strings,
         "filter_hierarchy_specs": {
             "type": "object",
-            "validate_spec": True,
+            "additionalKeysAreSpecs": True,
             "additionalProperties": array_of_strings,
         },
     },

lib/spack/spack/test/schema.py

@@ -17,7 +17,7 @@
 def validate_spec_schema():
     return {
         "type": "object",
-        "validate_spec": True,
+        "additionalKeysAreSpecs": True,
         "patternProperties": {r"\w[\w-]*": {"type": "string"}},
     }
 
@@ -34,7 +34,7 @@ def module_suffixes_schema():
                         "type": "object",
                         "properties": {
                             "suffixes": {
-                                "validate_spec": True,
+                                "additionalKeysAreSpecs": True,
                                 "patternProperties": {r"\w[\w-]*": {"type": "string"}},
                             }
                         },