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 772e0a1c5d47..c0c2c5cc6647 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 @@ -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/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 459eed1e7555..0a71b8fab3c8 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 @@ -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, @@ -61,7 +64,10 @@ "luisappid1", "luisappid2" ], + "msaAppType": "UserAssignedMSI", "msaAppId": "msaappid", + "msaAppTenantId": "msaapptenantid", + "msaAppMSIResourceId": "/subscriptions/foo/resourcegroups/bar/providers/microsoft.managedidentity/userassignedidentities/sampleId", "configuredChannels": [ "facebook", "groupme" @@ -98,7 +104,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/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 478fbb23654d..51476438c172 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 @@ -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/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 07a253f7c039..0419d45dba0b 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 @@ -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/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 8988345f5d8c..8fdbb9373415 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 @@ -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/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 d1a7719305c9..eb2d647bda35 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 @@ -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, @@ -61,7 +64,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"