Move billing tests that require permissions beyond Billing User to ma…

…ster billing account (#7263)
GoogleCloudPlatform · Feb 9, 2023 · 9c20589 · 9c20589
1 parent 470dca8
commit 9c20589
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/mmv1/products/billingbudget/terraform.yaml b/mmv1/products/billingbudget/terraform.yaml
@@ -33,36 +33,36 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         vars:
           display_name: 'Example Billing Budget'
         test_env_vars:
-          billing_acct: :BILLING_ACCT
+          billing_acct: :MASTER_BILLING_ACCT
       - !ruby/object:Provider::Terraform::Examples
         name: 'billing_budget_lastperiod'
         primary_resource_id: 'budget'
         vars:
           display_name: 'Example Billing Budget'
         test_env_vars:
-          billing_acct: :BILLING_ACCT
+          billing_acct: :MASTER_BILLING_ACCT
       - !ruby/object:Provider::Terraform::Examples
         name: 'billing_budget_filter'
         primary_resource_id: 'budget'
         vars:
           display_name: 'Example Billing Budget'
         test_env_vars:
-          billing_acct: :BILLING_ACCT
+          billing_acct: :MASTER_BILLING_ACCT
       - !ruby/object:Provider::Terraform::Examples
         name: 'billing_budget_notify'
         primary_resource_id: 'budget'
         vars:
           budget_name: 'Example Billing Budget'
           channel_name: 'Example Notification Channel'
         test_env_vars:
-          billing_acct: :BILLING_ACCT
+          billing_acct: :MASTER_BILLING_ACCT
       - !ruby/object:Provider::Terraform::Examples
         name: 'billing_budget_customperiod'
         primary_resource_id: 'budget'
         vars:
           display_name: 'Example Billing Budget'
         test_env_vars:
-          billing_acct: :BILLING_ACCT
+          billing_acct: :MASTER_BILLING_ACCT
       - !ruby/object:Provider::Terraform::Examples
         name: 'billing_budget_optional'
         primary_resource_id: 'budget'
@@ -71,7 +71,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           display_name: 'Example Billing Budget'
           topic_name: "example-topic"
         test_env_vars:
-          billing_acct: :BILLING_ACCT          
+          billing_acct: :MASTER_BILLING_ACCT          
     properties:
       name: !ruby/object:Overrides::Terraform::PropertyOverride
         custom_flatten: 'templates/terraform/custom_flatten/name_from_self_link.erb'

diff --git a/mmv1/provider/terraform/examples.rb b/mmv1/provider/terraform/examples.rb
@@ -63,6 +63,7 @@ class Examples < Api::Object
       #  - :ORG_ID
       #  - :ORG_TARGET
       #  - :BILLING_ACCT
+      #  - :MASTER_BILLING_ACCT
       #  - :SERVICE_ACCT
       #  - :CUST_ID
       #  - :IDENTITY_USER
@@ -158,6 +159,7 @@ def config_documentation(pwd)
           ORG_DOMAIN: 'example.com',
           ORG_TARGET: '123456789',
           BILLING_ACCT: '000000-0000000-0000000-000000',
+          MASTER_BILLING_ACCT: '000000-0000000-0000000-000000',
           SERVICE_ACCT: 'emailAddress:my@service-account.com',
           CUST_ID: 'A01b123xz',
           IDENTITY_USER: 'cloud_identity_user'

diff --git a/mmv1/templates/terraform/env_var_context.go.erb b/mmv1/templates/terraform/env_var_context.go.erb
@@ -11,6 +11,8 @@
 		"<%= var_name -%>": getTestOrgTargetFromEnv(t),
 	<% elsif var_type == :BILLING_ACCT -%>
 		"<%= var_name -%>": getTestBillingAccountFromEnv(t),
+	<% elsif var_type == :MASTER_BILLING_ACCT -%>
+		"<%= var_name -%>": getTestMasterBillingAccountFromEnv(t),
 	<% elsif var_type == :SERVICE_ACCT -%>
 		"<%= var_name -%>": getTestServiceAccountFromEnv(t),
 	<% elsif var_type == :PROJECT_NAME -%>

diff --git a/mmv1/third_party/terraform/tests/resource_billing_budget_test.go b/mmv1/third_party/terraform/tests/resource_billing_budget_test.go
@@ -11,7 +11,7 @@ func TestAccBillingBudget_billingBudgetCurrencycode(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"billing_acct":  getTestBillingAccountFromEnv(t),
+		"billing_acct":  getTestMasterBillingAccountFromEnv(t),
 		"random_suffix": randString(t, 10),
 	}
 
@@ -69,7 +69,7 @@ func TestAccBillingBudget_billingBudgetUpdate(t *testing.T) {
 	t.Parallel()
 
 	context := map[string]interface{}{
-		"billing_acct":  getTestBillingAccountFromEnv(t),
+		"billing_acct":  getTestMasterBillingAccountFromEnv(t),
 		"random_suffix": randString(t, 10),
 	}
 
@@ -542,7 +542,7 @@ func TestAccBillingBudget_budgetFilterProjectsOrdering(t *testing.T) {
 
 	context := map[string]interface{}{
 		"org":             getTestOrgFromEnv(t),
-		"billing_acct":    getTestBillingAccountFromEnv(t),
+		"billing_acct":    getTestMasterBillingAccountFromEnv(t),
 		"random_suffix_1": randString(t, 10),
 		"random_suffix_2": randString(t, 10),
 	}

diff --git a/mmv1/third_party/terraform/tests/resource_google_billing_account_iam_test.go b/mmv1/third_party/terraform/tests/resource_google_billing_account_iam_test.go
@@ -15,7 +15,7 @@ func TestAccBillingAccountIam(t *testing.T) {
 	skipIfVcr(t)
 	t.Parallel()
 
-	billing := getTestBillingAccountFromEnv(t)
+	billing := getTestMasterBillingAccountFromEnv(t)
 	account := fmt.Sprintf("tf-test-%d", randInt(t))
 	role := "roles/billing.viewer"
 	vcrTest(t, resource.TestCase{