adjust schema of nested CWL in workflow step + fix in/out of CWL Work…

…flow
opengeospatial · Jun 2, 2023 · a67e7ec · a67e7ec
1 parent 82a35c0
commit a67e7ec
Showing 1 changed file with 58 additions and 14 deletions.
diff --git a/openapi/schemas/processes-dru/cwl.yaml b/openapi/schemas/processes-dru/cwl.yaml
@@ -1446,27 +1446,66 @@ $definitions:
         $ref: '#/$definitions/ScatterMethod'
   CWLWorkflowStepRun:
     description: Nested CWL definition to run as Workflow step.
+    $comment: SubWorkflowRequirement not supported yet, but technically possible.
     oneOf:
-      - type: string
-        description: Reference to a CWL tool definition.
-      - $ref: '#/$definitions/CWL'
+      - description: File or URL reference to a CWL tool definition.
+        type: string
+      - description: Nested CWL tool definition for the step.
+        $ref: '#/$definitions/CWLAtomicNested'
   CWLWorkflowStepWhen:
     description: Condition to execute a step that must evaluate to a boolean-like value.
     $ref: '#/$definitions/CWLExpression'
-  CWLWorkflowStepIn:
-    description: Mapping of Workflow step inputs to nested CWL tool definitions inputs or outputs.
+  LinkMergeMethod:
+    type: string
+    enum:
+      - merge_nested
+      - merge_flattened
+  CWLWorkflowStepInput:
+    type: object
+    properties:
+      source:
+        oneOf:
+          - type: string
+          - type: array
+            items: string
+      linkMerge:
+        $ref: '#/$definitions/LinkMergeMethod'
+      default:
+        $ref: '#/$definitions/CWLDefault'
+      valueFrom:
+        $ref: '#/$definitions/CWLExpression'
+  CWLWorkflowStepInItem:
+    allOf:
+      - $ref: '#/$definitions/CWLIdentifier'
+      - $ref: '#/$definitions/CWLWorkflowStepInput'
+      - required:
+        - id
+  CWLWorkflowStepInList:
+    type: array
+    items:
+      $ref: '#/$definitions/CWLWorkflowStepInItem'
+  CWLWorkflowStepInMap:
     additionalProperties:
       oneOf:
         - type: string
-        - type: array
-          items: string
+        - $ref: '#/$definitions/CWLWorkflowStepInput'
+  CWLWorkflowStepIn:
+    description: Mapping of Workflow step inputs to nested CWL tool definitions inputs or outputs.
+    oneOf:
+      - $ref: '#/$definitions/CWLWorkflowStepInMap'
+      - $ref: '#/$definitions/CWLWorkflowStepInList'
   CWLWorkflowStepOut:
     description: Mapping of Workflow step inputs to nested CWL tool definitions inputs or outputs.
-    additionalProperties:
+    type: array
+    items:
       oneOf:
-        - type: string
-        - type: array
-          items: string
+        - $ref: '#/$definitions/CWLIdentifier'
+        - type: object
+          properties:
+            id:
+              $ref: '#/$definitions/CWLIdentifier'
+          required:
+            - id
   CWLWorkflowStepDefinition:
     type: object
     properties:
@@ -1549,8 +1588,13 @@ $definitions:
   CWLAtomic:
     allOf:
       - $ref: '#/$definitions/CWLVersion'
-      - $ref: '#/$definitions/AppVersion'
+      - $ref: '#/$definitions/CWLMetadata'
       - $ref: '#/$definitions/CWLAtomicBase'
+  CWLAtomicNested:
+    $comment: Same as 'CWLAtomic', but 'cwlVersion' not repeated (only at root).
+    allOf:
+    - $ref: '#/$definitions/CWLMetadata'
+    - $ref: '#/$definitions/CWLAtomicBase'
   CWLAtomicBase:
     type: object
     title: CWL atomic definition
@@ -1667,9 +1711,9 @@ $definitions:
     title: CWLGraph
     allOf:
       - $ref: '#/$definitions/CWLVersion'
-      - $ref: '#/$definitions/AppVersion'
+      - $ref: '#/$definitions/CWLMetadata'
       - $ref: '#/$definitions/CWLGraphBase'
-  AppVersion:
+  CWLMetadata:
     type: object
     properties:
       version: