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

…n preview/2021-05-01-preview (#15239) * Add "msaAppTenantId", "msaAppType" and "msaAppMSIResourceId" properties. * Address ARM feedback to set modelAsString as true.
Azure · Jul 21, 2021 · 31788d7 · 31788d7
1 parent 761b197
commit 31788d7
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 0 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
@@ -1554,10 +1554,31 @@
           "readOnly": true,
           "description": "The bot's endpoint version"
         },
+        "msaAppType": {
+          "type": "string",
+          "description": "Microsoft App Type for the bot",
+          "enum": [
+            "UserAssignedMSI",
+            "SingleTenant",
+            "MultiTenant"
+          ],
+          "x-ms-enum": {
+            "name": "msaAppType",
+            "modelAsString": true
+          }
+        },
         "msaAppId": {
           "type": "string",
           "description": "Microsoft App Id for the bot"
         },
+        "msaAppTenantId": {
+          "type": "string",
+          "description": "Microsoft App Tenant Id for the bot"
+        },
+        "msaAppMSIResourceId": {
+          "type": "string",
+          "description": "Microsoft App Managed Identity Resource Id for the bot"
+        },
         "configuredChannels": {
           "type": "array",
           "items": {

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
@@ -28,7 +28,10 @@
           "luisappid2"
         ],
         "luisKey": "luiskey",
+        "msaAppType": "UserAssignedMSI",
         "msaAppId": "exampleappid",
+        "msaAppTenantId": "exampleapptenantid",
+        "msaAppMSIResourceId": "/subscriptions/foo/resourcegroups/bar/providers/microsoft.managedidentity/userassignedidentities/sampleId",
         "isCmekEnabled": true,
         "cmekKeyVaultUrl": "https://myCmekKey",
         "isIsolated": false,
@@ -62,7 +65,10 @@
             "luisappid1",
             "luisappid2"
           ],
+          "msaAppType": "UserAssignedMSI",
           "msaAppId": "msaappid",
+          "msaAppTenantId": "msaapptenantid",
+          "msaAppMSIResourceId": "/subscriptions/foo/resourcegroups/bar/providers/microsoft.managedidentity/userassignedidentities/sampleId",
           "configuredChannels": [
             "facebook",
             "groupme"
@@ -100,7 +106,10 @@
             "luisappid1",
             "luisappid2"
           ],
+          "msaAppType": "UserAssignedMSI",
           "msaAppId": "msaappid",
+          "msaAppTenantId": "msaapptenantid",
+          "msaAppMSIResourceId": "/subscriptions/foo/resourcegroups/bar/providers/microsoft.managedidentity/userassignedidentities/sampleId",
           "configuredChannels": [
             "facebook",
             "groupme"

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
@@ -30,7 +30,10 @@
             "luisappid1",
             "luisappid2"
           ],
+          "msaAppType": "UserAssignedMSI",
           "msaAppId": "msaappid",
+          "msaAppTenantId": "msaapptenantid",
+          "msaAppMSIResourceId": "/subscriptions/foo/resourcegroups/bar/providers/microsoft.managedidentity/userassignedidentities/sampleId",
           "configuredChannels": [
             "facebook",
             "groupme"

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
@@ -31,7 +31,10 @@
                 "luisappid1",
                 "luisappid2"
               ],
+              "msaAppType": "UserAssignedMSI",
               "msaAppId": "msaappid",
+              "msaAppTenantId": "msaapptenantid",
+              "msaAppMSIResourceId": "/subscriptions/foo/resourcegroups/bar/providers/microsoft.managedidentity/userassignedidentities/sampleId",
               "configuredChannels": [
                 "facebook",
                 "groupme"

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
@@ -30,7 +30,10 @@
                 "luisappid1",
                 "luisappid2"
               ],
+              "msaAppType": "UserAssignedMSI",
               "msaAppId": "msaappid",
+              "msaAppTenantId": "msaapptenantid",
+              "msaAppMSIResourceId": "/subscriptions/foo/resourcegroups/bar/providers/microsoft.managedidentity/userassignedidentities/sampleId",
               "configuredChannels": [
                 "facebook",
                 "groupme"

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
@@ -28,7 +28,10 @@
           "luisappid2"
         ],
         "luisKey": "luiskey",
+        "msaAppType": "UserAssignedMSI",
         "msaAppId": "msaappid",
+        "msaAppTenantId": "msaapptenantid",
+        "msaAppMSIResourceId": "/subscriptions/foo/resourcegroups/bar/providers/microsoft.managedidentity/userassignedidentities/sampleId",
         "isCmekEnabled": true,
         "cmekKeyVaultUrl": "https://myCmekKey",
         "isIsolated": false,
@@ -62,7 +65,10 @@
             "luisappid1",
             "luisappid2"
           ],
+          "msaAppType": "UserAssignedMSI",
           "msaAppId": "msaappid",
+          "msaAppTenantId": "msaapptenantid",
+          "msaAppMSIResourceId": "/subscriptions/foo/resourcegroups/bar/providers/microsoft.managedidentity/userassignedidentities/sampleId",
           "configuredChannels": [
             "facebook",
             "groupme"
@@ -102,7 +108,10 @@
             "luisappid1",
             "luisappid2"
           ],
+          "msaAppType": "UserAssignedMSI",
           "msaAppId": "msaappid",
+          "msaAppTenantId": "msaapptenantid",
+          "msaAppMSIResourceId": "/subscriptions/foo/resourcegroups/bar/providers/microsoft.managedidentity/userassignedidentities/sampleId",
           "configuredChannels": [
             "facebook",
             "groupme"