Merge branch 'main' into ap/hcledit

Author: apeabody

backupdr/backup_plan/main.tf

@@ -32,9 +32,9 @@ resource "google_backup_dr_backup_vault" "default" {
     annotations2 = "baz1"
   }
 
-  force_update  = "true"
-  force_delete  = "true"
-  allow_missing = "true"
+  force_update                = "true"
+  ignore_inactive_datasources = "true"
+  allow_missing               = "true"
 }
 
 # [END backupdr_create_backupvault]

backupdr/backup_plan_association/main.tf

@@ -70,9 +70,9 @@ resource "google_backup_dr_backup_vault" "default" {
     annotations2 = "baz1"
   }
 
-  force_update  = "true"
-  force_delete  = "true"
-  allow_missing = "true"
+  force_update                = "true"
+  ignore_inactive_datasources = "true"
+  allow_missing               = "true"
 }
 
 resource "google_backup_dr_backup_plan" "default" {

backupdr/backup_vault/main.tf

@@ -23,7 +23,7 @@ resource "google_backup_dr_backup_vault" "default" {
   description                                = "This vault is created usingTerraform."
   backup_minimum_enforced_retention_duration = "100000s"
   force_update                               = "true"
-  force_delete                               = "true"
+  ignore_inactive_datasources                = "true"
   allow_missing                              = "true"
 }