azurerm_bot_service_azure_bot - fix acctest, make microsoft_app_type required for 5.0 (#30460)

Co-authored-by: sreallymatt <106555974+sreallymatt@users.noreply.github.com>

Author: neil-yechenwei

internal/services/bot/bot_service_azure_bot_resource.go

@@ -152,7 +152,7 @@ func (r AzureBotServiceResource) Arguments() map[string]*pluginsdk.Schema {
 
 		"microsoft_app_type": {
 			Type:     pluginsdk.TypeString,
-			Optional: true,
+			Required: true,
 			ForceNew: true,
 			ValidateFunc: validation.StringInSlice([]string{
 				string(botservice.MsaAppTypeMultiTenant),
@@ -207,6 +207,19 @@ func (r AzureBotServiceResource) Arguments() map[string]*pluginsdk.Schema {
 
 	if !features.FivePointOh() {
 		output["cmk_key_vault_key_url"].ValidateFunc = keyvault.ValidateNestedItemID(keyvault.VersionTypeAny, keyvault.NestedItemTypeAny)
+
+		output["microsoft_app_type"] = &pluginsdk.Schema{
+			Type:     pluginsdk.TypeString,
+			Optional: true,
+			// Note: O+C because Azure sets a value for this if omitted
+			Computed: true,
+			ForceNew: true,
+			ValidateFunc: validation.StringInSlice([]string{
+				string(botservice.MsaAppTypeMultiTenant),
+				string(botservice.MsaAppTypeSingleTenant),
+				string(botservice.MsaAppTypeUserAssignedMSI),
+			}, false),
+		}
 	}
 
 	return output

internal/services/bot/bot_service_azure_bot_resource_test.go

@@ -244,12 +244,13 @@ func (BotServiceAzureBotResource) requiresImport(data acceptance.TestData) strin
 %s
 
 resource "azurerm_bot_service_azure_bot" "import" {
-  name                = azurerm_bot_service_azure_bot.test.name
-  resource_group_name = azurerm_bot_service_azure_bot.test.resource_group_name
-  location            = azurerm_bot_service_azure_bot.test.location
-  sku                 = azurerm_bot_service_azure_bot.test.sku
-  microsoft_app_id    = azurerm_bot_service_azure_bot.test.microsoft_app_id
-  microsoft_app_type  = azurerm_bot_service_azure_bot.test.microsoft_app_type
+  name                    = azurerm_bot_service_azure_bot.test.name
+  resource_group_name     = azurerm_bot_service_azure_bot.test.resource_group_name
+  location                = azurerm_bot_service_azure_bot.test.location
+  sku                     = azurerm_bot_service_azure_bot.test.sku
+  microsoft_app_id        = azurerm_bot_service_azure_bot.test.microsoft_app_id
+  microsoft_app_type      = azurerm_bot_service_azure_bot.test.microsoft_app_type
+  microsoft_app_tenant_id = azurerm_bot_service_azure_bot.test.microsoft_app_tenant_id
 }
 `, template)
 }

website/docs/5.0-upgrade-guide.html.markdown

@@ -300,6 +300,10 @@ Please follow the format in the example below for listing breaking changes in re
 
 * The deprecated `certificate` property has been removed.
 
+### `azurem_bot_service_azure_bot`
+
+* The `microsoft_app_type` property is now required.
+
 ### `azurerm_bot_channel_ms_teams`
 
 * The deprecated `enable_calling` property has been removed in favour of the `calling_enabled` property.

website/docs/r/bot_service_azure_bot.html.markdown

@@ -13,6 +13,8 @@ Manages an Azure Bot Service.
 ## Example Usage
 
 ```hcl
+data "azurerm_client_config" "current" {}
+
 resource "azurerm_resource_group" "example" {
   name     = "example-resources"
   location = "West Europe"
@@ -34,11 +36,13 @@ resource "azurerm_application_insights_api_key" "example" {
 data "azurerm_client_config" "current" {}
 
 resource "azurerm_bot_service_azure_bot" "example" {
-  name                = "exampleazurebot"
-  resource_group_name = azurerm_resource_group.example.name
-  location            = "global"
-  microsoft_app_id    = data.azurerm_client_config.current.client_id
-  sku                 = "F0"
+  name                    = "exampleazurebot"
+  resource_group_name     = azurerm_resource_group.example.name
+  location                = "global"
+  microsoft_app_id        = data.azurerm_client_config.current.client_id
+  microsoft_app_type      = "SingleTenant"
+  microsoft_app_tenant_id = data.azurerm_client_config.current.tenant_id
+  sku                     = "F0"
 
   endpoint                              = "https://example.com"
   developer_app_insights_api_key        = azurerm_application_insights_api_key.example.api_key
@@ -86,6 +90,8 @@ The following arguments are supported:
 
 * `microsoft_app_type` - (Optional) The Microsoft App Type for this Azure Bot Service. Possible values are `MultiTenant`, `SingleTenant` and `UserAssignedMSI`. Changing this forces a new resource to be created.
 
+~> **Note:** Creation of `azurerm_bot_service_azure_bot` resources using the `MultiTenant` type is no longer supported by Azure, existing resources can continue using this type.
+
 * `local_authentication_enabled` - (Optional) Is local authentication enabled? Defaults to `true`.
 
 * `luis_app_ids` - (Optional) A list of LUIS App IDs to associate with this Azure Bot Service.