From 0a4b0380384ee47bc7e4cddc307885009f49a6cf Mon Sep 17 00:00:00 2001 From: Alexander Kaplan Date: Wed, 22 Jul 2020 12:17:30 -0700 Subject: [PATCH 1/5] Removing ErrorResponse and OperationsListResult from livetoken_API.json, substituting with references to WebTestResults_API.json. --- .../2020-06-02-preview/livetoken_API.json | 80 +------------------ 1 file changed, 2 insertions(+), 78 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json index ecb4fd85d389..aa6aa1cf50e0 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json @@ -57,7 +57,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/OperationsListResult" + "$ref": "../2020-02-10-preview/WebTestResults_API.json#/definitions/OperationsListResult" } }, "default": { @@ -93,7 +93,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "#/definitions/ErrorResponse" + "$ref": "../2020-02-10-preview/WebTestResults_API.json#/definitions/ErrorResponse" } }, "200": { @@ -117,20 +117,6 @@ } }, "definitions": { - "ErrorResponse": { - "description": "Describes the format of an error response.", - "type": "object", - "properties": { - "code": { - "description": "Error code", - "type": "string" - }, - "message": { - "description": "Error message indicating why the operation failed.", - "type": "string" - } - } - }, "LiveTokenResponse": { "type": "object", "properties": { @@ -141,68 +127,6 @@ } }, "description": "The response to a live token query." - }, - "OperationsListResult": { - "description": "Result of the List Operations operation", - "type": "object", - "properties": { - "value": { - "description": "A collection of operations", - "type": "array", - "items": { - "$ref": "#/definitions/Operation" - } - }, - "nextLink": { - "type": "string", - "description": "URL to get the next set of operation list results if there are any." - } - } - }, - "Operation": { - "description": "Represents an operation returned by the GetOperations request", - "type": "object", - "properties": { - "name": { - "description": "Name of the operation", - "type": "string" - }, - "display": { - "$ref": "#/definitions/OperationInfo", - "description": "Display name of the operation" - }, - "origin": { - "description": "Origin of the operation", - "type": "string" - }, - "properties": { - "description": "Properties of the operation", - "type": "object", - "x-ms-client-flatten": true - } - } - }, - "OperationInfo": { - "description": "Information about an operation", - "type": "object", - "properties": { - "provider": { - "description": "Name of the provider", - "type": "string" - }, - "resource": { - "description": "Name of the resource type", - "type": "string" - }, - "operation": { - "description": "Name of the operation", - "type": "string" - }, - "description": { - "description": "Description of the operation", - "type": "string" - } - } } }, "parameters": { From f10ef619cbec21b4d1f8da8dcb6b5c0fb2d5bc98 Mon Sep 17 00:00:00 2001 From: Alexander Kaplan Date: Thu, 23 Jul 2020 10:27:29 -0700 Subject: [PATCH 2/5] Fix attempt. --- .../2020-06-02-preview/livetoken_API.json | 89 ++++++++++++++++--- 1 file changed, 75 insertions(+), 14 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json index aa6aa1cf50e0..798a78ba133c 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json @@ -57,7 +57,7 @@ "200": { "description": "OK", "schema": { - "$ref": "../2020-02-10-preview/WebTestResults_API.json#/definitions/OperationsListResult" + "$ref": "#/definitions/OperationsListResult" } }, "default": { @@ -93,7 +93,7 @@ "default": { "description": "Error response describing why the operation failed.", "schema": { - "$ref": "../2020-02-10-preview/WebTestResults_API.json#/definitions/ErrorResponse" + "$ref": "../2020-03-01-preview/componentLinkedStorageAccounts_API.json#/definitions/ErrorResponse" } }, "200": { @@ -127,17 +127,78 @@ } }, "description": "The response to a live token query." - } - }, - "parameters": { - "ResourceUriParameter": { - "name": "resourceUri", - "in": "path", - "required": true, - "type": "string", - "description": "The identifier of the resource.", - "x-ms-parameter-location": "method", - "x-ms-skip-url-encoding": true + }, + "OperationsListResult": { + "description": "Result of the List Operations operation", + "type": "object", + "properties": { + "value": { + "description": "A collection of operations", + "type": "array", + "items": { + "$ref": "#/definitions/Operation" + } + }, + "nextLink": { + "type": "string", + "description": "URL to get the next set of operation list results if there are any." + } + } + }, + "Operation": { + "description": "Represents an operation returned by the GetOperations request", + "type": "object", + "properties": { + "name": { + "description": "Name of the operation", + "type": "string" + }, + "display": { + "$ref": "#/definitions/OperationInfo", + "description": "Display name of the operation" + }, + "origin": { + "description": "Origin of the operation", + "type": "string" + }, + "properties": { + "description": "Properties of the operation", + "type": "object", + "x-ms-client-flatten": true + } + } + }, + "OperationInfo": { + "description": "Information about an operation", + "type": "object", + "properties": { + "provider": { + "description": "Name of the provider", + "type": "string" + }, + "resource": { + "description": "Name of the resource type", + "type": "string" + }, + "operation": { + "description": "Name of the operation", + "type": "string" + }, + "description": { + "description": "Description of the operation", + "type": "string" + } + } + }, + "parameters": { + "ResourceUriParameter": { + "name": "resourceUri", + "in": "path", + "required": true, + "type": "string", + "description": "The identifier of the resource.", + "x-ms-parameter-location": "method", + "x-ms-skip-url-encoding": true + } } } -} From 2df879e8dc488b9613351b9f886ca0ac4bd4e6e7 Mon Sep 17 00:00:00 2001 From: Alexander Kaplan Date: Thu, 23 Jul 2020 10:29:09 -0700 Subject: [PATCH 3/5] Typo fix --- .../preview/2020-06-02-preview/livetoken_API.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json index 798a78ba133c..b384e6e01643 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json @@ -103,7 +103,8 @@ }, "examples": { "application/json": { - "liveToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c" + "liveToken": + "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c" } } } @@ -202,3 +203,4 @@ } } } +} From 62852dc1be711c076f79ad3114ed85afd765b073 Mon Sep 17 00:00:00 2001 From: Alexander Kaplan Date: Thu, 23 Jul 2020 10:37:01 -0700 Subject: [PATCH 4/5] Reverting. --- .../2020-06-02-preview/livetoken_API.json | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json index b384e6e01643..94fa690aced9 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json @@ -103,8 +103,7 @@ }, "examples": { "application/json": { - "liveToken": - "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c" + "liveToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c" } } } @@ -190,17 +189,17 @@ "type": "string" } } - }, - "parameters": { - "ResourceUriParameter": { - "name": "resourceUri", - "in": "path", - "required": true, - "type": "string", - "description": "The identifier of the resource.", - "x-ms-parameter-location": "method", - "x-ms-skip-url-encoding": true - } + } + }, + "parameters": { + "ResourceUriParameter": { + "name": "resourceUri", + "in": "path", + "required": true, + "type": "string", + "description": "The identifier of the resource.", + "x-ms-parameter-location": "method", + "x-ms-skip-url-encoding": true } } } From 724fba3782e819f4e22b3f816363a32180640417 Mon Sep 17 00:00:00 2001 From: Alexander Kaplan Date: Thu, 23 Jul 2020 11:01:41 -0700 Subject: [PATCH 5/5] Adjust "Operation" name for uniqueness. --- .../preview/2020-06-02-preview/livetoken_API.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json index 94fa690aced9..bac300f6f969 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/preview/2020-06-02-preview/livetoken_API.json @@ -42,7 +42,7 @@ "Operations" ], "summary": "List available operations.", - "description": "List the available operations supported by the Microsoft.EventGrid resource provider.", + "description": "List the available operations supported by the resource provider.", "operationId": "Operations_List", "consumes": [], "produces": [ @@ -136,7 +136,7 @@ "description": "A collection of operations", "type": "array", "items": { - "$ref": "#/definitions/Operation" + "$ref": "#/definitions/OperationLive" } }, "nextLink": { @@ -145,7 +145,7 @@ } } }, - "Operation": { + "OperationLive": { "description": "Represents an operation returned by the GetOperations request", "type": "object", "properties": {