Merge branch 'master' into change-which-field-acts-as-an-identity-for-maintenance-info-object

Author: waterlink

openapi.yaml

@@ -282,7 +282,11 @@ paths:
               schema:
                 $ref: '#/components/schemas/LastOperationResource'
           headers:
-            - $ref: '#/components/parameters/RetryAfter'
+            Retry-After:
+              description: Indicates when to retry the request
+              required: false
+              schema:
+                type: string
         '400':
           description: Bad Request
           content:
@@ -339,7 +343,11 @@ paths:
               schema:
                 $ref: '#/components/schemas/LastOperationResource'
           headers:
-            - $ref: '#/components/parameters/RetryAfter'
+            Retry-After:
+              description: Indicates when to retry the request
+              required: false
+              schema:
+               type: string
         '400':
           description: Bad Request
           content:
@@ -537,14 +545,6 @@ components:
       schema:
         type: string
 
-    RetryAfter:
-      name: Retry-After
-      in: header
-      description: Indicates when to retry the request
-      require: false
-      schema:
-        type: string
-
   schemas:
     Catalog:
       type: object

spec.md

@@ -547,7 +547,7 @@ schema being used.
 
 | Response Field | Type | Description |
 | --- | --- | --- |
-| version* | string | This MUST be a string conforming to a semantic version. The Platform MAY use this field to determine whether a maintenance update is available for a Service Instance. |
+| version* | string | This MUST be a string conforming to a [semantic version 2.0](https://semver.org/spec/v2.0.0.html). The Platform MAY use this field to determine whether a maintenance update is available for a Service Instance. |
 | description | string | This SHOULD be a string describing the impact of the maintenance update, for example, important version changes, configuration changes, default value changes, etc. The Platform MAY present this information to the user before they trigger the maintenance update. |
 
 \* Fields with an asterisk are REQUIRED.

swagger.yaml

@@ -56,7 +56,11 @@ paths:
       - $ref: '#/parameters/APIVersion'
       - $ref: '#/parameters/OriginatingIdentity'
       - $ref: '#/parameters/RequestIdentity'
-      - $ref: '#/parameters/instance_id'
+      - name: instance_id
+        in: path
+        description: instance id of instance to provision
+        required: true
+        type: string
     put:
       summary: provision a service instance
       tags:
@@ -180,7 +184,11 @@ paths:
       - $ref: '#/parameters/APIVersion'
       - $ref: '#/parameters/OriginatingIdentity'
       - $ref: '#/parameters/RequestIdentity'
-      - $ref: '#/parameters/instance_id'
+      - name: instance_id
+        in: path
+        description: instance id of instance to provision
+        required: true
+        type: string
     get:
       summary: last requested operation state for service instance
       tags:
@@ -223,8 +231,16 @@ paths:
       - $ref: '#/parameters/APIVersion'
       - $ref: '#/parameters/OriginatingIdentity'
       - $ref: '#/parameters/RequestIdentity'
-      - $ref: '#/parameters/instance_id'
-      - $ref: '#/parameters/binding_id'
+      - name: instance_id
+        in: path
+        description: instance id of instance to provision
+        required: true
+        type: string
+      - name: binding_id
+        in: path
+        description: binding id of binding to create
+        required: true
+        type: string
     get:
       summary: last requested operation state for service binding
       tags:
@@ -267,8 +283,16 @@ paths:
       - $ref: '#/parameters/APIVersion'
       - $ref: '#/parameters/OriginatingIdentity'
       - $ref: '#/parameters/RequestIdentity'
-      - $ref: '#/parameters/instance_id'
-      - $ref: '#/parameters/binding_id'
+      - name: instance_id
+        in: path
+        description: instance id of instance to provision
+        required: true
+        type: string
+      - name: binding_id
+        in: path
+        description: binding id of binding to create
+        required: true
+        type: string
     put:
       summary: generation of a service binding
       tags:
@@ -375,12 +399,6 @@ parameters:
     in: header
     description: idenity of the request from the Platform
     type: string
-  instance_id:
-    name: instance_id
-    in: path
-    description: instance id of instance to provision
-    required: true
-    type: string
   accepts_incomplete:
     name: accepts_incomplete
     in: query
@@ -398,12 +416,6 @@ parameters:
     description: id of the plan associated with the instance being deleted
     required: true
     type: string
-  binding_id:
-    name: binding_id
-    in: path
-    description: binding id of binding to create
-    required: true
-    type: string
 
 responses:
   ErrorBadRequest: