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

[Hub Generated] Review request for Microsoft.BotService to add version preview/2021-05-01-preview #16760

Merged
merged 4 commits into from
Nov 17, 2021
Merged

[Hub Generated] Review request for Microsoft.BotService to add version preview/2021-05-01-preview #16760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f2480a
rename
ssss141414 Nov 14, 2021
496fcd9
change to enum
ssss141414 Nov 15, 2021
cd9b091
fix bug
ssss141414 Nov 16, 2021
ef7b533
fix example
ssss141414 Nov 16, 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
15 changes: 12 additions & 3 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 @@ -1656,9 +1656,18 @@
"type": "string",
"description": "The CMK encryption status"
},
"isIsolated": {
"type": "boolean",
"description": "Whether the bot is in an isolated network"
"publicNetworkAccess": {
"description": "Whether the bot is in an isolated network",
"enum": [
"Enabled",
"Disabled"
],
"type": "string",
"x-ms-enum": {
"name": "PublicNetworkAccess",
"modelAsString": true
},
"default": "Enabled"
},
"isStreamingSupported": {
"type": "boolean",
Expand Down
6 changes: 3 additions & 3 deletions .../resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/CreateBot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"msaAppMSIResourceId": "/subscriptions/foo/resourcegroups/bar/providers/microsoft.managedidentity/userassignedidentities/sampleId",
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"disableLocalAuth": true,
"schemaTransformationVersion": "1.0"
}
Expand Down Expand Up @@ -78,7 +78,7 @@
],
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"disableLocalAuth": true,
"schemaTransformationVersion": "1.0"
}
Expand Down Expand Up @@ -119,7 +119,7 @@
],
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"disableLocalAuth": true,
"schemaTransformationVersion": "1.0"
}
Expand Down
2 changes: 1 addition & 1 deletion ...ice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetBot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
],
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"schemaTransformationVersion": "1.0",
"disableLocalAuth": true,
"privateEndpointConnections": [
Expand Down
2 changes: 1 addition & 1 deletion ...ger/Microsoft.BotService/preview/2021-05-01-preview/examples/ListBotsByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
],
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"disableLocalAuth": true,
"schemaTransformationVersion": "1.0"
}
Expand Down
2 changes: 1 addition & 1 deletion ...ager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListBotsBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
],
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"disableLocalAuth": true,
"schemaTransformationVersion": "1.0"
}
Expand Down
6 changes: 3 additions & 3 deletions .../resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/UpdateBot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"msaAppMSIResourceId": "/subscriptions/foo/resourcegroups/bar/providers/microsoft.managedidentity/userassignedidentities/sampleId",
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"disableLocalAuth": true,
"schemaTransformationVersion": "1.0"
}
Expand Down Expand Up @@ -78,7 +78,7 @@
],
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"disableLocalAuth": true,
"schemaTransformationVersion": "1.0"
}
Expand Down Expand Up @@ -121,7 +121,7 @@
],
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"disableLocalAuth": true,
"schemaTransformationVersion": "1.0"
}
Expand Down
15 changes: 12 additions & 3 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 @@ -1380,9 +1380,18 @@
"type": "string",
"description": "The CMK encryption status"
},
"isIsolated": {
"type": "boolean",
"description": "Whether the bot is in an isolated network"
"publicNetworkAccess": {
"description": "Whether the bot is in an isolated network",
"enum": [
"Enabled",
"Disabled"
],
"type": "string",
"x-ms-enum": {
"name": "PublicNetworkAccess",
"modelAsString": true
},
"default": "Enabled"
},
"isStreamingSupported": {
"type": "boolean",
Expand Down
6 changes: 3 additions & 3 deletions ...otservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/CreateBot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"msaAppId": "exampleappid",
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"schemaTransformationVersion": "1.0"
}
}
Expand Down Expand Up @@ -71,7 +71,7 @@
],
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"schemaTransformationVersion": "1.0"
}
}
Expand Down Expand Up @@ -108,7 +108,7 @@
],
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"schemaTransformationVersion": "1.0"
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...n/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/GetBot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
],
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"schemaTransformationVersion": "1.0"
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...urce-manager/Microsoft.BotService/stable/2021-03-01/examples/ListBotsByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
],
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"schemaTransformationVersion": "1.0"
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ource-manager/Microsoft.BotService/stable/2021-03-01/examples/ListBotsBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
],
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"schemaTransformationVersion": "1.0"
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...otservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/UpdateBot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"msaAppId": "msaappid",
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"schemaTransformationVersion": "1.0"
}
}
Expand Down Expand Up @@ -71,7 +71,7 @@
],
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"schemaTransformationVersion": "1.0"
}
}
Expand Down Expand Up @@ -110,7 +110,7 @@
],
"isCmekEnabled": true,
"cmekKeyVaultUrl": "https://myCmekKey",
"isIsolated": false,
"publicNetworkAccess": "Enabled",
"schemaTransformationVersion": "1.0"
}
}
Expand Down