Skip to content
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

Review request for Microsoft.BotService to update version stable/2021-03-01 and Preview/2021-05-01-preview #17112

Merged
merged 6 commits into from
Jan 14, 2022
Merged

Review request for Microsoft.BotService to update version stable/2021-03-01 and Preview/2021-05-01-preview #17112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ea2f8c7
fix S360 issue
Danieladu Dec 16, 2021
390edc7
update
Danieladu Dec 16, 2021
47d3c57
updatge
Danieladu Dec 16, 2021
7d37c4c
update
Danieladu Dec 16, 2021
d61a903
Merge branch 'main' into hond/botservice-patch1
Danieladu Dec 23, 2021
189d52b
Zhixzhan/botservice spec patch fix (#1)
zhixzhan Dec 23, 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
27 changes: 22 additions & 5 deletions ...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 @@ -1655,7 +1655,8 @@
},
"cmekEncryptionStatus": {
"type": "string",
"description": "The CMK encryption status"
"description": "The CMK encryption status",
"readOnly": true
},
"publicNetworkAccess": {
"description": "Whether the bot is in an isolated network",
Expand All @@ -1672,11 +1673,13 @@
},
"isStreamingSupported": {
"type": "boolean",
"description": "Whether the bot is streaming supported"
"description": "Whether the bot is streaming supported",
"default": false
},
"isDeveloperAppInsightsApiKeySet": {
"type": "boolean",
"description": "Whether the bot is developerAppInsightsApiKey set"
"description": "Whether the bot is developerAppInsightsApiKey set",
"readOnly": true
},
"migrationToken": {
"type": "string",
Expand Down Expand Up @@ -1761,6 +1764,18 @@
"setting": {
"$ref": "#/definitions/ChannelSettings",
"description": "Channel settings"
},
"provisioningState": {
"type": "string",
"description": "Provisioning state of the resource"
},
"entityTag": {
"type": "string",
"description": "Entity tag of the resource"
},
"changedTime": {
"type": "string",
"description": "Changed time of the resource"
}
}
},
Expand Down Expand Up @@ -1835,7 +1850,8 @@
},
"etag": {
"type": "string",
"description": "Entity Tag of the resource"
"description": "Entity Tag of the resource",
"x-nullable": true
},
"provisioningState": {
"type": "string",
Expand All @@ -1844,7 +1860,8 @@
},
"location": {
"description": "Specifies the location of the resource.",
"type": "string"
"type": "string",
"default": "global"
}
},
"required": [
Expand Down
45 changes: 34 additions & 11 deletions ...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 @@ -1379,7 +1379,8 @@
},
"cmekEncryptionStatus": {
"type": "string",
"description": "The CMK encryption status"
"description": "The CMK encryption status",
"readOnly": true
},
"publicNetworkAccess": {
"description": "Whether the bot is in an isolated network",
Expand All @@ -1396,11 +1397,13 @@
},
"isStreamingSupported": {
"type": "boolean",
"description": "Whether the bot is streaming supported"
"description": "Whether the bot is streaming supported",
"default": false
},
"isDeveloperAppInsightsApiKeySet": {
"type": "boolean",
"description": "Whether the bot is developerAppInsightsApiKey set"
"description": "Whether the bot is developerAppInsightsApiKey set",
"readOnly": true
},
"migrationToken": {
"type": "string",
Expand All @@ -1409,11 +1412,13 @@
},
"disableLocalAuth": {
"type": "boolean",
"description": "Opt-out of local authentication and ensure only MSI and AAD can be used exclusively for authentication."
"description": "Opt-out of local authentication and ensure only MSI and AAD can be used exclusively for authentication.",
"x-nullable": true
},
"schemaTransformationVersion": {
"type": "string",
"description": "The channel schema transformation version for the bot"
"description": "The channel schema transformation version for the bot",
"x-nullable": true
},
"storageResourceId": {
"type": "string",
Expand Down Expand Up @@ -1477,6 +1482,18 @@
"setting": {
"$ref": "#/definitions/ChannelSettings",
"description": "Channel settings"
},
"provisioningState": {
"type": "string",
"description": "Provisioning state of the resource"
},
"entityTag": {
"type": "string",
"description": "Entity tag of the resource"
},
"changedTime": {
"type": "string",
"description": "Changed time of the resource"
}
}
},
Expand Down Expand Up @@ -1528,7 +1545,8 @@
},
"botIconUrl": {
"type": "string",
"description": "The bot icon url"
"description": "The bot icon url",
"x-nullable": true
},
"isEnabled": {
"type": "boolean",
Expand All @@ -1551,7 +1569,8 @@
},
"etag": {
"type": "string",
"description": "Entity Tag of the resource"
"description": "Entity Tag of the resource",
"x-nullable": true
},
"provisioningState": {
"type": "string",
Expand All @@ -1560,7 +1579,8 @@
},
"location": {
"description": "Specifies the location of the resource.",
"type": "string"
"type": "string",
"default": "global"
}
},
"required": [
Expand Down Expand Up @@ -1756,11 +1776,13 @@
},
"deploymentEnvironment": {
"type": "string",
"description": "Deployment environment for Microsoft Teams channel calls"
"description": "Deployment environment for Microsoft Teams channel calls",
"x-nullable": true
},
"acceptedTerms": {
"type": "boolean",
"description": "Whether this channel accepted terms"
"description": "Whether this channel accepted terms",
"default": true
}
},
"description": "The parameters to provide for the Microsoft Teams channel.",
Expand Down Expand Up @@ -2322,7 +2344,8 @@
},
"isBlockUserUploadEnabled": {
"type": "boolean",
"description": "Whether this site is enabled for block user upload."
"description": "Whether this site is enabled for block user upload.",
"x-nullable": true
},
"trustedOrigins": {
"type": "array",
Expand Down