From 179e99f333f94ba0f3f0a9341dc11d6352f448bb Mon Sep 17 00:00:00 2001 From: zhixzhan <49866537+zhixzhan@users.noreply.github.com> Date: Thu, 25 Nov 2021 16:11:35 +0800 Subject: [PATCH 1/8] fix api --- .../2021-05-01-preview/botservice.json | 110 +++--------------- .../stable/2021-03-01/botservice.json | 66 +++-------- 2 files changed, 34 insertions(+), 142 deletions(-) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json index 463ad9098055..eb118cc8595e 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json @@ -1690,6 +1690,10 @@ "type": "string", "description": "The channel schema transformation version for the bot" }, + "storageResourceId": { + "type": "string", + "description": "The storage resourceId for the bot" + }, "privateEndpointConnections": { "type": "array", "readOnly": true, @@ -1767,6 +1771,15 @@ "etag": { "type": "string", "description": "Entity Tag of the resource" + }, + "provisioningState": { + "type": "string", + "readOnly": true, + "description": "Provisioning state of the resource" + }, + "location": { + "description": "Specifies the location of the resource.", + "type": "string" } }, "required": [ @@ -1786,15 +1799,6 @@ "properties": { "$ref": "#/definitions/AlexaChannelProperties", "description": "The set of properties specific to Alexa channel resource" - }, - "etag": { - "type": "string", - "description": "Entity Tag of the resource" - }, - "provisioningState": { - "type": "string", - "readOnly": true, - "description": "Provisioning state of the resource" } } }, @@ -1838,14 +1842,6 @@ "properties": { "$ref": "#/definitions/FacebookChannelProperties", "description": "The set of properties specific to bot facebook channel" - }, - "provisioningState": { - "type": "string", - "description": "Provisioning state of the resource" - }, - "location": { - "type": "string", - "description": "Location of the resource" } } }, @@ -1919,14 +1915,6 @@ "properties": { "$ref": "#/definitions/EmailChannelProperties", "description": "The set of properties specific to email channel resource" - }, - "etag": { - "type": "string", - "description": "Entity Tag of the resource" - }, - "provisioningState": { - "type": "string", - "description": "Provisioning state of the resource" } } }, @@ -1964,18 +1952,6 @@ "properties": { "$ref": "#/definitions/MsTeamsChannelProperties", "description": "The set of properties specific to Microsoft Teams channel resource" - }, - "etag": { - "type": "string", - "description": "Entity Tag of the resource" - }, - "provisioningState": { - "type": "string", - "description": "Provisioning state of the resource" - }, - "location": { - "type": "string", - "description": "Location of the resource" } } }, @@ -2024,10 +2000,6 @@ "properties": { "$ref": "#/definitions/SkypeChannelProperties", "description": "The set of properties specific to Skype channel resource" - }, - "etag": { - "type": "string", - "description": "Entity Tag of the resource" } } }, @@ -2133,18 +2105,6 @@ "properties": { "$ref": "#/definitions/WebChatChannelProperties", "description": "The set of properties specific to Web Chat channel resource" - }, - "location": { - "type": "string", - "description": "Location of the resource" - }, - "provisioningState": { - "type": "string", - "description": "Provisioning state of the resource" - }, - "etag": { - "type": "string", - "description": "Entity Tag of the resource" } } }, @@ -2181,18 +2141,6 @@ "properties": { "$ref": "#/definitions/DirectLineChannelProperties", "description": "The set of properties specific to Direct Line channel resource" - }, - "etag": { - "type": "string", - "description": "Entity Tag of the resource" - }, - "provisioningState": { - "type": "string", - "description": "Provisioning state of the resource" - }, - "location": { - "type": "string", - "description": "Location of the resource" } } }, @@ -2225,14 +2173,6 @@ "properties": { "$ref": "#/definitions/TelegramChannelProperties", "description": "The set of properties specific to Telegram channel resource" - }, - "etag": { - "type": "string", - "description": "Entity Tag of the resource" - }, - "provisioningState": { - "type": "string", - "description": "Provisioning state of the resource" } } }, @@ -2270,10 +2210,6 @@ "properties": { "$ref": "#/definitions/SmsChannelProperties", "description": "The set of properties specific to Sms channel resource" - }, - "etag": { - "type": "string", - "description": "Entity Tag of the resource" } } }, @@ -2321,14 +2257,6 @@ "properties": { "$ref": "#/definitions/SlackChannelProperties", "description": "The set of properties specific to Slack channel resource" - }, - "etag": { - "type": "string", - "description": "Entity Tag of the resource" - }, - "location": { - "type": "string", - "description": "Location of the resource" } } }, @@ -2468,14 +2396,6 @@ "properties": { "$ref": "#/definitions/DirectLineSpeechChannelProperties", "description": "The set of properties specific to DirectLine Speech channel resource" - }, - "provisioningState": { - "type": "string", - "description": "Provisioning state of the resource" - }, - "etag": { - "type": "string", - "description": "Entity Tag of the resource" } } }, @@ -2693,6 +2613,10 @@ }, "ConnectionSettingProperties": { "properties": { + "id": { + "type": "string", + "description": "Id associated with the Connection Setting." + }, "clientId": { "type": "string", "description": "Client Id associated with the Connection Setting." diff --git a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json index 5ad8f265305e..122377e25056 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json @@ -1414,6 +1414,10 @@ "type": "string", "description": "The channel schema transformation version for the bot" }, + "storageResourceId": { + "type": "string", + "description": "The storage resourceId for the bot" + }, "openWithHint": { "type": "string", "description": "The hint to browser (e.g. protocol handler) on how to open the bot for authoring" @@ -1483,6 +1487,15 @@ "etag": { "type": "string", "description": "Entity Tag of the resource" + }, + "provisioningState": { + "type": "string", + "readOnly": true, + "description": "Provisioning state of the resource" + }, + "location": { + "description": "Specifies the location of the resource.", + "type": "string" } }, "required": [ @@ -1502,15 +1515,6 @@ "properties": { "$ref": "#/definitions/AlexaChannelProperties", "description": "The set of properties specific to Alexa channel resource" - }, - "etag": { - "type": "string", - "description": "Entity Tag of the resource" - }, - "provisioningState": { - "type": "string", - "readOnly": true, - "description": "Provisioning state of the resource" } } }, @@ -1664,18 +1668,6 @@ "properties": { "$ref": "#/definitions/MsTeamsChannelProperties", "description": "The set of properties specific to Microsoft Teams channel resource" - }, - "etag": { - "type": "string", - "description": "Entity Tag of the resource" - }, - "provisioningState": { - "type": "string", - "description": "Provisioning state of the resource" - }, - "location": { - "type": "string", - "description": "Location of the resource" } } }, @@ -1724,10 +1716,6 @@ "properties": { "$ref": "#/definitions/SkypeChannelProperties", "description": "The set of properties specific to Skype channel resource" - }, - "etag": { - "type": "string", - "description": "Entity Tag of the resource" } } }, @@ -1833,18 +1821,6 @@ "properties": { "$ref": "#/definitions/WebChatChannelProperties", "description": "The set of properties specific to Web Chat channel resource" - }, - "location": { - "type": "string", - "description": "Location of the resource" - }, - "provisioningState": { - "type": "string", - "description": "Provisioning state of the resource" - }, - "etag": { - "type": "string", - "description": "Entity Tag of the resource" } } }, @@ -1881,18 +1857,6 @@ "properties": { "$ref": "#/definitions/DirectLineChannelProperties", "description": "The set of properties specific to Direct Line channel resource" - }, - "etag": { - "type": "string", - "description": "Entity Tag of the resource" - }, - "provisioningState": { - "type": "string", - "description": "Provisioning state of the resource" - }, - "location": { - "type": "string", - "description": "Location of the resource" } } }, @@ -2361,6 +2325,10 @@ }, "ConnectionSettingProperties": { "properties": { + "id": { + "type": "string", + "description": "Id associated with the Connection Setting." + }, "clientId": { "type": "string", "description": "Client Id associated with the Connection Setting." From ae696c59d7f52300c45ce3003382ae84900674b3 Mon Sep 17 00:00:00 2001 From: zhixzhan <49866537+zhixzhan@users.noreply.github.com> Date: Tue, 7 Dec 2021 18:09:10 +0800 Subject: [PATCH 2/8] add name property --- .../preview/2021-05-01-preview/botservice.json | 4 ++++ .../Microsoft.BotService/stable/2021-03-01/botservice.json | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json index eb118cc8595e..1106faf79d18 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json @@ -2617,6 +2617,10 @@ "type": "string", "description": "Id associated with the Connection Setting." }, + "name": { + "type": "string", + "description": "Name associated with the Connection Setting." + }, "clientId": { "type": "string", "description": "Client Id associated with the Connection Setting." diff --git a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json index 122377e25056..ad008a6db7c0 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json @@ -2329,6 +2329,10 @@ "type": "string", "description": "Id associated with the Connection Setting." }, + "name": { + "type": "string", + "description": "Name associated with the Connection Setting." + }, "clientId": { "type": "string", "description": "Client Id associated with the Connection Setting." From 8281dd28eefa944347a751e299bbf0a09d6497fe Mon Sep 17 00:00:00 2001 From: zhixzhan <49866537+zhixzhan@users.noreply.github.com> Date: Wed, 8 Dec 2021 16:35:52 +0800 Subject: [PATCH 3/8] update OP Channels_ListWithKeys --- .../2021-05-01-preview/botservice.json | 87 ++++++++++++++++++- .../examples/ListChannel.json | 52 +++++++++++ .../stable/2021-03-01/botservice.json | 87 ++++++++++++++++++- .../2021-03-01/examples/ListChannel.json | 52 +++++++++++ 4 files changed, 276 insertions(+), 2 deletions(-) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json index 1106faf79d18..22452823319e 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json @@ -583,7 +583,7 @@ "200": { "description": "If resource is retrieved successfully, the service should return 200 (OK).", "schema": { - "$ref": "#/definitions/BotChannel" + "$ref": "#/definitions/ListChannelWithKeysResponse" } }, "default": { @@ -1744,6 +1744,25 @@ }, "description": "The list of bot service operation response." }, + "ListChannelWithKeysResponse": { + "type": "object", + "description": "The ARM channel of list channel with keys operation response.", + "allOf": [ + { + "$ref": "#/definitions/BotChannel" + } + ], + "properties": { + "resource": { + "$ref": "#/definitions/Channel", + "description": "The set of properties specific to bot channel resource" + }, + "setting": { + "$ref": "#/definitions/ChannelSettings", + "description": "Channel settings" + } + } + }, "BotChannel": { "type": "object", "description": "Bot channel resource definition", @@ -1759,6 +1778,51 @@ } } }, + "ChannelSettings": { + "type": "object", + "description": "Channel settings definition", + "properties": { + "extensionKey1": { + "type": "string", + "description": "The extensionKey1" + }, + "extensionKey2": { + "type": "string", + "description": "The extensionKey2" + }, + "sites": { + "type": "array", + "items": { + "$ref": "#/definitions/Site" + }, + "description": "The list of sites" + }, + "channelId": { + "type": "string", + "description": "The channel id" + }, + "channelDisplayName": { + "type": "string", + "description": "The channel display name" + }, + "botId": { + "type": "string", + "description": "The bot id" + }, + "botIconUrl": { + "type": "string", + "description": "The bot icon url" + }, + "isEnabled": { + "type": "boolean", + "description": "Whether this channel is enabled for the bot" + }, + "disableLocalAuth": { + "type": "boolean", + "description": "Opt-out of local authentication and ensure only MSI and AAD can be used exclusively for authentication." + } + } + }, "Channel": { "type": "object", "description": "Channel definition", @@ -2562,6 +2626,27 @@ "siteName" ] }, + "Site": { + "allOf": [ + { + "$ref": "#/definitions/WebChatSite" + }, + { + "$ref": "#/definitions/DirectLineSite" + } + ], + "properties": { + "isTokenEnabled": { + "type": "boolean", + "description": "Whether this site is token enabled for channel" + }, + "eTag": { + "type": "string", + "description": "Entity Tag" + } + }, + "description": "A site for the channel" + }, "SiteInfo": { "properties": { "siteName": { diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListChannel.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListChannel.json index 32ac3c958a19..e163698f4e09 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListChannel.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListChannel.json @@ -12,6 +12,58 @@ "responses": { "200": { "body": { + "resource": { + "properties": { + "sites": [ + { + "siteId": "aaaaaaaaaaa", + "siteName": "aaaaaaaaaaaa", + "key": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "key2": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "isEnabled": true, + "isV1Enabled": true, + "isV3Enabled": true, + "isSecureSiteEnabled": false, + "isBlockUserUploadEnabled": false, + "trustedOrigins": [ + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + ] + } + ] + }, + "etag": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "channelName": "DirectLineChannel", + "location": "aaaaaa" + }, + "setting": { + "extensionKey1": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "extensionKey2": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "sites": [ + { + "siteId": "aaaaaaaaaaa", + "siteName": "aaaaaaaaaaaa", + "key": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "key2": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "isEnabled": true, + "isV1Enabled": true, + "isV3Enabled": true, + "isWebchatPreviewEnabled": false, + "isSecureSiteEnabled": false, + "isBlockUserUploadEnabled": false, + "trustedOrigins": [ + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + ], + "isTokenEnabled": false, + "eTag": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + } + ], + "channelId": "aaaaaaaaaa", + "channelDisplayName": "aaaaaaaaaaa", + "botId": "aaaaaaaaaaaaaaaaaaaa", + "botIconUrl": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "isEnabled": true, + "disableLocalAuth": false + }, "location": "global", "properties": { "channelName": "EmailChannel", diff --git a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json index ad008a6db7c0..13de292f3348 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json @@ -583,7 +583,7 @@ "200": { "description": "If resource is retrieved successfully, the service should return 200 (OK).", "schema": { - "$ref": "#/definitions/BotChannel" + "$ref": "#/definitions/ListChannelWithKeysResponse" } }, "default": { @@ -1460,6 +1460,25 @@ }, "description": "The list of bot service operation response." }, + "ListChannelWithKeysResponse": { + "type": "object", + "description": "The ARM channel of list channel with keys operation response.", + "allOf": [ + { + "$ref": "#/definitions/BotChannel" + } + ], + "properties": { + "resource": { + "$ref": "#/definitions/Channel", + "description": "The set of properties specific to bot channel resource" + }, + "setting": { + "$ref": "#/definitions/ChannelSettings", + "description": "Channel settings" + } + } + }, "BotChannel": { "type": "object", "description": "Bot channel resource definition", @@ -1475,6 +1494,51 @@ } } }, + "ChannelSettings": { + "type": "object", + "description": "Channel settings definition", + "properties": { + "extensionKey1": { + "type": "string", + "description": "The extensionKey1" + }, + "extensionKey2": { + "type": "string", + "description": "The extensionKey2" + }, + "sites": { + "type": "array", + "items": { + "$ref": "#/definitions/Site" + }, + "description": "The list of sites" + }, + "channelId": { + "type": "string", + "description": "The channel id" + }, + "channelDisplayName": { + "type": "string", + "description": "The channel display name" + }, + "botId": { + "type": "string", + "description": "The bot id" + }, + "botIconUrl": { + "type": "string", + "description": "The bot icon url" + }, + "isEnabled": { + "type": "boolean", + "description": "Whether this channel is enabled for the bot" + }, + "disableLocalAuth": { + "type": "boolean", + "description": "Opt-out of local authentication and ensure only MSI and AAD can be used exclusively for authentication." + } + } + }, "Channel": { "type": "object", "description": "Channel definition", @@ -2274,6 +2338,27 @@ "siteName" ] }, + "Site": { + "allOf": [ + { + "$ref": "#/definitions/WebChatSite" + }, + { + "$ref": "#/definitions/DirectLineSite" + } + ], + "properties": { + "isTokenEnabled": { + "type": "boolean", + "description": "Whether this site is token enabled for channel" + }, + "eTag": { + "type": "string", + "description": "Entity Tag" + } + }, + "description": "A site for the channel" + }, "SiteInfo": { "properties": { "siteName": { diff --git a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/ListChannel.json b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/ListChannel.json index de952f0543e8..34c36d9fc898 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/ListChannel.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/ListChannel.json @@ -12,6 +12,58 @@ "responses": { "200": { "body": { + "resource": { + "properties": { + "sites": [ + { + "siteId": "aaaaaaaaaaa", + "siteName": "aaaaaaaaaaaa", + "key": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "key2": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "isEnabled": true, + "isV1Enabled": true, + "isV3Enabled": true, + "isSecureSiteEnabled": false, + "isBlockUserUploadEnabled": false, + "trustedOrigins": [ + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + ] + } + ] + }, + "etag": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "channelName": "DirectLineChannel", + "location": "aaaaaa" + }, + "setting": { + "extensionKey1": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "extensionKey2": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "sites": [ + { + "siteId": "aaaaaaaaaaa", + "siteName": "aaaaaaaaaaaa", + "key": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "key2": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "isEnabled": true, + "isV1Enabled": true, + "isV3Enabled": true, + "isWebchatPreviewEnabled": false, + "isSecureSiteEnabled": false, + "isBlockUserUploadEnabled": false, + "trustedOrigins": [ + "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + ], + "isTokenEnabled": false, + "eTag": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" + } + ], + "channelId": "aaaaaaaaaa", + "channelDisplayName": "aaaaaaaaaaa", + "botId": "aaaaaaaaaaaaaaaaaaaa", + "botIconUrl": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "isEnabled": true, + "disableLocalAuth": false + }, "location": "global", "properties": { "channelName": "EmailChannel", From d25c84060c155b0e3dee8a62486275de0afc1a98 Mon Sep 17 00:00:00 2001 From: zhixzhan <49866537+zhixzhan@users.noreply.github.com> Date: Wed, 8 Dec 2021 17:55:34 +0800 Subject: [PATCH 4/8] update type --- .../preview/2021-05-01-preview/botservice.json | 1 + .../Microsoft.BotService/stable/2021-03-01/botservice.json | 1 + 2 files changed, 2 insertions(+) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json index 22452823319e..6136553aa6b4 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json @@ -2627,6 +2627,7 @@ ] }, "Site": { + "type": "object", "allOf": [ { "$ref": "#/definitions/WebChatSite" diff --git a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json index 13de292f3348..f595d72289d6 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json @@ -2339,6 +2339,7 @@ ] }, "Site": { + "type": "object", "allOf": [ { "$ref": "#/definitions/WebChatSite" From 9f4bbd8c93334d554a9478b40d23f027e98dae37 Mon Sep 17 00:00:00 2001 From: "FAREAST\\hond" Date: Thu, 9 Dec 2021 16:13:14 +0800 Subject: [PATCH 5/8] mark the parameter value as x-ms-secret --- .../Microsoft.BotService/stable/2021-03-01/botservice.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json index 5ad8f265305e..81ae534df938 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json @@ -2354,7 +2354,8 @@ }, "value": { "type": "string", - "description": "Value associated with the Connection Setting Parameter." + "description": "Value associated with the Connection Setting Parameter.", + "x-ms-secret": true } }, "description": "Extra Parameter in a Connection Setting Properties to indicate service provider specific properties" From 5fe688bbc7887641e19d1bf98ec748b899dd638f Mon Sep 17 00:00:00 2001 From: "FAREAST\\hond" Date: Thu, 9 Dec 2021 16:19:36 +0800 Subject: [PATCH 6/8] allow null in value --- .../Microsoft.BotService/stable/2021-03-01/botservice.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json index 81ae534df938..c28b63450fcf 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json @@ -2355,7 +2355,7 @@ "value": { "type": "string", "description": "Value associated with the Connection Setting Parameter.", - "x-ms-secret": true + "x-nullable": true } }, "description": "Extra Parameter in a Connection Setting Properties to indicate service provider specific properties" From 72d21e0472ea5e41cc2160416b5a42f86c5668a9 Mon Sep 17 00:00:00 2001 From: "FAREAST\\hond" Date: Thu, 9 Dec 2021 17:00:32 +0800 Subject: [PATCH 7/8] ' --- .../Microsoft.BotService/stable/2021-03-01/botservice.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json index c28b63450fcf..6975db65ca31 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json @@ -1180,7 +1180,8 @@ }, "kind": { "$ref": "#/definitions/Kind", - "description": "Required. Gets or sets the Kind of the resource." + "description": "Required. Gets or sets the Kind of the resource.", + "x-nullable": true }, "etag": { "type": "string", @@ -2234,7 +2235,8 @@ }, "isWebchatPreviewEnabled": { "type": "boolean", - "description": "Whether this site is enabled for preview versions of Webchat" + "description": "Whether this site is enabled for preview versions of Webchat", + "default": false } }, "required": [ From d2959ed2308f3f04c11c443ffe290a7a14cd90c4 Mon Sep 17 00:00:00 2001 From: zhixzhan <49866537+zhixzhan@users.noreply.github.com> Date: Thu, 9 Dec 2021 17:26:22 +0800 Subject: [PATCH 8/8] sync changes to 2021-05-01-preview --- .../preview/2021-05-01-preview/botservice.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json index 6136553aa6b4..927fafb9ed93 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json @@ -1456,7 +1456,8 @@ }, "kind": { "$ref": "#/definitions/Kind", - "description": "Required. Gets or sets the Kind of the resource." + "description": "Required. Gets or sets the Kind of the resource.", + "x-nullable": true }, "etag": { "type": "string", @@ -2550,7 +2551,8 @@ }, "isWebchatPreviewEnabled": { "type": "boolean", - "description": "Whether this site is enabled for preview versions of Webchat" + "description": "Whether this site is enabled for preview versions of Webchat", + "default": false } }, "required": [ @@ -2692,7 +2694,8 @@ }, "value": { "type": "string", - "description": "Value associated with the Connection Setting Parameter." + "description": "Value associated with the Connection Setting Parameter.", + "x-nullable": true } }, "description": "Extra Parameter in a Connection Setting Properties to indicate service provider specific properties"