pycodgen: fix loading of long form secondaryfiles

common-workflow-language · Sep 3, 2021 · 97c5e51 · 97c5e51
1 parent e2479c4
commit 97c5e51
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/schema_salad/metaschema.py b/schema_salad/metaschema.py
@@ -328,6 +328,25 @@ def load(self, doc, baseuri, loadingOptions, docRoot=None):
                     raise ValidationException(
                         "Expected a string or sequence of (strings or mappings)."
                     )
+        elif isinstance(doc, MutableMapping):
+            new_dict = {}
+            if "pattern" in doc:
+                new_dict["pattern"] = doc.pop("pattern")
+            else:
+                raise ValidationException(
+                    "Missing pattern in secondaryFiles specification entry: {}".format(
+                        doc
+                    )
+                )
+            new_dict["required"] = doc.pop("required") if "required" in doc else None
+
+            if len(doc):
+                raise ValidationException(
+                    "Unallowed values in secondaryFiles specification entry: {}".format(
+                        doc
+                    )
+                )
+
         elif isinstance(doc, str):
             if doc.endswith("?"):
                 r.append({"pattern": doc[:-1], "required": False})

diff --git a/schema_salad/python_codegen_support.py b/schema_salad/python_codegen_support.py
@@ -324,6 +324,25 @@ def load(self, doc, baseuri, loadingOptions, docRoot=None):
                     raise ValidationException(
                         "Expected a string or sequence of (strings or mappings)."
                     )
+        elif isinstance(doc, MutableMapping):
+            new_dict = {}
+            if "pattern" in doc:
+                new_dict["pattern"] = doc.pop("pattern")
+            else:
+                raise ValidationException(
+                    "Missing pattern in secondaryFiles specification entry: {}".format(
+                        doc
+                    )
+                )
+            new_dict["required"] = doc.pop("required") if "required" in doc else None
+
+            if len(doc):
+                raise ValidationException(
+                    "Unallowed values in secondaryFiles specification entry: {}".format(
+                        doc
+                    )
+                )
+
         elif isinstance(doc, str):
             if doc.endswith("?"):
                 r.append({"pattern": doc[:-1], "required": False})