PowerBi - Fix CI test faiures (hashicorp#31407)

Author: anurag-hashicorp

internal/services/powerbi/powerbi_embedded_resource.go

@@ -15,6 +15,7 @@ import (
 	"github.com/hashicorp/go-azure-sdk/resource-manager/powerbidedicated/2021-01-01/capacities"
 	"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/features"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/services/powerbi/validate"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation"
@@ -23,7 +24,7 @@ import (
 )
 
 func resourcePowerBIEmbedded() *pluginsdk.Resource {
-	return &pluginsdk.Resource{
+	resource := &pluginsdk.Resource{
 		Create: resourcePowerBIEmbeddedCreate,
 		Read:   resourcePowerBIEmbeddedRead,
 		Update: resourcePowerBIEmbeddedUpdate,
@@ -80,7 +81,7 @@ func resourcePowerBIEmbedded() *pluginsdk.Resource {
 			"mode": {
 				Type:     pluginsdk.TypeString,
 				Optional: true,
-				Default:  string(capacities.ModeGenOne),
+				Default:  string(capacities.ModeGenTwo),
 				ForceNew: true,
 				ValidateFunc: validation.StringInSlice([]string{
 					string(capacities.ModeGenOne),
@@ -91,6 +92,12 @@ func resourcePowerBIEmbedded() *pluginsdk.Resource {
 			"tags": commonschema.Tags(),
 		},
 	}
+
+	if !features.FivePointOh() {
+		resource.Schema["mode"].Default = string(capacities.ModeGenOne)
+	}
+
+	return resource
 }
 
 func resourcePowerBIEmbeddedCreate(d *pluginsdk.ResourceData, meta interface{}) error {

internal/services/powerbi/powerbi_embedded_resource_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
+	"github.com/hashicorp/terraform-provider-azurerm/internal/features"
 	"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
 )
 
@@ -93,6 +94,26 @@ func TestAccPowerBIEmbedded_gen2(t *testing.T) {
 	})
 }
 
+func TestAccPowerBIEmbedded_defaultMode5x(t *testing.T) {
+	if !features.FivePointOh() {
+		t.Skipf("Skipping test for 5.0 default behavior when not running in 5.0 mode")
+	}
+
+	data := acceptance.BuildTestData(t, "azurerm_powerbi_embedded", "test")
+	r := PowerBIEmbeddedResource{}
+
+	data.ResourceTest(t, r, []acceptance.TestStep{
+		{
+			Config: r.defaultMode5x(data),
+			Check: acceptance.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+				check.That(data.ResourceName).Key("mode").HasValue("Gen2"),
+			),
+		},
+		data.ImportStep(),
+	})
+}
+
 func TestAccPowerBIEmbedded_requiresImport(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_powerbi_embedded", "test")
 	r := PowerBIEmbeddedResource{}
@@ -150,6 +171,7 @@ resource "azurerm_powerbi_embedded" "test" {
   resource_group_name = azurerm_resource_group.test.name
   sku_name            = "A1"
   administrators      = [data.azurerm_client_config.test.object_id]
+  mode                = "Gen2"
 }
 `, r.template(data), data.RandomInteger)
 }
@@ -164,6 +186,7 @@ resource "azurerm_powerbi_embedded" "test" {
   resource_group_name = azurerm_resource_group.test.name
   sku_name            = "A2"
   administrators      = [data.azurerm_client_config.test.object_id]
+  mode                = "Gen2"
 
   tags = {
     ENV = "Test"
@@ -187,6 +210,20 @@ resource "azurerm_powerbi_embedded" "test" {
 `, r.template(data), data.RandomInteger)
 }
 
+func (r PowerBIEmbeddedResource) defaultMode5x(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+%[1]s
+
+resource "azurerm_powerbi_embedded" "test" {
+  name                = "acctestpowerbi%[2]d"
+  location            = azurerm_resource_group.test.location
+  resource_group_name = azurerm_resource_group.test.name
+  sku_name            = "A1"
+  administrators      = [data.azurerm_client_config.test.object_id]
+}
+`, r.template(data), data.RandomInteger)
+}
+
 func (r PowerBIEmbeddedResource) requiresImport(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 %[1]s

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

@@ -412,6 +412,10 @@ Please follow the format in the example below for listing breaking changes in re
 
 * The `management_group_id` property has been removed in favour of the `azurerm_management_group_policy_set_definition` resource.
 
+### `azurerm_powerbi_embedded`
+
+* The `mode` property now defaults to `Gen2`.
+
 ### `azurerm_redis_cache`
 
 * The property `minimum_tls_version` no longer accepts `1.0` or `1.1` as a value.