Enable update bpa support on BPA resource (GoogleCloudPlatform#14102)

Author: niharika-98

mmv1/products/backupdr/BackupPlanAssociation.yaml

@@ -15,7 +15,8 @@ name: 'BackupPlanAssociation'
 base_url: projects/{{project}}/locations/{{location}}/backupPlanAssociations
 create_url: projects/{{project}}/locations/{{location}}/backupPlanAssociations/?backup_plan_association_id={{backup_plan_association_id}}
 self_link: projects/{{project}}/locations/{{location}}/backupPlanAssociations/{{backup_plan_association_id}}
-immutable: true
+update_verb: 'PATCH'
+update_mask: true
 delete_url: projects/{{project}}/locations/{{location}}/backupPlanAssociations/{{backup_plan_association_id}}
 description: A Backup and DR BackupPlanAssociation.
 import_format:
@@ -27,6 +28,7 @@ references:
 autogen_async: true
 timeouts:
   insert_minutes: 60
+  update_minutes: 20
   delete_minutes: 60
 examples:
   - name: 'backup_dr_bpa'

mmv1/third_party/terraform/services/backupdr/resource_backup_dr_backup_plan_association_test.go

@@ -0,0 +1,248 @@
+package backupdr_test
+
+import (
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-provider-google/google/acctest"
+	"github.com/hashicorp/terraform-provider-google/google/envvar"
+	"testing"
+	"time"
+)
+
+func TestAccBackupDRBackupPlanAssociation_fullUpdate(t *testing.T) {
+	// Uses time.Now
+	acctest.SkipIfVcr(t)
+
+	t.Parallel()
+
+	timeNow := time.Now().UTC()
+	referenceTime := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, time.UTC)
+
+	context := map[string]interface{}{
+		"project":        envvar.GetTestProjectFromEnv(),
+		"effective_time": referenceTime.Add(24 * time.Hour).Format(time.RFC3339),
+		"random_suffix":  acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccBackupDRBackupPlanAssociation_fullCreate(context),
+			},
+			{
+				ResourceName:            "google_backup_dr_backup_plan_association.bpa",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"resource"},
+			},
+			{
+				Config: testAccBackupDRBackupPlanAssociation_fullUpdate(context),
+			},
+			{
+				ResourceName:            "google_backup_dr_backup_plan_association.bpa",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"resource"},
+			},
+		},
+	})
+}
+
+func testAccBackupDRBackupPlanAssociation_fullCreate(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_service_account" "default" {
+  account_id   = "tf-test-my-custom-%{random_suffix}"
+  display_name = "Custom SA for VM Instance"
+}
+
+resource "google_compute_instance" "default" {
+  name         = "tf-test-compute-instance-%{random_suffix}"
+  machine_type = "n2-standard-2"
+  zone         = "us-central1-a"
+  tags = ["foo", "bar"]
+  boot_disk {
+    initialize_params {
+      image = "debian-cloud/debian-11"
+      labels = {
+        my_label = "value"
+      }
+    }
+  }
+  // Local SSD disk
+  scratch_disk {
+    interface = "NVME"
+  }
+  network_interface {
+    network = "default"
+    access_config {
+      // Ephemeral public IP
+    }
+  }
+  service_account {
+    # Google recommends custom service accounts that have cloud-platform scope and permissions granted via IAM Roles.
+    email  = google_service_account.default.email
+    scopes = ["cloud-platform"]
+  }
+}
+resource "google_backup_dr_backup_vault" "my-backup-vault" {
+    location ="us-central1"
+    backup_vault_id    = "tf-test-bv-%{random_suffix}"
+    description = "This is a second backup vault built by Terraform."
+    backup_minimum_enforced_retention_duration = "100000s"
+    labels = {
+      foo = "bar1"
+      bar = "baz1"
+    }
+    annotations = {
+      annotations1 = "bar1"
+      annotations2 = "baz1"
+    }
+    force_update = "true"
+    force_delete = "true"
+    allow_missing = "true" 
+}
+
+resource "google_backup_dr_backup_plan" "foo" {
+  location       = "us-central1"
+  backup_plan_id = "tf-test-bp-test-%{random_suffix}"
+  resource_type  = "compute.googleapis.com/Instance"
+  backup_vault   = google_backup_dr_backup_vault.my-backup-vault.name
+
+  backup_rules {
+    rule_id                = "rule-1"
+    backup_retention_days  = 2
+
+    standard_schedule {
+      recurrence_type     = "HOURLY"
+      hourly_frequency    = 6
+      time_zone           = "UTC"
+
+      backup_window {
+        start_hour_of_day = 0
+        end_hour_of_day   = 6
+      }
+    }
+  }
+}
+
+resource "google_backup_dr_backup_plan_association" "bpa" { 
+  location = "us-central1" 
+  backup_plan_association_id = "tf-test-bpa-test-%{random_suffix}"
+  resource =   google_compute_instance.default.id
+  resource_type= "compute.googleapis.com/Instance"
+  backup_plan = google_backup_dr_backup_plan.foo.name
+}
+`, context)
+}
+
+func testAccBackupDRBackupPlanAssociation_fullUpdate(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_service_account" "default" {
+  account_id   = "tf-test-my-custom-%{random_suffix}"
+  display_name = "Custom SA for VM Instance"
+}
+
+resource "google_compute_instance" "default" {
+  name         = "tf-test-compute-instance-%{random_suffix}"
+  machine_type = "n2-standard-2"
+  zone         = "us-central1-a"
+  tags = ["foo", "bar"]
+  boot_disk {
+    initialize_params {
+      image = "debian-cloud/debian-11"
+      labels = {
+        my_label = "value"
+      }
+    }
+  }
+  // Local SSD disk
+  scratch_disk {
+    interface = "NVME"
+  }
+  network_interface {
+    network = "default"
+    access_config {
+      // Ephemeral public IP
+    }
+  }
+  service_account {
+    # Google recommends custom service accounts that have cloud-platform scope and permissions granted via IAM Roles.
+    email  = google_service_account.default.email
+    scopes = ["cloud-platform"]
+  }
+}
+
+resource "google_backup_dr_backup_vault" "my-backup-vault" {
+    location ="us-central1"
+    backup_vault_id    = "tf-test-bv-%{random_suffix}"
+    description = "This is a second backup vault built by Terraform."
+    backup_minimum_enforced_retention_duration = "100000s"
+    labels = {
+      foo = "bar1"
+      bar = "baz1"
+    }
+    annotations = {
+      annotations1 = "bar1"
+      annotations2 = "baz1"
+    }
+    force_update = "true"
+    force_delete = "true"
+    allow_missing = "true" 
+}
+
+resource "google_backup_dr_backup_plan" "updated-bp" {
+  location       = "us-central1"
+  backup_plan_id = "tf-test-bp-test-1-%{random_suffix}"
+  resource_type  = "compute.googleapis.com/Instance"
+  backup_vault   = google_backup_dr_backup_vault.my-backup-vault.name
+
+  backup_rules {
+    rule_id                = "rule-1"
+    backup_retention_days  = 4
+
+    standard_schedule {
+      recurrence_type     = "HOURLY"
+      hourly_frequency    = 10
+      time_zone           = "UTC"
+
+      backup_window {
+        start_hour_of_day = 0
+        end_hour_of_day   = 6
+      }
+    }
+  }
+}
+
+resource "google_backup_dr_backup_plan" "foo" {
+  location       = "us-central1"
+  backup_plan_id = "tf-test-bp-test-%{random_suffix}"
+  resource_type  = "compute.googleapis.com/Instance"
+  backup_vault   = google_backup_dr_backup_vault.my-backup-vault.name
+
+  backup_rules {
+    rule_id                = "rule-1"
+    backup_retention_days  = 2
+
+    standard_schedule {
+      recurrence_type     = "HOURLY"
+      hourly_frequency    = 6
+      time_zone           = "UTC"
+
+      backup_window {
+        start_hour_of_day = 0
+        end_hour_of_day   = 6
+      }
+    }
+  }
+}
+
+resource "google_backup_dr_backup_plan_association" "bpa" { 
+  location = "us-central1" 
+  backup_plan_association_id = "tf-test-bpa-test-%{random_suffix}"
+  resource =   google_compute_instance.default.id
+  resource_type= "compute.googleapis.com/Instance"
+  backup_plan = google_backup_dr_backup_plan.updated-bp.name
+}
+`, context)
+}