From 6d7fc10dbfbc7747e5f8b0a51d8680a181b0f89f Mon Sep 17 00:00:00 2001 From: tonykslee Date: Wed, 18 Nov 2020 15:00:02 -0800 Subject: [PATCH 01/40] add valid delete response code --- .../stable/2020-10-20/examples/WorkbookDelete.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookDelete.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookDelete.json index 19d4cd9b5a38..6287799efa85 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookDelete.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookDelete.json @@ -6,6 +6,7 @@ "resourceName": "deadb33f-5e0d-4064-8ebb-1a4ed0313eb2" }, "responses": { + "200": {}, "201": {}, "204": {} } From 6ed2fe66b4362292fd747021caa985d1b21caa4a Mon Sep 17 00:00:00 2001 From: tonykslee Date: Wed, 18 Nov 2020 15:47:10 -0800 Subject: [PATCH 02/40] update to allow null serialized data --- .../stable/2015-05-01/workbooks_API.json | 3 +- .../2020-10-20/examples/MyWorkbookDelete.json | 2 +- .../2020-10-20/examples/WorkbookDelete.json | 1 - .../2020-10-20/examples/WorkbookGet2.json | 32 +++++++++++++++++++ 4 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookGet2.json diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/workbooks_API.json index f3fb7bdc4e2d..c078e6690e81 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/workbooks_API.json @@ -138,7 +138,7 @@ } ], "responses": { - "201": { + "200": { "description": "The workbook has been successfully deleted." }, "204": { @@ -367,6 +367,7 @@ }, "serializedData": { "type": "string", + "nullable" : true, "description": "Configuration of this particular workbook. Configuration data is a string containing valid JSON" }, "version": { diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookDelete.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookDelete.json index 19d4cd9b5a38..139d9fe0f6b8 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookDelete.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookDelete.json @@ -6,7 +6,7 @@ "resourceName": "deadb33f-5e0d-4064-8ebb-1a4ed0313eb2" }, "responses": { - "201": {}, + "200": {}, "204": {} } } diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookDelete.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookDelete.json index 6287799efa85..139d9fe0f6b8 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookDelete.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookDelete.json @@ -7,7 +7,6 @@ }, "responses": { "200": {}, - "201": {}, "204": {} } } diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookGet2.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookGet2.json new file mode 100644 index 000000000000..5f7a8ce846c1 --- /dev/null +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookGet2.json @@ -0,0 +1,32 @@ +{ + "parameters": { + "api-version": "2020-10-20", + "subscriptionId": "6b643656-33eb-422f-aee8-3ac145d124af", + "resourceGroupName": "my-resource-group", + "resourceName": "deadb33f-5e0d-4064-8ebb-1a4ed0313eb2" + }, + "responses": { + "200": { + "body": { + "id": "c0deea5e-3344-40f2-96f8-6f8e1c3b5722", + "name": "deadb33f-8bee-4d3b-a059-9be8dac93960", + "type": "", + "location": "westus", + "kind": "shared", + "properties": { + "displayName": "My New Workbook", + "userId": "userId", + "serializedData": null, + "version": "ME", + "category": "workbook", + "timeModified": null, + "storageUri": null + }, + "tags": [ + "TagSample01", + "TagSample02" + ] + } + } + } +} From 28bc4a2cddeb0301845a857fe3e7831721c4baba Mon Sep 17 00:00:00 2001 From: tonykslee Date: Wed, 18 Nov 2020 16:05:43 -0800 Subject: [PATCH 03/40] updated nullable syntax and removed changes from wrong file --- .../Microsoft.Insights/stable/2015-05-01/workbooks_API.json | 3 +-- .../Microsoft.Insights/stable/2020-10-20/workbooks_API.json | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/workbooks_API.json index c078e6690e81..f3fb7bdc4e2d 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2015-05-01/workbooks_API.json @@ -138,7 +138,7 @@ } ], "responses": { - "200": { + "201": { "description": "The workbook has been successfully deleted." }, "204": { @@ -367,7 +367,6 @@ }, "serializedData": { "type": "string", - "nullable" : true, "description": "Configuration of this particular workbook. Configuration data is a string containing valid JSON" }, "version": { diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 4a5f1d28cd0e..0a2ef36fe9d6 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -147,7 +147,7 @@ } ], "responses": { - "201": { + "200": { "description": "The workbook has been successfully deleted." }, "204": { @@ -375,6 +375,7 @@ }, "serializedData": { "type": "string", + "x-nullable": true, "description": "Configuration of this particular workbook. Configuration data is a string containing valid JSON" }, "timeModified": { From 84182aa26646b844f7e69fa769890ea493c161bb Mon Sep 17 00:00:00 2001 From: tonykslee Date: Wed, 18 Nov 2020 16:24:51 -0800 Subject: [PATCH 04/40] added more examples for validation --- .../2020-10-20/examples/MyWorkbooksList2.json | 14 ++++++++++++++ .../stable/2020-10-20/myworkbooks_API.json | 7 +++++++ .../stable/2020-10-20/workbooks_API.json | 3 +++ 3 files changed, 24 insertions(+) create mode 100644 specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbooksList2.json diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbooksList2.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbooksList2.json new file mode 100644 index 000000000000..396a769db3d3 --- /dev/null +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbooksList2.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "api-version": "2020-10-20", + "subscriptionId": "6b643656-33eb-422f-aee8-3ac145d124af", + "resourceGroupName": "my-resource-group", + "category": "workbook" + }, + "responses": { + "200": { + "body": [], + "nextLink": null + } + } +} diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json index 336f2a6b00e3..888c3d8bc460 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json @@ -78,6 +78,9 @@ "x-ms-examples": { "WorkbooksList": { "$ref": "./examples/MyWorkbooksList.json" + }, + "WorkbooksList2": { + "$ref": "./examples/MyWorkbooksList2.json" } } } @@ -123,6 +126,9 @@ "x-ms-examples": { "WorkbooksList": { "$ref": "./examples/MyWorkbooksList.json" + }, + "WorkbooksList2": { + "$ref": "./examples/MyWorkbooksList2.json" } } } @@ -405,6 +411,7 @@ }, "serializedData": { "type": "string", + "x-nullable": true, "description": "Configuration of this particular private workbook. Configuration data is a string containing valid JSON" }, "version": { diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 0a2ef36fe9d6..1e54e27160cb 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -124,6 +124,9 @@ "WorkbookGet": { "$ref": "./examples/WorkbookGet.json" }, + "WorkbookGet2": { + "$ref": "./examples/WorkbookGet2.json" + }, "WorkbookManagedGet": { "$ref": "./examples/WorkbookManagedGet.json" } From 7a85cabddcfc9fae64c02373c62cf933ef80cf02 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Wed, 18 Nov 2020 16:42:36 -0800 Subject: [PATCH 05/40] updated myWorkbooks delete response code --- .../Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json index 888c3d8bc460..aa87a1656608 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json @@ -189,7 +189,7 @@ } ], "responses": { - "201": { + "200": { "description": "The private workbook has been successfully deleted." }, "204": { From 029e5ee26dc63696588f77e6acea8e2d78b41bea Mon Sep 17 00:00:00 2001 From: tonykslee Date: Wed, 18 Nov 2020 16:46:23 -0800 Subject: [PATCH 06/40] commented suppressions to get the errors --- .../applicationinsights/resource-manager/readme.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/specification/applicationinsights/resource-manager/readme.md b/specification/applicationinsights/resource-manager/readme.md index d1aac3e4b801..8644f45f3fac 100644 --- a/specification/applicationinsights/resource-manager/readme.md +++ b/specification/applicationinsights/resource-manager/readme.md @@ -77,10 +77,10 @@ directive: reason: 'This api was existing there from 2015, it will break existing client if we change the name' - suppress: R2066 reason: There are a bug in this rule. "ExportConfigurations_Create" is a valid operation id. - - suppress: OBJECT_ADDITIONAL_PROPERTIES - where: $.definitions.Workbook - from: workbooks_API.json - reason: 'This property is already a part of our API, so we cannot remove it' + # - suppress: OBJECT_ADDITIONAL_PROPERTIES + # where: $.definitions.Workbook + # from: workbooks_API.json + # reason: 'This property is already a part of our API, so we cannot remove it' - suppress: READONLY_PROPERTY_NOT_ALLOWED_IN_REQUEST where: $.definitions.Resource.properties.name from: types.json @@ -121,9 +121,9 @@ directive: - suppress: DeleteOperationResponses from: favorites_API.json reason: 'consistent with existing delete response | owned by another team' - - suppress: DeleteOperationResponses - from: workbooks_API.json - reason: 'consistent with existing delete response' + # - suppress: DeleteOperationResponses + # from: workbooks_API.json + # reason: 'consistent with existing delete response' - suppress: DefaultErrorResponseSchema from: componentAnnotations_API.json reason: 'consistent with existing default error response | owned by another team' From f908e21db06937c76751a64282f1357b078d7276 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Wed, 18 Nov 2020 17:00:15 -0800 Subject: [PATCH 07/40] updated patch response code to 201 --- .../stable/2020-10-20/examples/MyWorkbookUpdate.json | 2 +- .../stable/2020-10-20/examples/WorkbookUpdate.json | 2 +- .../stable/2020-10-20/myworkbooks_API.json | 2 +- .../Microsoft.Insights/stable/2020-10-20/workbooks_API.json | 6 ++++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookUpdate.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookUpdate.json index f1d5c52b3916..fafbe94cdfd1 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookUpdate.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookUpdate.json @@ -23,7 +23,7 @@ } }, "responses": { - "200": { + "201": { "body": { "id": "c0deea5e-3344-40f2-96f8-6f8e1c3b5722", "type": "Microsoft.Insights/myworkbooks", diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookUpdate.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookUpdate.json index d16fecb33284..cd6013e728d7 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookUpdate.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookUpdate.json @@ -25,7 +25,7 @@ } }, "responses": { - "200": { + "201": { "body": { "id": "c0deea5e-3344-40f2-96f8-6f8e1c3b5722", "type": "", diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json index aa87a1656608..42f07334aa76 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json @@ -287,7 +287,7 @@ } ], "responses": { - "200": { + "201": { "description": "The private workbook definition updated.", "schema": { "$ref": "#/definitions/MyWorkbook" diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 1e54e27160cb..4ad7b078c994 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -263,6 +263,12 @@ "$ref": "#/definitions/Workbook" } }, + "201": { + "description": "The workbook definition updated.", + "schema": { + "$ref": "#/definitions/Workbook" + } + }, "default": { "description": "Error response describing why the operation failed.", "schema": { From da943d390db7ecce1350bad3401e2f7b8ea43619 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Wed, 18 Nov 2020 17:23:59 -0800 Subject: [PATCH 08/40] updated kind details --- .../Microsoft.Insights/stable/2020-10-20/workbooks_API.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 4ad7b078c994..34ea59da5303 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -317,7 +317,7 @@ "shared" ], "x-ms-enum": { - "name": "SharedTypeKind", + "name": "kind", "modelAsString": true } }, From 52f09dcf61fdf4ebaf79035fa1231064b4990432 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Wed, 18 Nov 2020 17:26:45 -0800 Subject: [PATCH 09/40] nullable to storageUri --- .../Microsoft.Insights/stable/2020-10-20/workbooks_API.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 34ea59da5303..df513514a912 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -418,6 +418,7 @@ }, "storageUri": { "type": "string", + "x-nullable": true, "description": "BYOS Storage Account URI" } } From da280c891fec1f471940800fe35936042b83d5ec Mon Sep 17 00:00:00 2001 From: tonykslee Date: Wed, 18 Nov 2020 17:27:26 -0800 Subject: [PATCH 10/40] nullable to storageUri --- .../Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json index 42f07334aa76..0da4ae57379f 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json @@ -445,6 +445,7 @@ }, "storageUri": { "type": "string", + "x-nullable": true, "description": "BYOS Storage Account URI" } } From 865c9d22ca52af391f67acd31c22e9f56844f95f Mon Sep 17 00:00:00 2001 From: tonykslee Date: Thu, 19 Nov 2020 09:34:10 -0800 Subject: [PATCH 11/40] updated nextLink --- .../Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json | 2 +- .../Microsoft.Insights/stable/2020-10-20/workbooks_API.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json index 0da4ae57379f..d04876055ae5 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json @@ -73,7 +73,7 @@ } }, "x-ms-pageable": { - "nextLinkName": null + "nextLinkName": "nextLink" }, "x-ms-examples": { "WorkbooksList": { diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index df513514a912..eb4c904ca871 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -76,7 +76,7 @@ } }, "x-ms-pageable": { - "nextLinkName": null + "nextLinkName": "nextLink" }, "x-ms-examples": { "WorkbooksList": { From a418bf8c6b7ae7b26eb8ba3b54556b3971e1718b Mon Sep 17 00:00:00 2001 From: tonykslee Date: Thu, 19 Nov 2020 11:04:43 -0800 Subject: [PATCH 12/40] removed required modifier on location field --- .../Microsoft.Insights/stable/2020-10-20/workbooks_API.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index eb4c904ca871..a9e7728f5a60 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -337,9 +337,6 @@ "description": "Resource tags" } }, - "required": [ - "location" - ], "x-ms-azure-resource": true, "description": "An azure resource object" }, From 89fb6f4191423674c0978ba72aca403fc22a9178 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Thu, 19 Nov 2020 14:58:21 -0800 Subject: [PATCH 13/40] updated error response schema --- .../stable/2020-10-20/myworkbooks_API.json | 51 +++++++++++-------- .../stable/2020-10-20/workbooks_API.json | 51 +++++++++++-------- 2 files changed, 58 insertions(+), 44 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json index d04876055ae5..f32c2652a1b5 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json @@ -450,42 +450,49 @@ } } }, - "ErrorFieldContract": { + "WorkbookError": { + "description": "Error response.", "properties": { - "code": { - "type": "string", - "description": "Property level error code." - }, - "message": { - "type": "string", - "description": "Human-readable representation of property-level error." - }, - "target": { - "type": "string", - "description": "Property name." + "error": { + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." } - }, - "description": "Error Field contract." + } }, - "MyWorkbookError": { + "ErrorDefinition": { + "description": "Error definition.", "properties": { "code": { + "description": "Service specific error code which serves as the substatus for the HTTP error code.", "type": "string", - "description": "Service-defined error code. This code serves as a sub-status for the HTTP error code specified in the response." + "readOnly": true }, "message": { + "description": "Description of the error.", "type": "string", - "description": "Human-readable representation of the error." + "readOnly": true }, - "details": { + "innererror": { + "description": "Internal error details.", + "items": { + "$ref": "#/definitions/InnerErrorTrace" + }, + "readOnly": true + } + } + }, + "InnerErrorTrace": { + "description": "Error details", + "properties": { + "trace": { + "description": "detailed error trace", "type": "array", "items": { - "$ref": "#/definitions/ErrorFieldContract" + "type": "string" }, - "description": "The list of invalid fields send in request, in case of validation error." + "readOnly": true } - }, - "description": "Error message body that will indicate why the operation failed." + } }, "ManagedIdentity": { "description": "Customer Managed Identity", diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index a9e7728f5a60..706bf1e65aed 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -473,40 +473,47 @@ } } }, - "ErrorFieldContract": { + "WorkbookError": { + "description": "Error response.", "properties": { - "code": { - "type": "string", - "description": "Property level error code." - }, - "message": { - "type": "string", - "description": "Human-readable representation of property-level error." - }, - "target": { - "type": "string", - "description": "Property name." + "error": { + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." } - }, - "description": "Error Field contract." + } }, - "WorkbookError": { - "description": "Error message body that will indicate why the operation failed.", + "ErrorDefinition": { + "description": "Error definition.", "properties": { "code": { + "description": "Service specific error code which serves as the substatus for the HTTP error code.", "type": "string", - "description": "Service-defined error code. This code serves as a sub-status for the HTTP error code specified in the response." + "readOnly": true }, "message": { + "description": "Description of the error.", "type": "string", - "description": "Human-readable representation of the error." + "readOnly": true }, - "details": { + "innererror": { + "description": "Internal error details.", + "items": { + "$ref": "#/definitions/InnerErrorTrace" + }, + "readOnly": true + } + } + }, + "InnerErrorTrace": { + "description": "Error details", + "properties": { + "trace": { + "description": "detailed error trace", "type": "array", "items": { - "$ref": "#/definitions/ErrorFieldContract" + "type": "string" }, - "description": "The list of invalid fields send in request, in case of validation error." + "readOnly": true } } }, @@ -598,4 +605,4 @@ "x-ms-parameter-location": "method" } } -} +} \ No newline at end of file From 8db80e428a6863253448de5a81b6c9f7905ec91f Mon Sep 17 00:00:00 2001 From: tonykslee Date: Thu, 19 Nov 2020 15:23:52 -0800 Subject: [PATCH 14/40] added more examples and fixed responses --- .../2020-10-20/examples/MyWorkbookAdd.json | 21 ------ .../2020-10-20/examples/MyWorkbookAdd2.json | 47 +++++++++++++ .../2020-10-20/examples/WorkbookAdd.json | 22 ------ .../2020-10-20/examples/WorkbookAdd2.json | 48 +++++++++++++ .../examples/WorkbookManagedAdd.json | 35 +--------- .../examples/WorkbookManagedAdd2.json | 68 +++++++++++++++++++ .../stable/2020-10-20/myworkbooks_API.json | 3 + .../stable/2020-10-20/workbooks_API.json | 6 ++ 8 files changed, 173 insertions(+), 77 deletions(-) create mode 100644 specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookAdd2.json create mode 100644 specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookAdd2.json create mode 100644 specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedAdd2.json diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookAdd.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookAdd.json index 8c336dfb16e5..9f6c59039068 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookAdd.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookAdd.json @@ -42,27 +42,6 @@ "TagSample02" ] } - }, - "201": { - "body": { - "id": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/my-resource-group/providers/Microsoft.Insights/myworkbooks/deadb33f-8bee-4d3b-a059-9be8dac93960", - "type": "", - "location": "westus", - "name": "deadb33f-8bee-4d3b-a059-9be8dac93960", - "kind": "user", - "properties": { - "sourceId": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.Web/sites/MyTestApp-CodeLens", - "displayName": "Blah Blah Blah", - "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[{\"type\":1,\"content\":\"{\"json\":\"## New workbook\\r\\n---\\r\\n\\r\\nWelcome to your new workbook. This area will display text formatted as markdown.\\r\\n\\r\\n\\r\\nWe've included a basic analytics query to get you started. Use the `Edit` button below each section to configure it or add more sections.\"}\",\"halfWidth\":null,\"conditionalVisibility\":null},{\"type\":3,\"content\":\"{\"version\":\"KqlItem/1.0\",\"query\":\"union withsource=TableName *\\n| summarize Count=count() by TableName\\n| render barchart\",\"showQuery\":false,\"size\":1,\"aggregation\":0,\"showAnnotations\":false}\",\"halfWidth\":null,\"conditionalVisibility\":null}],\"isLocked\":false}", - "version": "ME", - "category": "workbook", - "storageUri": null - }, - "tags": [ - "TagSample01", - "TagSample02" - ] - } } } } diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookAdd2.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookAdd2.json new file mode 100644 index 000000000000..f066cb7becc7 --- /dev/null +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookAdd2.json @@ -0,0 +1,47 @@ +{ + "parameters": { + "api-version": "2020-10-20", + "resourceGroupName": "my-resource-group", + "resourceName": "deadb33f-8bee-4d3b-a059-9be8dac93960", + "subscriptionId": "00000000-0000-0000-0000-00000000", + "workbookProperties": { + "id": "c0deea5e-3344-40f2-96f8-6f8e1c3b5722", + "name": "deadb33f-8bee-4d3b-a059-9be8dac93960", + "location": "west us", + "kind": "user", + "properties": { + "sourceId": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.Web/sites/MyTestApp-CodeLens", + "displayName": "Blah Blah Blah", + "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[{\"type\":1,\"content\":\"{\"json\":\"## New workbook\\r\\n---\\r\\n\\r\\nWelcome to your new workbook. This area will display text formatted as markdown.\\r\\n\\r\\n\\r\\nWe've included a basic analytics query to get you started. Use the `Edit` button below each section to configure it or add more sections.\"}\",\"halfWidth\":null,\"conditionalVisibility\":null},{\"type\":3,\"content\":\"{\"version\":\"KqlItem/1.0\",\"query\":\"union withsource=TableName *\\n| summarize Count=count() by TableName\\n| render barchart\",\"showQuery\":false,\"size\":1,\"aggregation\":0,\"showAnnotations\":false}\",\"halfWidth\":null,\"conditionalVisibility\":null}],\"isLocked\":false}", + "category": "workbook" + }, + "tags": [ + "TagSample01", + "TagSample02" + ] + } + }, + "responses": { + "201": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/my-resource-group/providers/Microsoft.Insights/myworkbooks/deadb33f-8bee-4d3b-a059-9be8dac93960", + "type": "", + "location": "westus", + "name": "deadb33f-8bee-4d3b-a059-9be8dac93960", + "kind": "user", + "properties": { + "sourceId": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.Web/sites/MyTestApp-CodeLens", + "displayName": "Blah Blah Blah", + "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[{\"type\":1,\"content\":\"{\"json\":\"## New workbook\\r\\n---\\r\\n\\r\\nWelcome to your new workbook. This area will display text formatted as markdown.\\r\\n\\r\\n\\r\\nWe've included a basic analytics query to get you started. Use the `Edit` button below each section to configure it or add more sections.\"}\",\"halfWidth\":null,\"conditionalVisibility\":null},{\"type\":3,\"content\":\"{\"version\":\"KqlItem/1.0\",\"query\":\"union withsource=TableName *\\n| summarize Count=count() by TableName\\n| render barchart\",\"showQuery\":false,\"size\":1,\"aggregation\":0,\"showAnnotations\":false}\",\"halfWidth\":null,\"conditionalVisibility\":null}],\"isLocked\":false}", + "version": "ME", + "category": "workbook", + "storageUri": null + }, + "tags": [ + "TagSample01", + "TagSample02" + ] + } + } + } +} diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookAdd.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookAdd.json index 70df230ce76e..301394084f16 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookAdd.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookAdd.json @@ -43,28 +43,6 @@ "TagSample02" ] } - }, - "201": { - "body": { - "id": "c0deea5e-3344-40f2-96f8-6f8e1c3b5722", - "type": "", - "location": "westus", - "name": "deadb33f-8bee-4d3b-a059-9be8dac93960", - "kind": "shared", - "properties": { - "displayName": "Blah Blah Blah", - "userId": "userId", - "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[{\"type\":1,\"content\":\"{\"json\":\"## New workbook\\r\\n---\\r\\n\\r\\nWelcome to your new workbook. This area will display text formatted as markdown.\\r\\n\\r\\n\\r\\nWe've included a basic analytics query to get you started. Use the `Edit` button below each section to configure it or add more sections.\"}\",\"halfWidth\":null,\"conditionalVisibility\":null},{\"type\":3,\"content\":\"{\"version\":\"KqlItem/1.0\",\"query\":\"union withsource=TableName *\\n| summarize Count=count() by TableName\\n| render barchart\",\"showQuery\":false,\"size\":1,\"aggregation\":0,\"showAnnotations\":false}\",\"halfWidth\":null,\"conditionalVisibility\":null}],\"isLocked\":false}", - "version": "ME", - "category": "workbook", - "timeModified": null, - "storageUri": null - }, - "tags": [ - "TagSample01", - "TagSample02" - ] - } } } } diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookAdd2.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookAdd2.json new file mode 100644 index 000000000000..53087d4df271 --- /dev/null +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookAdd2.json @@ -0,0 +1,48 @@ +{ + "parameters": { + "api-version": "2020-10-20", + "resourceGroupName": "my-resource-group", + "resourceName": "deadb33f-8bee-4d3b-a059-9be8dac93960", + "subscriptionId": "subid", + "sourceId": "/subscriptions/00000000-0000-0000-0000-00000000/resourcegroups/MyGroup", + "workbookProperties": { + "id": "c0deea5e-3344-40f2-96f8-6f8e1c3b5722", + "location": "west us", + "name": "Blah Blah Blah", + "kind": "shared", + "properties": { + "displayName": "tttt", + "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[{\"type\":1,\"content\":\"{\"json\":\"## New workbook\\r\\n---\\r\\n\\r\\nWelcome to your new workbook. This area will display text formatted as markdown.\\r\\n\\r\\n\\r\\nWe've included a basic analytics query to get you started. Use the `Edit` button below each section to configure it or add more sections.\"}\",\"halfWidth\":null,\"conditionalVisibility\":null},{\"type\":3,\"content\":\"{\"version\":\"KqlItem/1.0\",\"query\":\"union withsource=TableName *\\n| summarize Count=count() by TableName\\n| render barchart\",\"showQuery\":false,\"size\":1,\"aggregation\":0,\"showAnnotations\":false}\",\"halfWidth\":null,\"conditionalVisibility\":null}],\"isLocked\":false}", + "category": "workbook" + }, + "tags": [ + "TagSample01", + "TagSample02" + ] + } + }, + "responses": { + "201": { + "body": { + "id": "c0deea5e-3344-40f2-96f8-6f8e1c3b5722", + "type": "", + "location": "westus", + "name": "deadb33f-8bee-4d3b-a059-9be8dac93960", + "kind": "shared", + "properties": { + "displayName": "Blah Blah Blah", + "userId": "userId", + "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[{\"type\":1,\"content\":\"{\"json\":\"## New workbook\\r\\n---\\r\\n\\r\\nWelcome to your new workbook. This area will display text formatted as markdown.\\r\\n\\r\\n\\r\\nWe've included a basic analytics query to get you started. Use the `Edit` button below each section to configure it or add more sections.\"}\",\"halfWidth\":null,\"conditionalVisibility\":null},{\"type\":3,\"content\":\"{\"version\":\"KqlItem/1.0\",\"query\":\"union withsource=TableName *\\n| summarize Count=count() by TableName\\n| render barchart\",\"showQuery\":false,\"size\":1,\"aggregation\":0,\"showAnnotations\":false}\",\"halfWidth\":null,\"conditionalVisibility\":null}],\"isLocked\":false}", + "version": "ME", + "category": "workbook", + "timeModified": null, + "storageUri": null + }, + "tags": [ + "TagSample01", + "TagSample02" + ] + } + } + } +} diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedAdd.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedAdd.json index 4ff6f6e5e4dc..276a2331b5e5 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedAdd.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedAdd.json @@ -63,39 +63,6 @@ "storageUri": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.Storage/storageAccounts/testStorage/blobServices/default/containers/testContainer" } } - }, - "201": { - "body": { - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/eu2cgroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": { - "clientId": "fbe75b66-01c5-4f87-a220-233af3270432", - "principalId": "075a0ca6-43f6-4434-9abf-c9b1b79f9x19" - } - } - }, - "id": "/subscriptions/00000000-0000-0000-0000-00000000/resourcegroups/MyGroup/providers/Microsoft.Insights/workbooks/72377f0c-b7e7-4044-a882-471bcbd9696e", - "name": "e378d137-1243-4256-b5c4-ad2a937cae79", - "type": "Microsoft.Insights/workbooks", - "location": "westus", - "tags": { - "hidden-title": "tttt" - }, - "kind": "user", - "etag": "\"4a00f85e-0000-0700-0000-5f8f5dfa0000\"", - "properties": { - "displayName": "tttt", - "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[],\"isLocked\":false,\"fallbackResourceIds\":[\"/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.OperationalInsights/workspaces/test-ws\"]}", - "version": "Notebook/1.0", - "category": "workbook", - "userId": "70d90f65-8a70-4e42-b8d5-86gv25e0a90f", - "sourceId": "/subscriptions/00000000-0000-0000-0000-00000000/resourcegroups/MyGroup", - "timeModified": "2020-10-20T22:00:26.4229554Z", - "tags": [], - "storageUri": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.Storage/storageAccounts/testStorage/blobServices/default/containers/testContainer" - } - } } } -} +} \ No newline at end of file diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedAdd2.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedAdd2.json new file mode 100644 index 000000000000..27f977b6afd4 --- /dev/null +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedAdd2.json @@ -0,0 +1,68 @@ +{ + "parameters": { + "api-version": "2020-10-20", + "resourceGroupName": "my-resource-group", + "subscriptionId": "6b643656-33eb-422f-aee8-3ac145d124af", + "resourceName": "deadb33f-5e0d-4064-8ebb-1a4ed0313eb2", + "sourceId": "/subscriptions/00000000-0000-0000-0000-00000000/resourcegroups/MyGroup", + "workbookProperties": { + "id": "/subscriptions/00000000-0000-0000-0000-00000000/resourcegroups/MyGroup/providers/Microsoft.Insights/workbooks/e378d137-1243-4256-b5c4-ad2a937cae79", + "name": "e378d137-1243-4256-b5c4-ad2a937cae79", + "location": "westus", + "tags": { + "hidden-title": "tttt" + }, + "kind": "shared", + "etag": "\"4a00f78d-0000-0700-0000-5f8f616c1000\"", + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/eu2cgroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": {} + } + }, + "properties": { + "displayName": "tttt", + "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[{\"type\":1,\"content\":{\"json\":\"test\"},\"name\":\"text - 0\"}],\"isLocked\":false,\"fallbackResourceIds\":[\"/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup\"]}", + "version": "Notebook/1.0", + "category": "workbook", + "tags": [], + "storageUri": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.Storage/storageAccounts/testStorage/blobServices/default/containers/testContainer" + } + } + }, + "responses": { + "201": { + "body": { + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/eu2cgroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": { + "clientId": "fbe75b66-01c5-4f87-a220-233af3270432", + "principalId": "075a0ca6-43f6-4434-9abf-c9b1b79f9x19" + } + } + }, + "id": "/subscriptions/00000000-0000-0000-0000-00000000/resourcegroups/MyGroup/providers/Microsoft.Insights/workbooks/72377f0c-b7e7-4044-a882-471bcbd9696e", + "name": "e378d137-1243-4256-b5c4-ad2a937cae79", + "type": "Microsoft.Insights/workbooks", + "location": "westus", + "tags": { + "hidden-title": "tttt" + }, + "kind": "user", + "etag": "\"4a00f85e-0000-0700-0000-5f8f5dfa0000\"", + "properties": { + "displayName": "tttt", + "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[],\"isLocked\":false,\"fallbackResourceIds\":[\"/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.OperationalInsights/workspaces/test-ws\"]}", + "version": "Notebook/1.0", + "category": "workbook", + "userId": "70d90f65-8a70-4e42-b8d5-86gv25e0a90f", + "sourceId": "/subscriptions/00000000-0000-0000-0000-00000000/resourcegroups/MyGroup", + "timeModified": "2020-10-20T22:00:26.4229554Z", + "tags": [], + "storageUri": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.Storage/storageAccounts/testStorage/blobServices/default/containers/testContainer" + } + } + } + } +} \ No newline at end of file diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json index f32c2652a1b5..48c1335e8573 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json @@ -257,6 +257,9 @@ "x-ms-examples": { "WorkbookAdd": { "$ref": "./examples/MyWorkbookAdd.json" + }, + "WorkbookAdd2": { + "$ref": "./examples/MyWorkbookAdd2.json" } } }, diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 706bf1e65aed..893959706f1c 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -224,6 +224,12 @@ }, "WorkbookAdd": { "$ref": "./examples/WorkbookAdd.json" + }, + "WorkbookManagedAdd2": { + "$ref": "./examples/WorkbookManagedAdd2.json" + }, + "WorkbookAdd2": { + "$ref": "./examples/WorkbookAdd2.json" } } }, From b7f1235d58da902d074563a1a73db73629dab616 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Thu, 19 Nov 2020 16:10:07 -0800 Subject: [PATCH 15/40] testing out removing non standard resource fields --- .../stable/2020-10-20/myworkbooks_API.json | 8 ++--- .../stable/2020-10-20/workbooks_API.json | 32 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json index 48c1335e8573..b3a2d69686f7 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json @@ -314,10 +314,10 @@ "definitions": { "MyWorkbookResource": { "properties": { - "identity": { - "description": "Identity used for BYOS", - "$ref": "#/definitions/ManagedIdentity" - }, + // "identity": { + // "description": "Identity used for BYOS", + // "$ref": "#/definitions/ManagedIdentity" + // }, "id": { "type": "string", "description": "Azure resource Id", diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 893959706f1c..d4ca40aed619 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -296,10 +296,10 @@ "definitions": { "Resource": { "properties": { - "identity": { - "description": "Identity used for BYOS", - "$ref": "#/definitions/ManagedIdentity" - }, + // "identity": { + // "description": "Identity used for BYOS", + // "$ref": "#/definitions/ManagedIdentity" + // }, "id": { "type": "string", "readOnly": true, @@ -315,18 +315,18 @@ "readOnly": true, "description": "Azure resource type" }, - "kind": { - "type": "string", - "description": "The kind of workbook. Choices are user and shared.", - "enum": [ - "user", - "shared" - ], - "x-ms-enum": { - "name": "kind", - "modelAsString": true - } - }, + // "kind": { + // "type": "string", + // "description": "The kind of workbook. Choices are user and shared.", + // "enum": [ + // "user", + // "shared" + // ], + // "x-ms-enum": { + // "name": "kind", + // "modelAsString": true + // } + // }, "location": { "type": "string", "description": "Resource location", From 6c3dee318f1e1357a59449ceb24d55f5e3cc376a Mon Sep 17 00:00:00 2001 From: tonykslee Date: Thu, 19 Nov 2020 16:17:45 -0800 Subject: [PATCH 16/40] added back in existing properties --- .../stable/2020-10-20/myworkbooks_API.json | 8 ++--- .../stable/2020-10-20/workbooks_API.json | 32 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json index b3a2d69686f7..48c1335e8573 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json @@ -314,10 +314,10 @@ "definitions": { "MyWorkbookResource": { "properties": { - // "identity": { - // "description": "Identity used for BYOS", - // "$ref": "#/definitions/ManagedIdentity" - // }, + "identity": { + "description": "Identity used for BYOS", + "$ref": "#/definitions/ManagedIdentity" + }, "id": { "type": "string", "description": "Azure resource Id", diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index d4ca40aed619..893959706f1c 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -296,10 +296,10 @@ "definitions": { "Resource": { "properties": { - // "identity": { - // "description": "Identity used for BYOS", - // "$ref": "#/definitions/ManagedIdentity" - // }, + "identity": { + "description": "Identity used for BYOS", + "$ref": "#/definitions/ManagedIdentity" + }, "id": { "type": "string", "readOnly": true, @@ -315,18 +315,18 @@ "readOnly": true, "description": "Azure resource type" }, - // "kind": { - // "type": "string", - // "description": "The kind of workbook. Choices are user and shared.", - // "enum": [ - // "user", - // "shared" - // ], - // "x-ms-enum": { - // "name": "kind", - // "modelAsString": true - // } - // }, + "kind": { + "type": "string", + "description": "The kind of workbook. Choices are user and shared.", + "enum": [ + "user", + "shared" + ], + "x-ms-enum": { + "name": "kind", + "modelAsString": true + } + }, "location": { "type": "string", "description": "Resource location", From 3fefdbde0fa10711813396400abdcdc62f88193a Mon Sep 17 00:00:00 2001 From: tonykslee Date: Thu, 19 Nov 2020 16:38:47 -0800 Subject: [PATCH 17/40] removed the failing examples --- .../2020-10-20/examples/MyWorkbookAdd.json | 21 ++++++++ .../2020-10-20/examples/MyWorkbookAdd2.json | 47 ------------------ .../2020-10-20/examples/WorkbookAdd.json | 22 +++++++++ .../2020-10-20/examples/WorkbookAdd2.json | 48 ------------------- .../stable/2020-10-20/myworkbooks_API.json | 3 -- 5 files changed, 43 insertions(+), 98 deletions(-) delete mode 100644 specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookAdd2.json delete mode 100644 specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookAdd2.json diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookAdd.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookAdd.json index 9f6c59039068..8c336dfb16e5 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookAdd.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookAdd.json @@ -42,6 +42,27 @@ "TagSample02" ] } + }, + "201": { + "body": { + "id": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/my-resource-group/providers/Microsoft.Insights/myworkbooks/deadb33f-8bee-4d3b-a059-9be8dac93960", + "type": "", + "location": "westus", + "name": "deadb33f-8bee-4d3b-a059-9be8dac93960", + "kind": "user", + "properties": { + "sourceId": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.Web/sites/MyTestApp-CodeLens", + "displayName": "Blah Blah Blah", + "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[{\"type\":1,\"content\":\"{\"json\":\"## New workbook\\r\\n---\\r\\n\\r\\nWelcome to your new workbook. This area will display text formatted as markdown.\\r\\n\\r\\n\\r\\nWe've included a basic analytics query to get you started. Use the `Edit` button below each section to configure it or add more sections.\"}\",\"halfWidth\":null,\"conditionalVisibility\":null},{\"type\":3,\"content\":\"{\"version\":\"KqlItem/1.0\",\"query\":\"union withsource=TableName *\\n| summarize Count=count() by TableName\\n| render barchart\",\"showQuery\":false,\"size\":1,\"aggregation\":0,\"showAnnotations\":false}\",\"halfWidth\":null,\"conditionalVisibility\":null}],\"isLocked\":false}", + "version": "ME", + "category": "workbook", + "storageUri": null + }, + "tags": [ + "TagSample01", + "TagSample02" + ] + } } } } diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookAdd2.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookAdd2.json deleted file mode 100644 index f066cb7becc7..000000000000 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbookAdd2.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "parameters": { - "api-version": "2020-10-20", - "resourceGroupName": "my-resource-group", - "resourceName": "deadb33f-8bee-4d3b-a059-9be8dac93960", - "subscriptionId": "00000000-0000-0000-0000-00000000", - "workbookProperties": { - "id": "c0deea5e-3344-40f2-96f8-6f8e1c3b5722", - "name": "deadb33f-8bee-4d3b-a059-9be8dac93960", - "location": "west us", - "kind": "user", - "properties": { - "sourceId": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.Web/sites/MyTestApp-CodeLens", - "displayName": "Blah Blah Blah", - "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[{\"type\":1,\"content\":\"{\"json\":\"## New workbook\\r\\n---\\r\\n\\r\\nWelcome to your new workbook. This area will display text formatted as markdown.\\r\\n\\r\\n\\r\\nWe've included a basic analytics query to get you started. Use the `Edit` button below each section to configure it or add more sections.\"}\",\"halfWidth\":null,\"conditionalVisibility\":null},{\"type\":3,\"content\":\"{\"version\":\"KqlItem/1.0\",\"query\":\"union withsource=TableName *\\n| summarize Count=count() by TableName\\n| render barchart\",\"showQuery\":false,\"size\":1,\"aggregation\":0,\"showAnnotations\":false}\",\"halfWidth\":null,\"conditionalVisibility\":null}],\"isLocked\":false}", - "category": "workbook" - }, - "tags": [ - "TagSample01", - "TagSample02" - ] - } - }, - "responses": { - "201": { - "body": { - "id": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/my-resource-group/providers/Microsoft.Insights/myworkbooks/deadb33f-8bee-4d3b-a059-9be8dac93960", - "type": "", - "location": "westus", - "name": "deadb33f-8bee-4d3b-a059-9be8dac93960", - "kind": "user", - "properties": { - "sourceId": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.Web/sites/MyTestApp-CodeLens", - "displayName": "Blah Blah Blah", - "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[{\"type\":1,\"content\":\"{\"json\":\"## New workbook\\r\\n---\\r\\n\\r\\nWelcome to your new workbook. This area will display text formatted as markdown.\\r\\n\\r\\n\\r\\nWe've included a basic analytics query to get you started. Use the `Edit` button below each section to configure it or add more sections.\"}\",\"halfWidth\":null,\"conditionalVisibility\":null},{\"type\":3,\"content\":\"{\"version\":\"KqlItem/1.0\",\"query\":\"union withsource=TableName *\\n| summarize Count=count() by TableName\\n| render barchart\",\"showQuery\":false,\"size\":1,\"aggregation\":0,\"showAnnotations\":false}\",\"halfWidth\":null,\"conditionalVisibility\":null}],\"isLocked\":false}", - "version": "ME", - "category": "workbook", - "storageUri": null - }, - "tags": [ - "TagSample01", - "TagSample02" - ] - } - } - } -} diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookAdd.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookAdd.json index 301394084f16..70df230ce76e 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookAdd.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookAdd.json @@ -43,6 +43,28 @@ "TagSample02" ] } + }, + "201": { + "body": { + "id": "c0deea5e-3344-40f2-96f8-6f8e1c3b5722", + "type": "", + "location": "westus", + "name": "deadb33f-8bee-4d3b-a059-9be8dac93960", + "kind": "shared", + "properties": { + "displayName": "Blah Blah Blah", + "userId": "userId", + "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[{\"type\":1,\"content\":\"{\"json\":\"## New workbook\\r\\n---\\r\\n\\r\\nWelcome to your new workbook. This area will display text formatted as markdown.\\r\\n\\r\\n\\r\\nWe've included a basic analytics query to get you started. Use the `Edit` button below each section to configure it or add more sections.\"}\",\"halfWidth\":null,\"conditionalVisibility\":null},{\"type\":3,\"content\":\"{\"version\":\"KqlItem/1.0\",\"query\":\"union withsource=TableName *\\n| summarize Count=count() by TableName\\n| render barchart\",\"showQuery\":false,\"size\":1,\"aggregation\":0,\"showAnnotations\":false}\",\"halfWidth\":null,\"conditionalVisibility\":null}],\"isLocked\":false}", + "version": "ME", + "category": "workbook", + "timeModified": null, + "storageUri": null + }, + "tags": [ + "TagSample01", + "TagSample02" + ] + } } } } diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookAdd2.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookAdd2.json deleted file mode 100644 index 53087d4df271..000000000000 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookAdd2.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parameters": { - "api-version": "2020-10-20", - "resourceGroupName": "my-resource-group", - "resourceName": "deadb33f-8bee-4d3b-a059-9be8dac93960", - "subscriptionId": "subid", - "sourceId": "/subscriptions/00000000-0000-0000-0000-00000000/resourcegroups/MyGroup", - "workbookProperties": { - "id": "c0deea5e-3344-40f2-96f8-6f8e1c3b5722", - "location": "west us", - "name": "Blah Blah Blah", - "kind": "shared", - "properties": { - "displayName": "tttt", - "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[{\"type\":1,\"content\":\"{\"json\":\"## New workbook\\r\\n---\\r\\n\\r\\nWelcome to your new workbook. This area will display text formatted as markdown.\\r\\n\\r\\n\\r\\nWe've included a basic analytics query to get you started. Use the `Edit` button below each section to configure it or add more sections.\"}\",\"halfWidth\":null,\"conditionalVisibility\":null},{\"type\":3,\"content\":\"{\"version\":\"KqlItem/1.0\",\"query\":\"union withsource=TableName *\\n| summarize Count=count() by TableName\\n| render barchart\",\"showQuery\":false,\"size\":1,\"aggregation\":0,\"showAnnotations\":false}\",\"halfWidth\":null,\"conditionalVisibility\":null}],\"isLocked\":false}", - "category": "workbook" - }, - "tags": [ - "TagSample01", - "TagSample02" - ] - } - }, - "responses": { - "201": { - "body": { - "id": "c0deea5e-3344-40f2-96f8-6f8e1c3b5722", - "type": "", - "location": "westus", - "name": "deadb33f-8bee-4d3b-a059-9be8dac93960", - "kind": "shared", - "properties": { - "displayName": "Blah Blah Blah", - "userId": "userId", - "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[{\"type\":1,\"content\":\"{\"json\":\"## New workbook\\r\\n---\\r\\n\\r\\nWelcome to your new workbook. This area will display text formatted as markdown.\\r\\n\\r\\n\\r\\nWe've included a basic analytics query to get you started. Use the `Edit` button below each section to configure it or add more sections.\"}\",\"halfWidth\":null,\"conditionalVisibility\":null},{\"type\":3,\"content\":\"{\"version\":\"KqlItem/1.0\",\"query\":\"union withsource=TableName *\\n| summarize Count=count() by TableName\\n| render barchart\",\"showQuery\":false,\"size\":1,\"aggregation\":0,\"showAnnotations\":false}\",\"halfWidth\":null,\"conditionalVisibility\":null}],\"isLocked\":false}", - "version": "ME", - "category": "workbook", - "timeModified": null, - "storageUri": null - }, - "tags": [ - "TagSample01", - "TagSample02" - ] - } - } - } -} diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json index 48c1335e8573..f32c2652a1b5 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json @@ -257,9 +257,6 @@ "x-ms-examples": { "WorkbookAdd": { "$ref": "./examples/MyWorkbookAdd.json" - }, - "WorkbookAdd2": { - "$ref": "./examples/MyWorkbookAdd2.json" } } }, From 72cc9f9d2aa90f8aea4606d27db5e0f4173e0850 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Thu, 19 Nov 2020 16:43:37 -0800 Subject: [PATCH 18/40] added back in the suppressions --- .../applicationinsights/resource-manager/readme.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/specification/applicationinsights/resource-manager/readme.md b/specification/applicationinsights/resource-manager/readme.md index 8644f45f3fac..d1aac3e4b801 100644 --- a/specification/applicationinsights/resource-manager/readme.md +++ b/specification/applicationinsights/resource-manager/readme.md @@ -77,10 +77,10 @@ directive: reason: 'This api was existing there from 2015, it will break existing client if we change the name' - suppress: R2066 reason: There are a bug in this rule. "ExportConfigurations_Create" is a valid operation id. - # - suppress: OBJECT_ADDITIONAL_PROPERTIES - # where: $.definitions.Workbook - # from: workbooks_API.json - # reason: 'This property is already a part of our API, so we cannot remove it' + - suppress: OBJECT_ADDITIONAL_PROPERTIES + where: $.definitions.Workbook + from: workbooks_API.json + reason: 'This property is already a part of our API, so we cannot remove it' - suppress: READONLY_PROPERTY_NOT_ALLOWED_IN_REQUEST where: $.definitions.Resource.properties.name from: types.json @@ -121,9 +121,9 @@ directive: - suppress: DeleteOperationResponses from: favorites_API.json reason: 'consistent with existing delete response | owned by another team' - # - suppress: DeleteOperationResponses - # from: workbooks_API.json - # reason: 'consistent with existing delete response' + - suppress: DeleteOperationResponses + from: workbooks_API.json + reason: 'consistent with existing delete response' - suppress: DefaultErrorResponseSchema from: componentAnnotations_API.json reason: 'consistent with existing default error response | owned by another team' From 6b38d9f7196099d58433e8e4c99e81848c1f77f7 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Thu, 19 Nov 2020 17:05:40 -0800 Subject: [PATCH 19/40] removed unused example --- .../examples/WorkbookManagedAdd.json | 35 +++++++++- .../examples/WorkbookManagedAdd2.json | 68 ------------------- 2 files changed, 34 insertions(+), 69 deletions(-) delete mode 100644 specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedAdd2.json diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedAdd.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedAdd.json index 276a2331b5e5..4ff6f6e5e4dc 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedAdd.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedAdd.json @@ -63,6 +63,39 @@ "storageUri": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.Storage/storageAccounts/testStorage/blobServices/default/containers/testContainer" } } + }, + "201": { + "body": { + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/eu2cgroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": { + "clientId": "fbe75b66-01c5-4f87-a220-233af3270432", + "principalId": "075a0ca6-43f6-4434-9abf-c9b1b79f9x19" + } + } + }, + "id": "/subscriptions/00000000-0000-0000-0000-00000000/resourcegroups/MyGroup/providers/Microsoft.Insights/workbooks/72377f0c-b7e7-4044-a882-471bcbd9696e", + "name": "e378d137-1243-4256-b5c4-ad2a937cae79", + "type": "Microsoft.Insights/workbooks", + "location": "westus", + "tags": { + "hidden-title": "tttt" + }, + "kind": "user", + "etag": "\"4a00f85e-0000-0700-0000-5f8f5dfa0000\"", + "properties": { + "displayName": "tttt", + "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[],\"isLocked\":false,\"fallbackResourceIds\":[\"/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.OperationalInsights/workspaces/test-ws\"]}", + "version": "Notebook/1.0", + "category": "workbook", + "userId": "70d90f65-8a70-4e42-b8d5-86gv25e0a90f", + "sourceId": "/subscriptions/00000000-0000-0000-0000-00000000/resourcegroups/MyGroup", + "timeModified": "2020-10-20T22:00:26.4229554Z", + "tags": [], + "storageUri": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.Storage/storageAccounts/testStorage/blobServices/default/containers/testContainer" + } + } } } -} \ No newline at end of file +} diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedAdd2.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedAdd2.json deleted file mode 100644 index 27f977b6afd4..000000000000 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedAdd2.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "parameters": { - "api-version": "2020-10-20", - "resourceGroupName": "my-resource-group", - "subscriptionId": "6b643656-33eb-422f-aee8-3ac145d124af", - "resourceName": "deadb33f-5e0d-4064-8ebb-1a4ed0313eb2", - "sourceId": "/subscriptions/00000000-0000-0000-0000-00000000/resourcegroups/MyGroup", - "workbookProperties": { - "id": "/subscriptions/00000000-0000-0000-0000-00000000/resourcegroups/MyGroup/providers/Microsoft.Insights/workbooks/e378d137-1243-4256-b5c4-ad2a937cae79", - "name": "e378d137-1243-4256-b5c4-ad2a937cae79", - "location": "westus", - "tags": { - "hidden-title": "tttt" - }, - "kind": "shared", - "etag": "\"4a00f78d-0000-0700-0000-5f8f616c1000\"", - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/eu2cgroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": {} - } - }, - "properties": { - "displayName": "tttt", - "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[{\"type\":1,\"content\":{\"json\":\"test\"},\"name\":\"text - 0\"}],\"isLocked\":false,\"fallbackResourceIds\":[\"/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup\"]}", - "version": "Notebook/1.0", - "category": "workbook", - "tags": [], - "storageUri": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.Storage/storageAccounts/testStorage/blobServices/default/containers/testContainer" - } - } - }, - "responses": { - "201": { - "body": { - "identity": { - "type": "UserAssigned", - "userAssignedIdentities": { - "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/eu2cgroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": { - "clientId": "fbe75b66-01c5-4f87-a220-233af3270432", - "principalId": "075a0ca6-43f6-4434-9abf-c9b1b79f9x19" - } - } - }, - "id": "/subscriptions/00000000-0000-0000-0000-00000000/resourcegroups/MyGroup/providers/Microsoft.Insights/workbooks/72377f0c-b7e7-4044-a882-471bcbd9696e", - "name": "e378d137-1243-4256-b5c4-ad2a937cae79", - "type": "Microsoft.Insights/workbooks", - "location": "westus", - "tags": { - "hidden-title": "tttt" - }, - "kind": "user", - "etag": "\"4a00f85e-0000-0700-0000-5f8f5dfa0000\"", - "properties": { - "displayName": "tttt", - "serializedData": "{\"version\":\"Notebook/1.0\",\"items\":[],\"isLocked\":false,\"fallbackResourceIds\":[\"/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.OperationalInsights/workspaces/test-ws\"]}", - "version": "Notebook/1.0", - "category": "workbook", - "userId": "70d90f65-8a70-4e42-b8d5-86gv25e0a90f", - "sourceId": "/subscriptions/00000000-0000-0000-0000-00000000/resourcegroups/MyGroup", - "timeModified": "2020-10-20T22:00:26.4229554Z", - "tags": [], - "storageUri": "/subscriptions/00000000-0000-0000-0000-00000000/resourceGroups/MyGroup/providers/Microsoft.Storage/storageAccounts/testStorage/blobServices/default/containers/testContainer" - } - } - } - } -} \ No newline at end of file From ba2bfe5750bbca1ec9dd4265e37b713d69fe7b5c Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 09:42:43 -0800 Subject: [PATCH 20/40] removed reference to get2 and add2 example files --- .../stable/2020-10-20/workbooks_API.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 893959706f1c..dcc178e8be87 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -124,9 +124,6 @@ "WorkbookGet": { "$ref": "./examples/WorkbookGet.json" }, - "WorkbookGet2": { - "$ref": "./examples/WorkbookGet2.json" - }, "WorkbookManagedGet": { "$ref": "./examples/WorkbookManagedGet.json" } @@ -224,12 +221,6 @@ }, "WorkbookAdd": { "$ref": "./examples/WorkbookAdd.json" - }, - "WorkbookManagedAdd2": { - "$ref": "./examples/WorkbookManagedAdd2.json" - }, - "WorkbookAdd2": { - "$ref": "./examples/WorkbookAdd2.json" } } }, From a970943b915381c1611640f4951031d9b8bc5dd5 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 09:47:08 -0800 Subject: [PATCH 21/40] updated workbook_update to only produce a 201 response --- .../Microsoft.Insights/stable/2020-10-20/workbooks_API.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index dcc178e8be87..466f7697b006 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -254,12 +254,6 @@ } ], "responses": { - "200": { - "description": "The workbook definition updated.", - "schema": { - "$ref": "#/definitions/Workbook" - } - }, "201": { "description": "The workbook definition updated.", "schema": { From b736fdca91ff992dd647ea6bd97c50e90b69d04d Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 09:58:10 -0800 Subject: [PATCH 22/40] updated managedUpdate response code --- .../stable/2020-10-20/examples/WorkbookManagedUpdate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedUpdate.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedUpdate.json index 5ca493f45419..19c26211df97 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedUpdate.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookManagedUpdate.json @@ -30,7 +30,7 @@ } }, "responses": { - "200": { + "201": { "body": { "identity": { "type": "UserAssigned", From 6ea471e89a51e656732c9f6c31e8cd9b1d14eecd Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 10:02:22 -0800 Subject: [PATCH 23/40] updated workbook error name --- .../Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json index f32c2652a1b5..5e9dde36dbc3 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json @@ -450,7 +450,7 @@ } } }, - "WorkbookError": { + "MyWorkbookError": { "description": "Error response.", "properties": { "error": { From 7afa42332a1f507ba64756b551a10e38714b0489 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 10:31:45 -0800 Subject: [PATCH 24/40] added nextLink to examples --- .../stable/2020-10-20/examples/MyWorkbooksList.json | 3 ++- .../stable/2020-10-20/examples/WorkbooksList.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbooksList.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbooksList.json index a59c2857a8eb..65e9571d7073 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbooksList.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/MyWorkbooksList.json @@ -47,7 +47,8 @@ "storageUri": null } } - ] + ], + "nextLink": null } } } diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbooksList.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbooksList.json index 81a32353127f..80a2b1b94f95 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbooksList.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbooksList.json @@ -50,7 +50,8 @@ "storageUri": null } } - ] + ], + "nextLink": null } } } From dc913a3ca5de628d77b748beda0c87d58b4c7e57 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 10:51:49 -0800 Subject: [PATCH 25/40] Delete WorkbookGet2.json --- .../2020-10-20/examples/WorkbookGet2.json | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookGet2.json diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookGet2.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookGet2.json deleted file mode 100644 index 5f7a8ce846c1..000000000000 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/examples/WorkbookGet2.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parameters": { - "api-version": "2020-10-20", - "subscriptionId": "6b643656-33eb-422f-aee8-3ac145d124af", - "resourceGroupName": "my-resource-group", - "resourceName": "deadb33f-5e0d-4064-8ebb-1a4ed0313eb2" - }, - "responses": { - "200": { - "body": { - "id": "c0deea5e-3344-40f2-96f8-6f8e1c3b5722", - "name": "deadb33f-8bee-4d3b-a059-9be8dac93960", - "type": "", - "location": "westus", - "kind": "shared", - "properties": { - "displayName": "My New Workbook", - "userId": "userId", - "serializedData": null, - "version": "ME", - "category": "workbook", - "timeModified": null, - "storageUri": null - }, - "tags": [ - "TagSample01", - "TagSample02" - ] - } - } - } -} From 558946746087f03ca0107dac41746fde282e61c5 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 10:56:07 -0800 Subject: [PATCH 26/40] ran prettier --- .../Microsoft.Insights/stable/2020-10-20/workbooks_API.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 466f7697b006..281d6d207014 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -596,4 +596,4 @@ "x-ms-parameter-location": "method" } } -} \ No newline at end of file +} From 81ac6cc68ea39ae3b152b55b956f70e7ea5558b6 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 11:26:43 -0800 Subject: [PATCH 27/40] added nextLink in list result --- .../Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json | 3 +++ .../Microsoft.Insights/stable/2020-10-20/workbooks_API.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json index 5e9dde36dbc3..d9da5fcdbb38 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json @@ -366,6 +366,9 @@ "$ref": "#/definitions/MyWorkbook" }, "description": "An array of private workbooks." + }, + "nextLink": { + "type": "string" } }, "description": "Workbook list result." diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 281d6d207014..2ad69381f432 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -339,6 +339,9 @@ "$ref": "#/definitions/Workbook" }, "description": "An array of workbooks." + }, + "nextLink": { + "type": "string" } }, "description": "Workbook list result." From 7772dd5daf2b313fd863f3baa8fcfc4f7e77e6c6 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 11:59:39 -0800 Subject: [PATCH 28/40] removed suppression for test --- .../applicationinsights/resource-manager/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/applicationinsights/resource-manager/readme.md b/specification/applicationinsights/resource-manager/readme.md index d1aac3e4b801..85edeff61eb8 100644 --- a/specification/applicationinsights/resource-manager/readme.md +++ b/specification/applicationinsights/resource-manager/readme.md @@ -77,10 +77,10 @@ directive: reason: 'This api was existing there from 2015, it will break existing client if we change the name' - suppress: R2066 reason: There are a bug in this rule. "ExportConfigurations_Create" is a valid operation id. - - suppress: OBJECT_ADDITIONAL_PROPERTIES - where: $.definitions.Workbook - from: workbooks_API.json - reason: 'This property is already a part of our API, so we cannot remove it' + # - suppress: OBJECT_ADDITIONAL_PROPERTIES + # where: $.definitions.Workbook + # from: workbooks_API.json + # reason: 'This property is already a part of our API, so we cannot remove it' - suppress: READONLY_PROPERTY_NOT_ALLOWED_IN_REQUEST where: $.definitions.Resource.properties.name from: types.json From 9aa76af839643ceaa448944bf998ac8b09beac89 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 12:14:19 -0800 Subject: [PATCH 29/40] removed x-ms-enum --- .../Microsoft.Insights/stable/2020-10-20/workbooks_API.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 2ad69381f432..4de43cdf2191 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -306,11 +306,7 @@ "enum": [ "user", "shared" - ], - "x-ms-enum": { - "name": "kind", - "modelAsString": true - } + ] }, "location": { "type": "string", From f1c3eef4d8b783052ed81b2f5601ead590804f99 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 12:41:19 -0800 Subject: [PATCH 30/40] removed x-ms-azure-resource --- .../stable/2020-10-20/workbooks_API.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 4de43cdf2191..728b58791fa9 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -306,7 +306,11 @@ "enum": [ "user", "shared" - ] + ], + "x-ms-enum": { + "name": "kind", + "modelAsString": true + } }, "location": { "type": "string", @@ -324,7 +328,6 @@ "description": "Resource tags" } }, - "x-ms-azure-resource": true, "description": "An azure resource object" }, "WorkbooksListResult": { From 27139efb9cfe2dce1c90fe9c33486e3e60311e65 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 12:45:22 -0800 Subject: [PATCH 31/40] added back the x-ms-azure-resource --- .../Microsoft.Insights/stable/2020-10-20/workbooks_API.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 728b58791fa9..2ad69381f432 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -328,6 +328,7 @@ "description": "Resource tags" } }, + "x-ms-azure-resource": true, "description": "An azure resource object" }, "WorkbooksListResult": { From ddf88f0988c13bddd9f4f02628839a8f33fb12e3 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 14:03:05 -0800 Subject: [PATCH 32/40] try removiung identity and kind --- .../stable/2020-10-20/workbooks_API.json | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 2ad69381f432..bd75306e1821 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -281,10 +281,10 @@ "definitions": { "Resource": { "properties": { - "identity": { - "description": "Identity used for BYOS", - "$ref": "#/definitions/ManagedIdentity" - }, + // "identity": { + // "description": "Identity used for BYOS", + // "$ref": "#/definitions/ManagedIdentity" + // }, "id": { "type": "string", "readOnly": true, @@ -300,18 +300,18 @@ "readOnly": true, "description": "Azure resource type" }, - "kind": { - "type": "string", - "description": "The kind of workbook. Choices are user and shared.", - "enum": [ - "user", - "shared" - ], - "x-ms-enum": { - "name": "kind", - "modelAsString": true - } - }, + // "kind": { + // "type": "string", + // "description": "The kind of workbook. Choices are user and shared.", + // "enum": [ + // "user", + // "shared" + // ], + // "x-ms-enum": { + // "name": "kind", + // "modelAsString": true + // } + // }, "location": { "type": "string", "description": "Resource location", From 82bdfd4608ced9648f7ba200eeab5149c4189d5b Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 14:54:08 -0800 Subject: [PATCH 33/40] Revert "try removiung identity and kind" This reverts commit ddf88f0988c13bddd9f4f02628839a8f33fb12e3. --- .../stable/2020-10-20/workbooks_API.json | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index bd75306e1821..2ad69381f432 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -281,10 +281,10 @@ "definitions": { "Resource": { "properties": { - // "identity": { - // "description": "Identity used for BYOS", - // "$ref": "#/definitions/ManagedIdentity" - // }, + "identity": { + "description": "Identity used for BYOS", + "$ref": "#/definitions/ManagedIdentity" + }, "id": { "type": "string", "readOnly": true, @@ -300,18 +300,18 @@ "readOnly": true, "description": "Azure resource type" }, - // "kind": { - // "type": "string", - // "description": "The kind of workbook. Choices are user and shared.", - // "enum": [ - // "user", - // "shared" - // ], - // "x-ms-enum": { - // "name": "kind", - // "modelAsString": true - // } - // }, + "kind": { + "type": "string", + "description": "The kind of workbook. Choices are user and shared.", + "enum": [ + "user", + "shared" + ], + "x-ms-enum": { + "name": "kind", + "modelAsString": true + } + }, "location": { "type": "string", "description": "Resource location", From b6a287f994d31d5edcc01694a07e433ba96a4444 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 19:24:29 -0800 Subject: [PATCH 34/40] removed extra example references --- .../stable/2020-10-20/workbooks_API.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 2ad69381f432..3fdccbcdd241 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -79,9 +79,6 @@ "nextLinkName": "nextLink" }, "x-ms-examples": { - "WorkbooksList": { - "$ref": "./examples/WorkbooksList.json" - }, "WorkbooksManagedList": { "$ref": "./examples/WorkbooksManagedList.json" } @@ -121,9 +118,6 @@ } }, "x-ms-examples": { - "WorkbookGet": { - "$ref": "./examples/WorkbookGet.json" - }, "WorkbookManagedGet": { "$ref": "./examples/WorkbookManagedGet.json" } @@ -218,9 +212,6 @@ "x-ms-examples": { "WorkbookManagedAdd": { "$ref": "./examples/WorkbookManagedAdd.json" - }, - "WorkbookAdd": { - "$ref": "./examples/WorkbookAdd.json" } } }, @@ -270,9 +261,6 @@ "x-ms-examples": { "WorkbookManagedUpdate": { "$ref": "./examples/WorkbookManagedUpdate.json" - }, - "WorkbookUpdate": { - "$ref": "./examples/WorkbookUpdate.json" } } } From 6a82c5ce825e4be3df3ac34398cddb730aaed0f8 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 19:27:41 -0800 Subject: [PATCH 35/40] Revert "removed extra example references" This reverts commit b6a287f994d31d5edcc01694a07e433ba96a4444. --- .../stable/2020-10-20/workbooks_API.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 3fdccbcdd241..2ad69381f432 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -79,6 +79,9 @@ "nextLinkName": "nextLink" }, "x-ms-examples": { + "WorkbooksList": { + "$ref": "./examples/WorkbooksList.json" + }, "WorkbooksManagedList": { "$ref": "./examples/WorkbooksManagedList.json" } @@ -118,6 +121,9 @@ } }, "x-ms-examples": { + "WorkbookGet": { + "$ref": "./examples/WorkbookGet.json" + }, "WorkbookManagedGet": { "$ref": "./examples/WorkbookManagedGet.json" } @@ -212,6 +218,9 @@ "x-ms-examples": { "WorkbookManagedAdd": { "$ref": "./examples/WorkbookManagedAdd.json" + }, + "WorkbookAdd": { + "$ref": "./examples/WorkbookAdd.json" } } }, @@ -261,6 +270,9 @@ "x-ms-examples": { "WorkbookManagedUpdate": { "$ref": "./examples/WorkbookManagedUpdate.json" + }, + "WorkbookUpdate": { + "$ref": "./examples/WorkbookUpdate.json" } } } From 5f81d03297dfceeb034acb2147f4f89154c4a287 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Fri, 20 Nov 2020 19:36:33 -0800 Subject: [PATCH 36/40] updated schema to match myworkbooks --- .../stable/2020-10-20/myworkbooks_API.json | 10 +--- .../stable/2020-10-20/workbooks_API.json | 54 +++++++++++-------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json index d9da5fcdbb38..0e63ac4bf8da 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json @@ -389,7 +389,7 @@ "shared" ], "x-ms-enum": { - "name": "SharedTypeKind", + "name": "kind", "modelAsString": true } }, @@ -564,14 +564,6 @@ "description": "Azure Resource Id that will fetch all linked workbooks.", "x-ms-parameter-location": "method" }, - "ResourceIdParameter": { - "name": "resourceId", - "in": "query", - "required": true, - "type": "string", - "description": "Azure Resource Id or any target workbook resource id.", - "x-ms-parameter-location": "method" - }, "CanFetchWorkbookContentParameter": { "name": "canFetchContent", "in": "query", diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 2ad69381f432..545edac61582 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -287,30 +287,27 @@ }, "id": { "type": "string", - "readOnly": true, - "description": "Azure resource Id" + "description": "Azure resource Id", + "x-ms-mutability": [ + "create", + "read" + ] }, "name": { "type": "string", - "readOnly": true, - "description": "Azure resource name. This is GUID value. The display name should be assigned within properties field." + "description": "Azure resource name", + "x-ms-mutability": [ + "create", + "read" + ] }, "type": { "type": "string", - "readOnly": true, - "description": "Azure resource type" - }, - "kind": { - "type": "string", - "description": "The kind of workbook. Choices are user and shared.", - "enum": [ - "user", - "shared" - ], - "x-ms-enum": { - "name": "kind", - "modelAsString": true - } + "description": "Azure resource type", + "x-ms-mutability": [ + "create", + "read" + ] }, "location": { "type": "string", @@ -321,7 +318,6 @@ ] }, "tags": { - "type": "object", "additionalProperties": { "type": "string" }, @@ -354,6 +350,18 @@ } ], "properties": { + "kind": { + "type": "string", + "description": "The kind of workbook. Choices are user and shared.", + "enum": [ + "user", + "shared" + ], + "x-ms-enum": { + "name": "kind", + "modelAsString": true + } + }, "properties": { "x-ms-client-flatten": true, "description": "Metadata describing a workbook for an Azure resource.", @@ -378,6 +386,10 @@ "x-nullable": true, "description": "Configuration of this particular workbook. Configuration data is a string containing valid JSON" }, + "version": { + "type": "string", + "description": "Workbook version" + }, "timeModified": { "type": "string", "description": "Date and time in UTC of the last modification that was made to this workbook definition.", @@ -387,10 +399,6 @@ "type": "string", "description": "Workbook category, as defined by the user at creation time." }, - "version": { - "type": "string", - "description": "Workbook version" - }, "tags": { "type": "array", "items": { From 9a2a3e7af55410f1e6779c6bdd19cf40e98b6508 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Mon, 23 Nov 2020 23:36:39 -0800 Subject: [PATCH 37/40] updated with some missing fields in actual response --- .../stable/2020-10-20/myworkbooks_API.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json index 0e63ac4bf8da..28f3133476f0 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json @@ -51,6 +51,9 @@ { "$ref": "#/parameters/TagsParameter" }, + { + "$ref": "#/parameters/SourceIdParameter" + }, { "$ref": "#/parameters/CanFetchWorkbookContentParameter" }, @@ -121,7 +124,7 @@ } }, "x-ms-pageable": { - "nextLinkName": null + "nextLinkName": "nextLink" }, "x-ms-examples": { "WorkbooksList": { @@ -221,6 +224,9 @@ { "$ref": "#/parameters/WorkbookResourceNameParameter" }, + { + "$ref": "#/parameters/SourceIdParameter" + }, { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, @@ -273,6 +279,9 @@ { "$ref": "#/parameters/WorkbookResourceNameParameter" }, + { + "$ref": "#/parameters/SourceIdParameter" + }, { "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" }, From a190ed31d34cd9dde5775d88d52ea12cf3172810 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Tue, 24 Nov 2020 10:46:51 -0800 Subject: [PATCH 38/40] added missing etag and marked sourceId as optional --- .../stable/2020-10-20/myworkbooks_API.json | 8 +++++++- .../stable/2020-10-20/workbooks_API.json | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json index 28f3133476f0..8e0eeb3f9050 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/myworkbooks_API.json @@ -361,6 +361,12 @@ "type": "string" }, "description": "Resource tags" + }, + "etag": { + "additionalProperties": { + "type": "string" + }, + "description": "Resource etag" } }, "x-ms-azure-resource": true, @@ -568,7 +574,7 @@ "SourceIdParameter": { "name": "sourceId", "in": "query", - "required": true, + "required": false, "type": "string", "description": "Azure Resource Id that will fetch all linked workbooks.", "x-ms-parameter-location": "method" diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index 545edac61582..a858b44b3ad4 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -322,6 +322,12 @@ "type": "string" }, "description": "Resource tags" + }, + "etag": { + "additionalProperties": { + "type": "string" + }, + "description": "Resource etag" } }, "x-ms-azure-resource": true, @@ -581,7 +587,7 @@ "SourceIdParameter": { "name": "sourceId", "in": "query", - "required": true, + "required": false, "type": "string", "description": "Azure Resource Id that will fetch all linked workbooks.", "x-ms-parameter-location": "method" From 262366e6b5d9dd38630c3aa9e31e8b1f10dc0b8a Mon Sep 17 00:00:00 2001 From: tonykslee Date: Tue, 24 Nov 2020 11:05:45 -0800 Subject: [PATCH 39/40] added readonly to workbookListResult --- .../Microsoft.Insights/stable/2020-10-20/workbooks_API.json | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json index a858b44b3ad4..55a5ae5f5574 100644 --- a/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json +++ b/specification/applicationinsights/resource-manager/Microsoft.Insights/stable/2020-10-20/workbooks_API.json @@ -337,6 +337,7 @@ "properties": { "value": { "type": "array", + "readOnly": true, "items": { "$ref": "#/definitions/Workbook" }, From 5cc408ab3b3117eab136d73ddc2915a0eafb65f3 Mon Sep 17 00:00:00 2001 From: tonykslee Date: Wed, 2 Dec 2020 23:36:40 -0800 Subject: [PATCH 40/40] reinstaed the suppression --- .../applicationinsights/resource-manager/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/applicationinsights/resource-manager/readme.md b/specification/applicationinsights/resource-manager/readme.md index 85edeff61eb8..d1aac3e4b801 100644 --- a/specification/applicationinsights/resource-manager/readme.md +++ b/specification/applicationinsights/resource-manager/readme.md @@ -77,10 +77,10 @@ directive: reason: 'This api was existing there from 2015, it will break existing client if we change the name' - suppress: R2066 reason: There are a bug in this rule. "ExportConfigurations_Create" is a valid operation id. - # - suppress: OBJECT_ADDITIONAL_PROPERTIES - # where: $.definitions.Workbook - # from: workbooks_API.json - # reason: 'This property is already a part of our API, so we cannot remove it' + - suppress: OBJECT_ADDITIONAL_PROPERTIES + where: $.definitions.Workbook + from: workbooks_API.json + reason: 'This property is already a part of our API, so we cannot remove it' - suppress: READONLY_PROPERTY_NOT_ALLOWED_IN_REQUEST where: $.definitions.Resource.properties.name from: types.json