Upgrading Python version to 3.10 and jsonschema to 4.25

Author: Rory Xu

setup.py

@@ -36,13 +36,13 @@ def find_version(*file_paths):
     # package_data -> use MANIFEST.in instead
     include_package_data=True,
     zip_safe=True,
-    python_requires=">=3.6",
+    python_requires=">=3.10",
     install_requires=[
         "boto3>=1.10.20",
         "Jinja2>=3.1.2",
         "markupsafe>=2.1.0",
         "jsonpatch",
-        "jsonschema>=3.0.0,<=4.17.3",
+        "jsonschema>=3.0.0,<=4.25",
         "pytest>=4.5.0",
         "pytest-random-order>=1.0.4",
         "pytest-localserver>=0.5.0",

src/rpdk/core/data_loaders.py

@@ -8,8 +8,11 @@
 
 import pkg_resources
 import yaml
-from jsonschema import Draft7Validator, RefResolver
-from jsonschema.exceptions import RefResolutionError, ValidationError
+from jsonschema import Draft7Validator
+from jsonschema.exceptions import ValidationError, RefResolutionError
+from referencing import Registry, Resource
+from referencing.jsonschema import DRAFT7
+import referencing.exceptions
 from nested_lookup import nested_lookup
 
 from .exceptions import InternalError, SpecValidationError
@@ -56,30 +59,33 @@ def copy_resource(package_name, resource_name, out_path):
         shutil.copyfileobj(fsrc, fdst)
 
 
-def get_schema_store(schema_search_path):
-    """Load all the schemas in schema_search_path and return a dict"""
-    schema_store = {}
+def get_schema_registry(schema_search_path):
+    """Load all the schemas in schema_search_path and return a Registry"""
+    registry = Registry()
+    
     schema_fnames = os.listdir(schema_search_path)
     for schema_fname in schema_fnames:
         schema_path = os.path.join(schema_search_path, schema_fname)
         if schema_path.endswith(".json"):
             with open(schema_path, "r", encoding="utf-8") as schema_f:
                 schema = json.load(schema_f)
                 if "$id" in schema:
-                    schema_store[schema["$id"]] = schema
-    return schema_store
+                    resource = Resource.from_contents(schema, default_specification=DRAFT7)
+                    registry = registry.with_resource(schema["$id"], resource)
+                    
+                    # For JSON Schema Draft 7, also register the HTTPS version
+                    if schema["$id"] == "http://json-schema.org/draft-07/schema#":
+                        https_id = "https://json-schema.org/draft-07/schema#"
+                        registry = registry.with_resource(https_id, resource)
+    return registry
 
 
 def make_validator(schema):
     schema_search_path = Path(os.path.dirname(os.path.realpath(__file__))).joinpath(
         "data/schema/"
     )
-    resolver = RefResolver(
-        base_uri=Draft7Validator.ID_OF(schema),
-        store=get_schema_store(schema_search_path),
-        referrer=schema,
-    )
-    return Draft7Validator(schema, resolver=resolver)
+    registry = get_schema_registry(schema_search_path)
+    return Draft7Validator(schema, registry=registry)
 
 
 def make_resource_validator():
@@ -379,7 +385,7 @@ def load_resource_spec(resource_spec_file):  # pylint: disable=R # noqa: C901
     inliner = RefInliner(base_uri, resource_spec)
     try:
         inlined = inliner.inline()
-    except RefResolutionError as e:
+    except (RefResolutionError, referencing.exceptions.Unresolvable) as e:
         LOG.debug("Resource spec validation failed", exc_info=True)
         raise SpecValidationError(str(e)) from e
 
@@ -444,7 +450,7 @@ def load_hook_spec(hook_spec_file):  # pylint: disable=R # noqa: C901
     inliner = RefInliner(base_uri, hook_spec)
     try:
         inlined = inliner.inline()
-    except RefResolutionError as e:
+    except (RefResolutionError, referencing.exceptions.Unresolvable) as e:
         LOG.debug("Hook spec validation failed", exc_info=True)
         raise SpecValidationError(str(e)) from e
 

src/rpdk/core/jsonutils/inliner.py

@@ -1,7 +1,9 @@
 import logging
 from collections.abc import Iterable, Mapping
 
-from jsonschema import RefResolutionError, RefResolver
+from jsonschema import RefResolver
+from jsonschema.exceptions import RefResolutionError
+import referencing.exceptions
 
 from .renamer import RefRenamer
 from .utils import BASE, rewrite_ref, traverse

tests/test_data_loaders.py

@@ -10,13 +10,14 @@
 
 import pytest
 import yaml
-from jsonschema.exceptions import RefResolutionError, ValidationError
+from jsonschema.exceptions import ValidationError, RefResolutionError
+import referencing.exceptions
 from pytest_localserver.http import Request, Response, WSGIServer
 
 from rpdk.core.data_loaders import (
     STDIN_NAME,
     get_file_base_uri,
-    get_schema_store,
+    get_schema_registry,
     load_hook_spec,
     load_resource_spec,
     resource_json,
@@ -669,36 +670,37 @@ def test_resource_yaml():
     assert result == obj
 
 
-def test_get_schema_store_schemas_with_id():
-    schema_store = get_schema_store(
+def test_get_schema_registry_schemas_with_id():
+    schema_registry = get_schema_registry(
         BASEDIR.parent / "src" / "rpdk" / "core" / "data" / "schema"
     )
-    assert len(schema_store) == 7
-    assert "http://json-schema.org/draft-07/schema#" in schema_store
+    assert len(schema_registry) == 8  # 7 original + HTTPS version of JSON Schema
+    assert "http://json-schema.org/draft-07/schema#" in schema_registry
+    assert "https://json-schema.org/draft-07/schema#" in schema_registry  # HTTPS version
     assert (
         "https://schema.cloudformation.us-east-1.amazonaws.com/base.definition.schema.v1.json"
-        in schema_store
+        in schema_registry
     )
     assert (
         "https://schema.cloudformation.us-east-1.amazonaws.com/provider.configuration.definition.schema.v1.json"
-        in schema_store
+        in schema_registry
     )
     assert (
         "https://schema.cloudformation.us-east-1.amazonaws.com/provider.definition.schema.v1.json"
-        in schema_store
+        in schema_registry
     )
     assert (
         "https://schema.cloudformation.us-east-1.amazonaws.com/provider.definition.schema.hooks.v1.json"
-        in schema_store
+        in schema_registry
     )
     assert (
         "https://schema.cloudformation.us-east-1.amazonaws.com/provider.configuration.definition.schema.hooks.v1.json"
-        in schema_store
+        in schema_registry
     )
 
 
-def test_get_schema_store_schemas_with_out_id():
-    schema_store = get_schema_store(
+def test_get_schema_registry_schemas_with_out_id():
+    schema_registry = get_schema_registry(
         BASEDIR.parent / "src" / "rpdk" / "core" / "data" / "examples" / "resource"
     )
-    assert len(schema_store) == 0
+    assert len(schema_registry) == 0