From c05a2a8206f13301652a1d2bc26742a5bf282aae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 2 Oct 2024 22:34:50 +0000 Subject: [PATCH 1/3] Refactor test files to use dynamic resource group names --- ...urce_billing_policies_environments_test.go | 4 +++- .../datasource_billing_policies_test.go | 4 +++- ...esource_billing_policy_environment_test.go | 11 +++++---- .../licensing/resource_billing_policy_test.go | 24 ++++++++++++------- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/internal/services/licensing/datasource_billing_policies_environments_test.go b/internal/services/licensing/datasource_billing_policies_environments_test.go index 18631f883..2c4e8d774 100644 --- a/internal/services/licensing/datasource_billing_policies_environments_test.go +++ b/internal/services/licensing/datasource_billing_policies_environments_test.go @@ -4,8 +4,10 @@ package licensing_test import ( + "math/rand/v2" "net/http" "regexp" + "strconv" "strings" "testing" @@ -34,7 +36,7 @@ func TestAccBillingPoliciesEnvironmentsDataSource_Validate_Read(t *testing.T) { resource "azapi_resource" "rg_example" { type = "Microsoft.Resources/resourceGroups@2021-04-01" location = "East US" - name = "power-platform-billing-` + mocks.TestName() + `" + name = "power-platform-billing-` + mocks.TestName() + strconv.Itoa(rand.IntN(9999)) + `" body = jsonencode({ properties = {} diff --git a/internal/services/licensing/datasource_billing_policies_test.go b/internal/services/licensing/datasource_billing_policies_test.go index 7d050325c..0333bc487 100644 --- a/internal/services/licensing/datasource_billing_policies_test.go +++ b/internal/services/licensing/datasource_billing_policies_test.go @@ -4,8 +4,10 @@ package licensing_test import ( + "math/rand/v2" "net/http" "regexp" + "strconv" "strings" "testing" @@ -34,7 +36,7 @@ func TestAccBillingPoliciesDataSource_Validate_Read(t *testing.T) { resource "azapi_resource" "rg_example" { type = "Microsoft.Resources/resourceGroups@2021-04-01" location = "East US" - name = "power-platform-billing-` + mocks.TestName() + `" + name = "power-platform-billing-` + mocks.TestName() + strconv.Itoa(rand.IntN(9999)) + `" body = jsonencode({ properties = {} diff --git a/internal/services/licensing/resource_billing_policy_environment_test.go b/internal/services/licensing/resource_billing_policy_environment_test.go index 5f1531399..bf6f60801 100644 --- a/internal/services/licensing/resource_billing_policy_environment_test.go +++ b/internal/services/licensing/resource_billing_policy_environment_test.go @@ -5,8 +5,10 @@ package licensing_test import ( "fmt" + "math/rand/v2" "net/http" "regexp" + "strconv" "strings" "testing" @@ -35,7 +37,7 @@ func TestAccBillingPolicyResourceEnvironment_Validate_Create(t *testing.T) { resource "azapi_resource" "rg_example" { type = "Microsoft.Resources/resourceGroups@2021-04-01" location = "East US" - name = "power-platform-billing-` + mocks.TestName() + `" + name = "power-platform-billing-` + mocks.TestName() + strconv.Itoa(rand.IntN(9999)) + `" body = jsonencode({ properties = {} @@ -122,6 +124,7 @@ func TestUnitBillingPolicyResourceEnvironment_Validate_Create(t *testing.T) { } func TestAccBillingPolicyResourceEnvironment_Validate_Update(t *testing.T) { + rgName := "power-platform-billing-" + mocks.TestName() + strconv.Itoa(rand.IntN(9999)) resource.Test(t, resource.TestCase{ ProtoV6ProviderFactories: mocks.TestAccProtoV6ProviderFactories, ExternalProviders: map[string]resource.ExternalProvider{ @@ -139,7 +142,7 @@ func TestAccBillingPolicyResourceEnvironment_Validate_Update(t *testing.T) { resource "azapi_resource" "rg_example" { type = "Microsoft.Resources/resourceGroups@2021-04-01" location = "East US" - name = "power-platform-billing-` + mocks.TestName() + `" + name = "` + rgName + `" body = jsonencode({ properties = {} @@ -191,7 +194,7 @@ func TestAccBillingPolicyResourceEnvironment_Validate_Update(t *testing.T) { resource "azapi_resource" "rg_example" { type = "Microsoft.Resources/resourceGroups@2021-04-01" location = "East US" - name = "power-platform-billing-` + mocks.TestName() + `" + name = "` + rgName + `" body = jsonencode({ properties = {} @@ -243,7 +246,7 @@ func TestAccBillingPolicyResourceEnvironment_Validate_Update(t *testing.T) { resource "azapi_resource" "rg_example" { type = "Microsoft.Resources/resourceGroups@2021-04-01" location = "East US" - name = "power-platform-billing-` + mocks.TestName() + `" + name = "` + rgName + `" body = jsonencode({ properties = {} diff --git a/internal/services/licensing/resource_billing_policy_test.go b/internal/services/licensing/resource_billing_policy_test.go index 1345c9957..46a258d5c 100644 --- a/internal/services/licensing/resource_billing_policy_test.go +++ b/internal/services/licensing/resource_billing_policy_test.go @@ -5,8 +5,10 @@ package licensing_test import ( "fmt" + "math/rand/v2" "net/http" "regexp" + "strconv" "strings" "testing" @@ -18,6 +20,8 @@ import ( ) func TestAccBillingPolicyResource_Validate_Create(t *testing.T) { + rgName := "power-platform-billing-" + mocks.TestName() + strconv.Itoa(rand.IntN(9999)) + println("rgName: " + rgName) resource.Test(t, resource.TestCase{ ProtoV6ProviderFactories: mocks.TestAccProtoV6ProviderFactories, ExternalProviders: map[string]resource.ExternalProvider{ @@ -35,7 +39,7 @@ func TestAccBillingPolicyResource_Validate_Create(t *testing.T) { resource "azapi_resource" "rg_example" { type = "Microsoft.Resources/resourceGroups@2021-04-01" location = "East US" - name = "power-platform-billing-` + mocks.TestName() + `" + name = "` + rgName + `" body = jsonencode({ properties = {} @@ -57,7 +61,7 @@ func TestAccBillingPolicyResource_Validate_Create(t *testing.T) { resource.TestCheckResourceAttr("powerplatform_billing_policy.pay_as_you_go", "name", strings.ReplaceAll(mocks.TestName(), "_", "")), resource.TestCheckResourceAttr("powerplatform_billing_policy.pay_as_you_go", "location", "unitedstates"), resource.TestCheckResourceAttr("powerplatform_billing_policy.pay_as_you_go", "status", "Enabled"), - resource.TestCheckResourceAttr("powerplatform_billing_policy.pay_as_you_go", "billing_instrument.resource_group", "power-platform-billing-"+mocks.TestName()), + resource.TestCheckResourceAttr("powerplatform_billing_policy.pay_as_you_go", "billing_instrument.resource_group", rgName), resource.TestMatchResourceAttr("powerplatform_billing_policy.pay_as_you_go", "billing_instrument.subscription_id", regexp.MustCompile(helpers.GuidRegex)), ), }, @@ -120,6 +124,7 @@ func TestUnitTestBillingPolicyResource_Validate_Create(t *testing.T) { } func TestAccBillingPolicy_Validate_Update(t *testing.T) { + rgName := "power-platform-billing-" + mocks.TestName() + strconv.Itoa(rand.IntN(9999)) resource.Test(t, resource.TestCase{ ProtoV6ProviderFactories: mocks.TestAccProtoV6ProviderFactories, ExternalProviders: map[string]resource.ExternalProvider{ @@ -137,7 +142,7 @@ func TestAccBillingPolicy_Validate_Update(t *testing.T) { resource "azapi_resource" "rg_example" { type = "Microsoft.Resources/resourceGroups@2021-04-01" location = "East US" - name = "power-platform-billing-` + mocks.TestName() + `" + name = "` + rgName + `" body = jsonencode({ properties = {} @@ -166,7 +171,7 @@ func TestAccBillingPolicy_Validate_Update(t *testing.T) { resource "azapi_resource" "rg_example" { type = "Microsoft.Resources/resourceGroups@2021-04-01" location = "East US" - name = "power-platform-billing-` + mocks.TestName() + `" + name = "` + rgName + `" body = jsonencode({ properties = {} @@ -197,7 +202,7 @@ func TestAccBillingPolicy_Validate_Update(t *testing.T) { resource "azapi_resource" "rg_example" { type = "Microsoft.Resources/resourceGroups@2021-04-01" location = "East US" - name = "power-platform-billing-` + mocks.TestName() + `" + name = "` + rgName + `" body = jsonencode({ properties = {} @@ -311,6 +316,7 @@ func TestUnitTestBillingPolicy_Validate_Update(t *testing.T) { } func TestAccBillingPolicy_Validate_Update_ForceRecreate(t *testing.T) { + rgName := "power-platform-billing-" + mocks.TestName() + strconv.Itoa(rand.IntN(9999)) resource.Test(t, resource.TestCase{ ProtoV6ProviderFactories: mocks.TestAccProtoV6ProviderFactories, ExternalProviders: map[string]resource.ExternalProvider{ @@ -327,7 +333,7 @@ func TestAccBillingPolicy_Validate_Update_ForceRecreate(t *testing.T) { resource "azapi_resource" "rg_example" { type = "Microsoft.Resources/resourceGroups@2021-04-01" location = "East US" - name = "power-platform-billing-` + mocks.TestName() + `" + name = "` + rgName + `" body = jsonencode({ properties = {} @@ -355,7 +361,7 @@ func TestAccBillingPolicy_Validate_Update_ForceRecreate(t *testing.T) { resource "azapi_resource" "rg_example" { type = "Microsoft.Resources/resourceGroups@2021-04-01" location = "East US" - name = "power-platform-billing-` + mocks.TestName() + `" + name = "` + rgName + `" body = jsonencode({ properties = {} @@ -383,7 +389,7 @@ func TestAccBillingPolicy_Validate_Update_ForceRecreate(t *testing.T) { resource "azapi_resource" "rg_example" { type = "Microsoft.Resources/resourceGroups@2021-04-01" location = "East US" - name = "power-platform-billing-` + mocks.TestName() + `1" + name = "` + rgName + `1" body = jsonencode({ properties = {} @@ -402,7 +408,7 @@ func TestAccBillingPolicy_Validate_Update_ForceRecreate(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( resource.TestMatchResourceAttr("powerplatform_billing_policy.pay_as_you_go", "id", regexp.MustCompile(helpers.GuidRegex)), resource.TestCheckResourceAttr("powerplatform_billing_policy.pay_as_you_go", "location", "switzerland"), - resource.TestCheckResourceAttr("powerplatform_billing_policy.pay_as_you_go", "billing_instrument.resource_group", "power-platform-billing-"+mocks.TestName()+"1"), + resource.TestCheckResourceAttr("powerplatform_billing_policy.pay_as_you_go", "billing_instrument.resource_group", rgName+"1"), ), }, }, From 90c1c4cadd64b70b05a4805b27f8e6aa33da6e2b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 2 Oct 2024 22:45:09 +0000 Subject: [PATCH 2/3] Refactor test files to remove unnecessary print statement --- internal/services/licensing/resource_billing_policy_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/services/licensing/resource_billing_policy_test.go b/internal/services/licensing/resource_billing_policy_test.go index 46a258d5c..d83e9c9f5 100644 --- a/internal/services/licensing/resource_billing_policy_test.go +++ b/internal/services/licensing/resource_billing_policy_test.go @@ -21,7 +21,7 @@ import ( func TestAccBillingPolicyResource_Validate_Create(t *testing.T) { rgName := "power-platform-billing-" + mocks.TestName() + strconv.Itoa(rand.IntN(9999)) - println("rgName: " + rgName) + resource.Test(t, resource.TestCase{ ProtoV6ProviderFactories: mocks.TestAccProtoV6ProviderFactories, ExternalProviders: map[string]resource.ExternalProvider{ From 4ffc0789d1d93ba7173c5dec3595f110a8cf7bfd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 3 Oct 2024 10:15:34 +0000 Subject: [PATCH 3/3] Refactor test files to update ProtoV6ProviderFactories in AccDataRecordResource_Validate_Disable_On_Delete test --- internal/services/data_record/resource_data_record_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/services/data_record/resource_data_record_test.go b/internal/services/data_record/resource_data_record_test.go index 8fb576dce..f599d9f1f 100644 --- a/internal/services/data_record/resource_data_record_test.go +++ b/internal/services/data_record/resource_data_record_test.go @@ -1538,8 +1538,8 @@ func TestUnitDataRecordResource_Validate_Disable_On_Delete(t *testing.T) { func TestAccDataRecordResource_Validate_Disable_On_Delete(t *testing.T) { resource.Test(t, resource.TestCase{ - IsUnitTest: true, - ProtoV6ProviderFactories: mocks.TestUnitTestProtoV6ProviderFactories, + IsUnitTest: false, + ProtoV6ProviderFactories: mocks.TestAccProtoV6ProviderFactories, Steps: []resource.TestStep{ { Config: `