Made google_billing_budget.all_updates_rule subfields get updated (ha…

…shicorp#4933) This is a follow-up for GoogleCloudPlatform/magic-modules#4929, which fixed this issue for `amount` and its subfields Signed-off-by: Modular Magician <[email protected]>
modular-magician · Jun 30, 2021 · 5c01d0f · 5c01d0f
1 parent 1c4c8c6
commit 5c01d0f
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 3 deletions.
diff --git a/.changelog/4933.txt b/.changelog/4933.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+billing: made `all_updates_rule.*` fields updatable on `google_billing_budget`
+```
diff --git a/google/resource_billing_budget.go b/google/resource_billing_budget.go
@@ -481,7 +481,10 @@ func resourceBillingBudgetUpdate(d *schema.ResourceData, meta interface{}) error
 	}
 
 	if d.HasChange("all_updates_rule") {
-		updateMask = append(updateMask, "notificationsRule")
+		updateMask = append(updateMask, "notificationsRule.pubsubTopic",
+			"notificationsRule.schemaVersion",
+			"notificationsRule.monitoringNotificationChannels",
+			"notificationsRule.disableDefaultIamRecipients")
 	}
 	// updateMask is a URL parameter but not present in the schema, so replaceVars
 	// won't set it

diff --git a/google/resource_billing_budget_test.go b/google/resource_billing_budget_test.go
@@ -92,7 +92,7 @@ func TestAccBillingBudget_billingBudgetUpdate(t *testing.T) {
 				ImportStateVerify: true,
 			},
 			{
-				Config: testAccBillingBudget_billingBudgetUpdateChangeAmount(context),
+				Config: testAccBillingBudget_billingBudgetUpdate(context),
 			},
 			{
 				ResourceName:      "google_billing_budget.budget",
@@ -105,6 +105,13 @@ func TestAccBillingBudget_billingBudgetUpdate(t *testing.T) {
 
 func testAccBillingBudget_billingBudgetUpdateStart(context map[string]interface{}) string {
 	return Nprintf(`
+resource "google_pubsub_topic" "topic1" {
+  name = "tf-test-billing-budget1-%{random_suffix}"
+}
+resource "google_pubsub_topic" "topic2" {
+  name = "tf-test-billing-budget2-%{random_suffix}"
+}
+
 data "google_billing_account" "account" {
   billing_account = "%{billing_acct}"
 }
@@ -134,12 +141,22 @@ resource "google_billing_budget" "budget" {
     threshold_percent = 0.9
     spend_basis = "FORECASTED_SPEND"
   }
+
+  all_updates_rule {
+    pubsub_topic = google_pubsub_topic.topic1.id
+  }
 }
 `, context)
 }
 
 func testAccBillingBudget_billingBudgetUpdateRemoveFilter(context map[string]interface{}) string {
 	return Nprintf(`
+resource "google_pubsub_topic" "topic1" {
+  name = "tf-test-billing-budget1-%{random_suffix}"
+}
+resource "google_pubsub_topic" "topic2" {
+  name = "tf-test-billing-budget2-%{random_suffix}"
+}
 data "google_billing_account" "account" {
   billing_account = "%{billing_acct}"
 }
@@ -169,12 +186,22 @@ resource "google_billing_budget" "budget" {
     threshold_percent = 0.9
     spend_basis = "FORECASTED_SPEND"
   }
+
+  all_updates_rule {
+    pubsub_topic = google_pubsub_topic.topic1.id
+  }
 }
 `, context)
 }
 
-func testAccBillingBudget_billingBudgetUpdateChangeAmount(context map[string]interface{}) string {
+func testAccBillingBudget_billingBudgetUpdate(context map[string]interface{}) string {
 	return Nprintf(`
+resource "google_pubsub_topic" "topic1" {
+  name = "tf-test-billing-budget1-%{random_suffix}"
+}
+resource "google_pubsub_topic" "topic2" {
+  name = "tf-test-billing-budget2-%{random_suffix}"
+}
 data "google_billing_account" "account" {
   billing_account = "%{billing_acct}"
 }
@@ -204,6 +231,10 @@ resource "google_billing_budget" "budget" {
     threshold_percent = 0.9
     spend_basis = "FORECASTED_SPEND"
   }
+
+  all_updates_rule {
+    pubsub_topic = google_pubsub_topic.topic2.id
+  }
 }
 `, context)
 }