From 51fba5d7121e57e27663d9b42c0bc1e9550486c4 Mon Sep 17 00:00:00 2001 From: shzhen Date: Tue, 12 Jan 2021 15:52:12 +0800 Subject: [PATCH 01/17] fix live validation --- .../stable/2020-06-02/botservice.json | 10 ++++++++-- .../stable/2020-06-02/examples/GetConnection.json | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/stable/2020-06-02/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/stable/2020-06-02/botservice.json index 917facac9676..a59a048ea916 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/stable/2020-06-02/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/stable/2020-06-02/botservice.json @@ -762,6 +762,12 @@ "schema": { "$ref": "#/definitions/OperationEntityListResult" } + }, + "default": { + "description": "Error response describing why the operation failed", + "schema": { + "$ref": "#/definitions/Error" + } } }, "deprecated": false, @@ -806,7 +812,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.BotService/botServices/{resourceName}/Connections/{connectionName}/listWithSecrets": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.BotService/botServices/{resourceName}/connections/{connectionName}/listWithSecrets": { "post": { "tags": [ "BotConnection" @@ -851,7 +857,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.BotService/botServices/{resourceName}/Connections/{connectionName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.BotService/botServices/{resourceName}/connections/{connectionName}": { "put": { "tags": [ "BotConnection" diff --git a/specification/botservice/resource-manager/Microsoft.BotService/stable/2020-06-02/examples/GetConnection.json b/specification/botservice/resource-manager/Microsoft.BotService/stable/2020-06-02/examples/GetConnection.json index c43963179c9c..d2bb5e7ba2b6 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/stable/2020-06-02/examples/GetConnection.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/stable/2020-06-02/examples/GetConnection.json @@ -10,7 +10,7 @@ "200": { "body": { "location": "global", - "id": "/subscriptions/subscription-id/resourceGroups/OneResourceGroupName/providers/Microsoft.BotService/botServices/samplebotname/Connections/sampleConnection", + "id": "/subscriptions/subscription-id/resourceGroups/OneResourceGroupName/providers/Microsoft.BotService/botServices/samplebotname/connections/sampleConnection", "etag": "etag1", "name": "sampleConnection", "properties": { From 559e8e096d3480fb865078504db4c13eec640b27 Mon Sep 17 00:00:00 2001 From: shzhen Date: Fri, 15 Jan 2021 19:14:18 +0800 Subject: [PATCH 02/17] remove R4010 --- .../Microsoft.BotService/stable/2020-06-02/botservice.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/stable/2020-06-02/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/stable/2020-06-02/botservice.json index a59a048ea916..c5efb45ca635 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/stable/2020-06-02/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/stable/2020-06-02/botservice.json @@ -762,12 +762,6 @@ "schema": { "$ref": "#/definitions/OperationEntityListResult" } - }, - "default": { - "description": "Error response describing why the operation failed", - "schema": { - "$ref": "#/definitions/Error" - } } }, "deprecated": false, From 96247f501143346f5cb84ff4b5c7138e13e2a8af Mon Sep 17 00:00:00 2001 From: shzhen Date: Tue, 19 Jan 2021 11:15:32 +0800 Subject: [PATCH 03/17] suppress --- specification/botservice/resource-manager/readme.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/botservice/resource-manager/readme.md b/specification/botservice/resource-manager/readme.md index 94193fa33303..8359a3dc9103 100644 --- a/specification/botservice/resource-manager/readme.md +++ b/specification/botservice/resource-manager/readme.md @@ -114,6 +114,9 @@ directive: where: - $.definitions.FacebookChannelProperties.properties.verifyToken reason: We do need to return verifyToken in FacebookChannelProperties. + - suppress: R4009 + from: botservice.json + reason: We dont need this property in Bot Service. ``` From bb3cabd787f4fdc6d4e1bafe861116aae528e0be Mon Sep 17 00:00:00 2001 From: shzhen Date: Tue, 19 Jan 2021 11:23:08 +0800 Subject: [PATCH 04/17] suppress --- specification/botservice/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/botservice/resource-manager/readme.md b/specification/botservice/resource-manager/readme.md index 8359a3dc9103..34e902fd19d1 100644 --- a/specification/botservice/resource-manager/readme.md +++ b/specification/botservice/resource-manager/readme.md @@ -114,7 +114,7 @@ directive: where: - $.definitions.FacebookChannelProperties.properties.verifyToken reason: We do need to return verifyToken in FacebookChannelProperties. - - suppress: R4009 + - suppress: RequiredSystemDataInNewApiVersions from: botservice.json reason: We dont need this property in Bot Service. ``` From 10d30a518fb645a3a00d4ace276149f1d27ac11a Mon Sep 17 00:00:00 2001 From: shzhen Date: Tue, 19 Jan 2021 11:32:47 +0800 Subject: [PATCH 05/17] suppress --- specification/botservice/resource-manager/readme.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/specification/botservice/resource-manager/readme.md b/specification/botservice/resource-manager/readme.md index 34e902fd19d1..a0e4b63d92fd 100644 --- a/specification/botservice/resource-manager/readme.md +++ b/specification/botservice/resource-manager/readme.md @@ -114,9 +114,11 @@ directive: where: - $.definitions.FacebookChannelProperties.properties.verifyToken reason: We do need to return verifyToken in FacebookChannelProperties. - - suppress: RequiredSystemDataInNewApiVersions - from: botservice.json - reason: We dont need this property in Bot Service. + - suppress: R4009 # RequiredSystemDataInNewApiVersions + from: + - Microsoft.BotService/stable/2020-06-02/botservice.json + reason: + - We do not yet support systemdata ``` From d25c7d4802856bdab6e0f400d7cd74ba65e0487a Mon Sep 17 00:00:00 2001 From: shzhen Date: Tue, 19 Jan 2021 11:49:10 +0800 Subject: [PATCH 06/17] suppress --- specification/botservice/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/botservice/resource-manager/readme.md b/specification/botservice/resource-manager/readme.md index a0e4b63d92fd..35f2b89ae678 100644 --- a/specification/botservice/resource-manager/readme.md +++ b/specification/botservice/resource-manager/readme.md @@ -114,7 +114,7 @@ directive: where: - $.definitions.FacebookChannelProperties.properties.verifyToken reason: We do need to return verifyToken in FacebookChannelProperties. - - suppress: R4009 # RequiredSystemDataInNewApiVersions + - suppress: RequiredSystemDataInNewApiVersions from: - Microsoft.BotService/stable/2020-06-02/botservice.json reason: From 4e956143f41d93f7d57d997be6587678d3aabcde Mon Sep 17 00:00:00 2001 From: shzhen Date: Tue, 19 Jan 2021 12:10:59 +0800 Subject: [PATCH 07/17] suppress --- specification/botservice/resource-manager/readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/specification/botservice/resource-manager/readme.md b/specification/botservice/resource-manager/readme.md index 35f2b89ae678..5edc39a16eff 100644 --- a/specification/botservice/resource-manager/readme.md +++ b/specification/botservice/resource-manager/readme.md @@ -115,8 +115,6 @@ directive: - $.definitions.FacebookChannelProperties.properties.verifyToken reason: We do need to return verifyToken in FacebookChannelProperties. - suppress: RequiredSystemDataInNewApiVersions - from: - - Microsoft.BotService/stable/2020-06-02/botservice.json reason: - We do not yet support systemdata ``` From 08f463da42661585c2de30e2b83177953f2314f1 Mon Sep 17 00:00:00 2001 From: shzhen Date: Tue, 19 Jan 2021 12:19:21 +0800 Subject: [PATCH 08/17] suppress --- specification/botservice/resource-manager/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/botservice/resource-manager/readme.md b/specification/botservice/resource-manager/readme.md index 5edc39a16eff..35f2b89ae678 100644 --- a/specification/botservice/resource-manager/readme.md +++ b/specification/botservice/resource-manager/readme.md @@ -115,6 +115,8 @@ directive: - $.definitions.FacebookChannelProperties.properties.verifyToken reason: We do need to return verifyToken in FacebookChannelProperties. - suppress: RequiredSystemDataInNewApiVersions + from: + - Microsoft.BotService/stable/2020-06-02/botservice.json reason: - We do not yet support systemdata ``` From 3dafedda618ebf3d73edf47189a384ab4e85877d Mon Sep 17 00:00:00 2001 From: shzhen Date: Tue, 19 Jan 2021 12:38:57 +0800 Subject: [PATCH 09/17] suppress --- specification/botservice/resource-manager/readme.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/specification/botservice/resource-manager/readme.md b/specification/botservice/resource-manager/readme.md index 35f2b89ae678..38fe6afc41af 100644 --- a/specification/botservice/resource-manager/readme.md +++ b/specification/botservice/resource-manager/readme.md @@ -108,13 +108,16 @@ swagger-to-sdk: ## Suppression ``` directive: - - suppress: SECRET_PROPERTY + - suppress: + - SECRET_PROPERTY from: - Microsoft.BotService/stable/2020-06-02/botservice.json where: - $.definitions.FacebookChannelProperties.properties.verifyToken - reason: We do need to return verifyToken in FacebookChannelProperties. - - suppress: RequiredSystemDataInNewApiVersions + reason: + - We do need to return verifyToken in FacebookChannelProperties. + - suppress: + - RequiredSystemDataInNewApiVersions from: - Microsoft.BotService/stable/2020-06-02/botservice.json reason: From 00cf8a5154c789003bdeb90557e45779edadd54b Mon Sep 17 00:00:00 2001 From: shzhen Date: Tue, 19 Jan 2021 12:48:17 +0800 Subject: [PATCH 10/17] suppress From 2566ef152a4aaaade96eb423d1aabd36bbff0745 Mon Sep 17 00:00:00 2001 From: shzhen Date: Tue, 19 Jan 2021 14:52:50 +0800 Subject: [PATCH 11/17] suppress --- specification/botservice/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/botservice/resource-manager/readme.md b/specification/botservice/resource-manager/readme.md index 38fe6afc41af..67e854f76a1b 100644 --- a/specification/botservice/resource-manager/readme.md +++ b/specification/botservice/resource-manager/readme.md @@ -121,7 +121,7 @@ directive: from: - Microsoft.BotService/stable/2020-06-02/botservice.json reason: - - We do not yet support systemdata + - We do not yet support systemdata. ``` From c082c379811b22880681fe48fc3f357073020ccb Mon Sep 17 00:00:00 2001 From: shzhen Date: Tue, 19 Jan 2021 15:01:32 +0800 Subject: [PATCH 12/17] suppress --- specification/botservice/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/botservice/resource-manager/readme.md b/specification/botservice/resource-manager/readme.md index 67e854f76a1b..f8df68f83ce1 100644 --- a/specification/botservice/resource-manager/readme.md +++ b/specification/botservice/resource-manager/readme.md @@ -117,7 +117,7 @@ directive: reason: - We do need to return verifyToken in FacebookChannelProperties. - suppress: - - RequiredSystemDataInNewApiVersions + - R4009 from: - Microsoft.BotService/stable/2020-06-02/botservice.json reason: From b5c2e806afc1975fdba575c8d67e1ccaca142423 Mon Sep 17 00:00:00 2001 From: shzhen Date: Tue, 19 Jan 2021 15:09:24 +0800 Subject: [PATCH 13/17] suppress --- specification/botservice/resource-manager/readme.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/specification/botservice/resource-manager/readme.md b/specification/botservice/resource-manager/readme.md index f8df68f83ce1..5dfd13091e2c 100644 --- a/specification/botservice/resource-manager/readme.md +++ b/specification/botservice/resource-manager/readme.md @@ -37,6 +37,10 @@ These settings apply only when `--tag=package-2020-06-02` is specified on the co ```yaml $(tag) == 'package-2020-06-02' input-file: - Microsoft.BotService/stable/2020-06-02/botservice.json +directive: + - suppress: R4009 + from: botservice.json + reason: We do not yet support systemdata. ``` @@ -116,12 +120,6 @@ directive: - $.definitions.FacebookChannelProperties.properties.verifyToken reason: - We do need to return verifyToken in FacebookChannelProperties. - - suppress: - - R4009 - from: - - Microsoft.BotService/stable/2020-06-02/botservice.json - reason: - - We do not yet support systemdata. ``` From fe9a436b631afa3f092bdee931d9ad518800176d Mon Sep 17 00:00:00 2001 From: shzhen Date: Tue, 19 Jan 2021 15:19:03 +0800 Subject: [PATCH 14/17] suppress --- .../botservice/resource-manager/readme.md | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/specification/botservice/resource-manager/readme.md b/specification/botservice/resource-manager/readme.md index 5dfd13091e2c..c89c550b60b8 100644 --- a/specification/botservice/resource-manager/readme.md +++ b/specification/botservice/resource-manager/readme.md @@ -37,10 +37,6 @@ These settings apply only when `--tag=package-2020-06-02` is specified on the co ```yaml $(tag) == 'package-2020-06-02' input-file: - Microsoft.BotService/stable/2020-06-02/botservice.json -directive: - - suppress: R4009 - from: botservice.json - reason: We do not yet support systemdata. ``` @@ -112,14 +108,13 @@ swagger-to-sdk: ## Suppression ``` directive: - - suppress: - - SECRET_PROPERTY - from: - - Microsoft.BotService/stable/2020-06-02/botservice.json - where: - - $.definitions.FacebookChannelProperties.properties.verifyToken - reason: - - We do need to return verifyToken in FacebookChannelProperties. + - suppress: SECRET_PROPERTY + from: Microsoft.BotService/stable/2020-06-02/botservice.json + where: $.definitions.FacebookChannelProperties.properties.verifyToken + reason: We do need to return verifyToken in FacebookChannelProperties. + - suppress: R4009 + from: Microsoft.BotService/stable/2020-06-02/botservice.json + reason: We do not yet support systemdata. ``` From 9b87db5c406bbf499c8387b5a07ddd7fce1fe713 Mon Sep 17 00:00:00 2001 From: shzhen Date: Tue, 19 Jan 2021 15:26:13 +0800 Subject: [PATCH 15/17] suppress --- specification/botservice/resource-manager/readme.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/specification/botservice/resource-manager/readme.md b/specification/botservice/resource-manager/readme.md index c89c550b60b8..3581e0a427b0 100644 --- a/specification/botservice/resource-manager/readme.md +++ b/specification/botservice/resource-manager/readme.md @@ -36,7 +36,11 @@ These settings apply only when `--tag=package-2020-06-02` is specified on the co ```yaml $(tag) == 'package-2020-06-02' input-file: - - Microsoft.BotService/stable/2020-06-02/botservice.json +- Microsoft.BotService/stable/2020-06-02/botservice.json +directive: + - suppress: R4009 + from: botservice.json + reason: We do not yet support systemdata. ``` @@ -109,11 +113,11 @@ swagger-to-sdk: ``` directive: - suppress: SECRET_PROPERTY - from: Microsoft.BotService/stable/2020-06-02/botservice.json + from: botservice.json where: $.definitions.FacebookChannelProperties.properties.verifyToken reason: We do need to return verifyToken in FacebookChannelProperties. - suppress: R4009 - from: Microsoft.BotService/stable/2020-06-02/botservice.json + from: botservice.json reason: We do not yet support systemdata. ``` From d1f146391f632bc0c1634d4e4e25121fe98291bb Mon Sep 17 00:00:00 2001 From: shzhen Date: Tue, 19 Jan 2021 15:31:12 +0800 Subject: [PATCH 16/17] suppress --- specification/botservice/resource-manager/readme.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/specification/botservice/resource-manager/readme.md b/specification/botservice/resource-manager/readme.md index 3581e0a427b0..7616698defe5 100644 --- a/specification/botservice/resource-manager/readme.md +++ b/specification/botservice/resource-manager/readme.md @@ -37,10 +37,6 @@ These settings apply only when `--tag=package-2020-06-02` is specified on the co ```yaml $(tag) == 'package-2020-06-02' input-file: - Microsoft.BotService/stable/2020-06-02/botservice.json -directive: - - suppress: R4009 - from: botservice.json - reason: We do not yet support systemdata. ``` From 3679452a5db7ceb6d19450e7679a700244ae668c Mon Sep 17 00:00:00 2001 From: shzhen Date: Tue, 19 Jan 2021 15:37:36 +0800 Subject: [PATCH 17/17] suppress --- specification/botservice/resource-manager/readme.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/specification/botservice/resource-manager/readme.md b/specification/botservice/resource-manager/readme.md index 7616698defe5..6e1824037d67 100644 --- a/specification/botservice/resource-manager/readme.md +++ b/specification/botservice/resource-manager/readme.md @@ -37,6 +37,10 @@ These settings apply only when `--tag=package-2020-06-02` is specified on the co ```yaml $(tag) == 'package-2020-06-02' input-file: - Microsoft.BotService/stable/2020-06-02/botservice.json +directive: + - suppress: R4009 + from: botservice.json + reason: We do not yet support systemdata. ``` @@ -112,9 +116,6 @@ directive: from: botservice.json where: $.definitions.FacebookChannelProperties.properties.verifyToken reason: We do need to return verifyToken in FacebookChannelProperties. - - suppress: R4009 - from: botservice.json - reason: We do not yet support systemdata. ```