Refactor: Add annotations to schema validator 37/72237/1
authorAndrew Grimberg <agrimberg@linuxfoundation.org>
Tue, 10 Oct 2023 13:13:21 +0000 (06:13 -0700)
committerAndrew Grimberg <agrimberg@linuxfoundation.org>
Tue, 10 Oct 2023 13:13:21 +0000 (06:13 -0700)
Issue: RELENG-4933
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
Change-Id: I1b13c1ad1ad825cf29718dd15c0cc56c8a4a55cc

lftools/schema.py

index e3d67b9..6b25fc2 100644 (file)
@@ -9,15 +9,16 @@
 ##############################################################################
 """Verify YAML Schema."""
 
-from __future__ import print_function
+from __future__ import annotations, print_function
 
 import logging
+from typing import Dict
 
 import jsonschema
 import yaml
 
 
-def check_schema_file(yamlfile, schemafile):
+def check_schema_file(yamlfile: str, schemafile: str) -> None:
     """Verify YAML Schema.
 
     YAMLFILE: Release YAML file to be validated.
@@ -25,17 +26,19 @@ def check_schema_file(yamlfile, schemafile):
     SCHEMAFILE: SCHEMA file to validate against.
     """
     with open(yamlfile) as _:
-        yaml_file = yaml.safe_load(_)
+        yaml_file: Dict = yaml.safe_load(_)
 
     with open(schemafile) as _:
-        schema_file = yaml.safe_load(_)
+        schema_file: Dict = yaml.safe_load(_)
 
     # Load the schema
-    validation = jsonschema.Draft4Validator(schema_file, format_checker=jsonschema.FormatChecker())
+    validation: jsonschema.Draft4Validator = jsonschema.Draft4Validator(
+        schema_file, format_checker=jsonschema.FormatChecker()
+    )
 
     validation.iter_errors(yaml_file)
     # Look for errors
-    errors = 0
+    errors: int = 0
     for error in validation.iter_errors(yaml_file):
         errors += 1
         logging.error(error)