Skip to content

Commit

Permalink
Review request for Microsoft.BotService to update version stable/2021…
Browse files Browse the repository at this point in the history 
…-03-01 (Azure#16882)

* fix api

* add name property

* update OP Channels_ListWithKeys

* update type

* mark the parameter value as x-ms-secret

* allow null in value

* '

* sync changes to 2021-05-01-preview

Co-authored-by: FAREAST\hond <hond@microsoft.com>
  • Loading branch information
@zhixzhan @Danieladu @LeiWang3
2 people authored and LeiWang3 committed Mar 31, 2022
1 parent eb38217 commit e11ed03
Show file tree
Hide file tree
Showing 4 changed files with 332 additions and 150 deletions.
211 changes: 114 additions & 97 deletions ...tservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json
View file
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 @@ -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",
Expand Down Expand Up @@ -1690,6 +1691,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,
Expand Down Expand Up @@ -1740,6 +1745,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 @@ -1755,6 +1779,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 All @@ -1767,6 +1836,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": [
Expand All @@ -1786,15 +1864,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"
}
}
},
Expand Down Expand Up @@ -1838,14 +1907,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"
}
}
},
Expand Down Expand Up @@ -1919,14 +1980,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"
}
}
},
Expand Down Expand Up @@ -1964,18 +2017,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"
}
}
},
Expand Down Expand Up @@ -2024,10 +2065,6 @@
"properties": {
"$ref": "#/definitions/SkypeChannelProperties",
"description": "The set of properties specific to Skype channel resource"
},
"etag": {
"type": "string",
"description": "Entity Tag of the resource"
}
}
},
Expand Down Expand Up @@ -2133,18 +2170,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"
}
}
},
Expand Down Expand Up @@ -2181,18 +2206,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"
}
}
},
Expand Down Expand Up @@ -2225,14 +2238,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"
}
}
},
Expand Down Expand Up @@ -2270,10 +2275,6 @@
"properties": {
"$ref": "#/definitions/SmsChannelProperties",
"description": "The set of properties specific to Sms channel resource"
},
"etag": {
"type": "string",
"description": "Entity Tag of the resource"
}
}
},
Expand Down Expand Up @@ -2321,14 +2322,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"
}
}
},
Expand Down Expand Up @@ -2468,14 +2461,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"
}
}
},
Expand Down Expand Up @@ -2566,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": [
Expand Down Expand Up @@ -2642,6 +2628,28 @@
"siteName"
]
},
"Site": {
"type": "object",
"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 Expand Up @@ -2686,13 +2694,22 @@
},
"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"
},
"ConnectionSettingProperties": {
"properties": {
"id": {
"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."
Expand Down
Loading

0 comments on commit e11ed03

Please sign in to comment.