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 869b89b23c5c..463ad9098055 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 @@ -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", diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/CreateBot.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/CreateBot.json index c459dffeba3a..7ea5d1c3fb9c 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/CreateBot.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/CreateBot.json @@ -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" } @@ -78,7 +78,7 @@ ], "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", - "isIsolated": false, + "publicNetworkAccess": "Enabled", "disableLocalAuth": true, "schemaTransformationVersion": "1.0" } @@ -119,7 +119,7 @@ ], "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", - "isIsolated": false, + "publicNetworkAccess": "Enabled", "disableLocalAuth": true, "schemaTransformationVersion": "1.0" } diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetBot.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetBot.json index f7d816111dc9..7bd5d1b5589c 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetBot.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetBot.json @@ -43,7 +43,7 @@ ], "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", - "isIsolated": false, + "publicNetworkAccess": "Enabled", "schemaTransformationVersion": "1.0", "disableLocalAuth": true, "privateEndpointConnections": [ diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListBotsByResourceGroup.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListBotsByResourceGroup.json index 6c61eae3c818..c28b25efc163 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListBotsByResourceGroup.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListBotsByResourceGroup.json @@ -44,7 +44,7 @@ ], "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", - "isIsolated": false, + "publicNetworkAccess": "Enabled", "disableLocalAuth": true, "schemaTransformationVersion": "1.0" } diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListBotsBySubscription.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListBotsBySubscription.json index af352d809295..8f6225560e58 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListBotsBySubscription.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListBotsBySubscription.json @@ -43,7 +43,7 @@ ], "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", - "isIsolated": false, + "publicNetworkAccess": "Enabled", "disableLocalAuth": true, "schemaTransformationVersion": "1.0" } diff --git a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/UpdateBot.json b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/UpdateBot.json index 15e4556a4308..6b487e0cb3e8 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/UpdateBot.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/UpdateBot.json @@ -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" } @@ -78,7 +78,7 @@ ], "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", - "isIsolated": false, + "publicNetworkAccess": "Enabled", "disableLocalAuth": true, "schemaTransformationVersion": "1.0" } @@ -121,7 +121,7 @@ ], "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", - "isIsolated": false, + "publicNetworkAccess": "Enabled", "disableLocalAuth": true, "schemaTransformationVersion": "1.0" } 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 dafad9e2bf73..5ad8f265305e 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 @@ -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", diff --git a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/CreateBot.json b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/CreateBot.json index 3b24c7a2df3a..7515891f63cf 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/CreateBot.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/CreateBot.json @@ -31,7 +31,7 @@ "msaAppId": "exampleappid", "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", - "isIsolated": false, + "publicNetworkAccess": "Enabled", "schemaTransformationVersion": "1.0" } } @@ -71,7 +71,7 @@ ], "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", - "isIsolated": false, + "publicNetworkAccess": "Enabled", "schemaTransformationVersion": "1.0" } } @@ -108,7 +108,7 @@ ], "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", - "isIsolated": false, + "publicNetworkAccess": "Enabled", "schemaTransformationVersion": "1.0" } } diff --git a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/GetBot.json b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/GetBot.json index 189fc73fb9b3..762c2c6c2e3a 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/GetBot.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/GetBot.json @@ -40,7 +40,7 @@ ], "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", - "isIsolated": false, + "publicNetworkAccess": "Enabled", "schemaTransformationVersion": "1.0" } } diff --git a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/ListBotsByResourceGroup.json b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/ListBotsByResourceGroup.json index 0c25649703bd..caa215af1030 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/ListBotsByResourceGroup.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/ListBotsByResourceGroup.json @@ -41,7 +41,7 @@ ], "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", - "isIsolated": false, + "publicNetworkAccess": "Enabled", "schemaTransformationVersion": "1.0" } } diff --git a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/ListBotsBySubscription.json b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/ListBotsBySubscription.json index ea64a7343666..234cb804746d 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/ListBotsBySubscription.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/ListBotsBySubscription.json @@ -40,7 +40,7 @@ ], "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", - "isIsolated": false, + "publicNetworkAccess": "Enabled", "schemaTransformationVersion": "1.0" } } diff --git a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/UpdateBot.json b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/UpdateBot.json index 3997a188df7b..6f4a1dcf86bb 100644 --- a/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/UpdateBot.json +++ b/specification/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/UpdateBot.json @@ -31,7 +31,7 @@ "msaAppId": "msaappid", "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", - "isIsolated": false, + "publicNetworkAccess": "Enabled", "schemaTransformationVersion": "1.0" } } @@ -71,7 +71,7 @@ ], "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", - "isIsolated": false, + "publicNetworkAccess": "Enabled", "schemaTransformationVersion": "1.0" } } @@ -110,7 +110,7 @@ ], "isCmekEnabled": true, "cmekKeyVaultUrl": "https://myCmekKey", - "isIsolated": false, + "publicNetworkAccess": "Enabled", "schemaTransformationVersion": "1.0" } }