Skip to content

Review request for Microsoft.BotService to update version stable/2021-03-01 #16882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akning-ms merged 10 commits into from
Dec 10, 2021
Merged

Review request for Microsoft.BotService to update version stable/2021-03-01 #16882

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
179e99f
fix api
zhixzhan Nov 25, 2021
ae696c5
add name property
zhixzhan Dec 7, 2021
8281dd2
update OP Channels_ListWithKeys
zhixzhan Dec 8, 2021
d25c840
update type
zhixzhan Dec 8, 2021
9f4bbd8
mark the parameter value as x-ms-secret
Danieladu Dec 9, 2021
5fe688b
allow null in value
Danieladu Dec 9, 2021
72d21e0
'
Danieladu Dec 9, 2021
4762ce0
Merge branch 'main' of https://github.com/Azure/azure-rest-api-specs …
zhixzhan Dec 9, 2021
4b989d0
Merge pull request #2 from Danieladu/dev-botservice-Microsoft.BotServ…
zhixzhan Dec 9, 2021
d2959ed
sync changes to 2021-05-01-preview
zhixzhan Dec 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update OP Channels_ListWithKeys
  • Loading branch information
@zhixzhan
zhixzhan committed Dec 8, 2021
commit 8281dd28eefa944347a751e299bbf0a09d6497fe
87 changes: 86 additions & 1 deletion ...tservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down
52 changes: 52 additions & 0 deletions ...esource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListChannel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
87 changes: 86 additions & 1 deletion ...cation/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down
52 changes: 52 additions & 0 deletions ...service/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/ListChannel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down