Merge pull request #98 from mcupak/issue/88

Use service-info v1.0.0, reuse type definition from service-info, fix…
ga4gh-discovery · Feb 5, 2020 · 8c45be5 · 8c45be5
2 parents 753facf + e0358db
commit 8c45be5
Showing 1 changed file with 5 additions and 22 deletions.
diff --git a/service-registry.yaml b/service-registry.yaml
@@ -82,25 +82,7 @@ paths:
               schema:
                 type: array
                 items:
-                  type: object
-                  description: 'Information pertaining to the type of service being operated. Custom groups and artifacts are supported.'
-                  required:
-                    - group
-                    - artifact
-                    - version
-                  properties:
-                    group:
-                      type: string
-                      description: Namespace in reverse domain name format. Use `org.ga4gh` for implementations compliant with official GA4GH specifications. For services with custom APIs not standardized by GA4GH, or implementations diverging from official GA4GH specifications, use a different namespace (e.g. your organization's reverse domain name).
-                      example: 'org.ga4gh'
-                    artifact:
-                      type: string
-                      description: 'Name of the API or GA4GH specification implemented. Official GA4GH types should be assigned as part of standards approval process.'
-                      example: 'beacon'
-                    version:
-                      type: string
-                      description: 'Version of the API or specification. GA4GH specifications use semantic versioning.'
-                      example: '1.0.0'
+                  $ref: '#/components/schemas/ServiceType'
         '401':
           $ref: '#/components/responses/Unauthorized'
         '403':
@@ -120,7 +102,7 @@ paths:
           description: |
             Display service information about this service registry.
 
-            Use `type: {"group": "org.ga4gh", "artifact": "service-registry", "version": "1.0.0"}` when implementing this specification directly.
+            Use `"type": {"group": "org.ga4gh", "artifact": "service-registry", "version": "1.0.0"}` when implementing this specification directly.
           content:
             application/json:
               schema:
@@ -172,8 +154,7 @@ components:
             $ref: '#/components/schemas/Error'
   schemas:
     Service:
-      # TODO: Change to a tag once service-info is released.
-      $ref: 'https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-info/develop/service-info.yaml#/components/schemas/Service'
+      $ref: 'https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-info/v1.0.0/service-info.yaml#/components/schemas/Service'
     ExternalService:
       description: 'GA4GH service with a URL'
       allOf:
@@ -190,6 +171,8 @@ components:
               example: 'https://api.example.com/v1'
           required:
             - url
+    ServiceType:
+      $ref: 'https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-info/v1.0.0/service-info.yaml#/components/schemas/ServiceType'
     Error:
       type: object
       properties: