Validate that node templates and artifacts assigned the proper TOSCA …

…entity type (fixes #342 but disabled for now unless UNFURL_VALIDATION_MODE env var includes "types"). Enable this in unit tests.
onecommons · Oct 25, 2024 · e23ca79 · e23ca79
1 parent ad58c26
commit e23ca79
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/tosca-parser b/tosca-parser
diff --git a/tox.ini b/tox.ini
@@ -14,7 +14,7 @@ setenv =
   UNFURL_TMPDIR={envtmpdir}
   UNFURL_NORUNTIME=1
   UNFURL_APPROVE=1
-  UNFURL_VALIDATION_MODE=additionalProperties
+  UNFURL_VALIDATION_MODE="additionalProperties types"
   UNFURL_RAISE_LOGGING_EXCEPTIONS=1
   XDG_CACHE_HOME={envtmpdir}/.cache
   XDG_CONFIG_HOME={envtmpdir}/.config

diff --git a/unfurl/spec.py b/unfurl/spec.py
@@ -227,10 +227,13 @@ def _parse_template(
         # need to set a path for the import loader
         mode = os.getenv("UNFURL_VALIDATION_MODE")
         additionalProperties = False
+        validate_type_type = False
         if mode is not None:
             additionalProperties = "additionalProperties" in mode
+            validate_type_type = "types" in mode
             ToscaTemplate.strict = "reqcheck" in mode
         EntityTemplate.additionalProperties = additionalProperties
+        EntityTemplate.validate_type_type = validate_type_type
         if resolver:
             # hack! set this now so the find_matching_node callback is invoked
             resolver.manifest.tosca = self