From 0ce3417360869bda95c486bc16a119c84127aa07 Mon Sep 17 00:00:00 2001 From: mrjk Date: Thu, 10 Mar 2022 12:05:40 -0500 Subject: [PATCH] Fix: Broken jsonschema validator --- kheops/utils.py | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/kheops/utils.py b/kheops/utils.py index 788fa8b..a6e37d7 100644 --- a/kheops/utils.py +++ b/kheops/utils.py @@ -90,30 +90,21 @@ def render_template_python(text, params, ignore_missing=True): # Schema Methods # ===================== - def _extend_with_default(validator_class): validate_properties = validator_class.VALIDATORS["properties"] def set_defaults(validator, properties, instance, schema): - - for prop, subschema in properties.items(): + for property, subschema in properties.items(): if "default" in subschema: - instance.setdefault(prop, subschema["default"]) + instance.setdefault(property, subschema["default"]) - try: - for error in validate_properties( - validator, - properties, - instance, - schema, - ): - continue - except Exception as err: - log.debug("Jsonschema validation error: %s", err) + for error in validate_properties( + validator, properties, instance, schema, + ): + yield error return validators.extend( - validator_class, - {"properties": set_defaults}, + validator_class, {"properties" : set_defaults}, )