[Hub Generated] Review request for Microsoft.BotService to add versio…

…n preview/2021-05-01-preview (Azure#16760) * rename * change to enum * fix bug * fix example
LeiWang3 · Mar 31, 2022 · 8120e26 · 8120e26
1 parent dbc653d
commit 8120e26
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 24 deletions.
diff --git a/...tservice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/botservice.json b/...tservice/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/.../resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/CreateBot.json b/.../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/...ice/resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/GetBot.json b/...ice/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/...ger/Microsoft.BotService/preview/2021-05-01-preview/examples/ListBotsByResourceGroup.json b/...ger/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/...ager/Microsoft.BotService/preview/2021-05-01-preview/examples/ListBotsBySubscription.json b/...ager/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/.../resource-manager/Microsoft.BotService/preview/2021-05-01-preview/examples/UpdateBot.json b/.../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/...cation/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/botservice.json b/...cation/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/...otservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/CreateBot.json b/...otservice/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/...n/botservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/GetBot.json b/...n/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/...urce-manager/Microsoft.BotService/stable/2021-03-01/examples/ListBotsByResourceGroup.json b/...urce-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/...ource-manager/Microsoft.BotService/stable/2021-03-01/examples/ListBotsBySubscription.json b/...ource-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/...otservice/resource-manager/Microsoft.BotService/stable/2021-03-01/examples/UpdateBot.json b/...otservice/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"
         }
       }