Merge pull request #71 from jpmckinney/fix-mtender-schema-bug

common: Log warning for invalid JSON Schema in which "properties" values aren't JSON Schema

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.20.2] - 2020-11-04
+
+### Fixed
+
+- Don't error when JSON schema "properties" values aren't JSON Schema, and log a warning instead https://github.com/OpenDataServices/lib-cove/pull/71
+
 ## [0.20.1] - 2020-10-27
 
 ### Fixed

libcove/lib/common.py

@@ -4,6 +4,7 @@
 import fcntl
 import functools
 import json
+import logging
 import os
 import re
 from collections import OrderedDict
@@ -43,6 +44,8 @@
     "array": "{}'{}' is not a JSON array",
 }
 
+logger = logging.getLogger(__name__)
+
 
 def unique_ids(validator, ui, instance, schema, id_name="id"):
     if ui and validator.is_type(instance, "array"):
@@ -1105,6 +1108,14 @@ def add_is_codelist(obj):
     release.tag in core schema at the moment."""
 
     for prop, value in obj.get("properties", {}).items():
+        if not isinstance(value, dict):
+            logger.warning(
+                "A 'properties' object contains a {!r} value that is not a JSON Schema: {!r}".format(
+                    prop, value
+                )
+            )
+            continue
+
         if "codelist" in value:
             if "array" in value.get("type", ""):
                 value["items"]["isCodelist"] = True

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="libcove",
-    version="0.20.1",
+    version="0.20.2",
     author="Open Data Services",
     author_email="code@opendataservices.coop",
     url="https://github.com/OpenDataServices/lib-cove",