Refactoring resource spec, updating tests

src/rpdk/core/data_loaders.py

@@ -170,19 +170,8 @@ def load_resource_spec(  # pylint: disable=R # noqa: C901
     resource_spec_file, original_schema_raw=None
 ):
     """Load a resource provider definition from a file, and validate it."""
-    original_resource_spec = None
     try:
         resource_spec = json.load(resource_spec_file)
-        if original_schema_raw:
-            print(
-                "Type Exists in CloudFormation Registry. "
-                "Evaluating Resource Schema Backward Compatibility Compliance",
-            )
-            original_resource_spec = json.loads(original_schema_raw)
-            sgr_stateful_eval(resource_spec, original_resource_spec)
-
-        print("Evaluating Resource Schema Compliance")
-        sgr_stateless_eval(resource_spec)
 
     except ValueError as e:
         LOG.debug("Resource spec decode failed", exc_info=True)
@@ -425,6 +414,23 @@ def load_resource_spec(  # pylint: disable=R # noqa: C901
         LOG.debug("Inlined schema is no longer valid", exc_info=True)
         raise InternalError() from e
 
+    LOG.warning(
+        "Resource schema metadata is valid. Running a schema compliance evaluation:\n"
+    )
+
+    # Run SGR checks once Schema Metadata is checked
+    original_resource_spec = None
+    if original_schema_raw:
+        print(
+            "Type Exists in CloudFormation Registry. "
+            "Evaluating Resource Schema Backward Compatibility Compliance",
+        )
+        original_resource_spec = json.loads(original_schema_raw)
+        sgr_stateful_eval(resource_spec, original_resource_spec)
+
+    print("Evaluating Resource Schema Compliance")
+    sgr_stateless_eval(resource_spec)
+
     return inlined
 
 

src/rpdk/core/project.py

@@ -358,7 +358,7 @@ def validate_and_load_resource_settings(self, raw_settings):
         self.entrypoint = raw_settings["entrypoint"]
         self.test_entrypoint = raw_settings["testEntrypoint"]
         self.executable_entrypoint = raw_settings.get("executableEntrypoint")
-        # self._plugin = load_plugin(raw_settings["language"])
+        self._plugin = load_plugin(raw_settings["language"])
         self.settings = raw_settings.get("settings", {})
         self.canary_settings = raw_settings.get("canarySettings", {})
 

tests/test_project.py

@@ -431,6 +431,7 @@ def test_configuration_schema_filename(project):
     )
 
 
+# TODO:
 def test_load_schema_with_typeconfiguration(project):
     patch_settings = patch.object(project, "load_settings")
     patch_schema = patch.object(project, "load_schema")
@@ -439,7 +440,7 @@ def test_load_schema_with_typeconfiguration(project):
         project.load()
 
     mock_settings.assert_called_once_with()
-    mock_schema.assert_called_once_with()
+    mock_schema.assert_called_once_with(None)
     mock_configuration_schema.assert_called_once_with()
 
 
@@ -1190,6 +1191,7 @@ def test_init_module(project):
         assert f.read() == b"\n"
 
 
+# TODO:
 def test_load_invalid_schema(project):
     patch_settings = patch.object(project, "load_settings")
     patch_schema = patch.object(
@@ -1201,7 +1203,7 @@ def test_load_invalid_schema(project):
         project.load()
 
     mock_settings.assert_called_once_with()
-    mock_schema.assert_called_once_with()
+    mock_schema.assert_called_once_with(None)
 
     assert "invalid" in str(excinfo.value)
 
@@ -1292,7 +1294,7 @@ def test_schema_not_found(project):
         project.load()
 
     mock_settings.assert_called_once_with()
-    mock_schema.assert_called_once_with()
+    mock_schema.assert_called_once_with(None)
 
     assert "not found" in str(excinfo.value)