Promoting BackupDR Resources to GA. (#13091) (#9357)

modular-magician · web-flow · commit e4bd9cfe9073 · 2025-02-18T14:44:56.000-08:00
[upstream:a87ff8de35f728aac66b828a03195000f374f6b4]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/13091.txt b/.changelog/13091.txt
@@ -0,0 +1,3 @@
+```release-note:note
+Marking BackupDR resources GA
+```
diff --git a/google-beta/services/backupdr/data_source_backup_dr_backup_plan_association_test.go b/google-beta/services/backupdr/data_source_backup_dr_backup_plan_association_test.go
@@ -15,7 +15,7 @@ func TestAccDataSourceGoogleBackupDRBackupPlanAssociation_basic(t *testing.T) {
 	}
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceGoogleBackupDRBackupPlanAssociation_basic(context),
@@ -34,13 +34,11 @@ func testAccDataSourceGoogleBackupDRBackupPlanAssociation_basic(context map[stri
 	return acctest.Nprintf(`
 
 resource "google_service_account" "default" {
-  provider = google-beta
   account_id   = "tf-test-my-custom-%{random_suffix}"
   display_name = "Custom SA for VM Instance"
 }
 
 resource "google_compute_instance" "default" {
-  provider = google-beta
   name         = "tf-test-compute-instance-%{random_suffix}"
   machine_type = "n2-standard-2"
   zone         = "us-central1-a"
@@ -70,7 +68,6 @@ resource "google_compute_instance" "default" {
   }
 }
 resource "google_backup_dr_backup_vault" "my-backup-vault" {
-    provider = google-beta
     location ="us-central1"
     backup_vault_id    = "tf-test-bv-%{random_suffix}"
     description = "This is a second backup vault built by Terraform."
@@ -89,7 +86,6 @@ resource "google_backup_dr_backup_vault" "my-backup-vault" {
 }
 
 resource "google_backup_dr_backup_plan" "foo" {
-  provider = google-beta
   location       = "us-central1"
   backup_plan_id = "tf-test-bp-test-%{random_suffix}"
   resource_type  = "compute.googleapis.com/Instance"
@@ -113,7 +109,6 @@ resource "google_backup_dr_backup_plan" "foo" {
 }
 
 resource "google_backup_dr_backup_plan_association" "bpa" { 
-  provider = google-beta
   location = "us-central1" 
   backup_plan_association_id = "tf-test-bpa-test-%{random_suffix}"
   resource =   google_compute_instance.default.id
@@ -122,7 +117,6 @@ resource "google_backup_dr_backup_plan_association" "bpa" {
 }
 
 data "google_backup_dr_backup_plan_association" "bpa-test" {
-  provider = google-beta
   location =  "us-central1"
   backup_plan_association_id="tf-test-bpa-test-%{random_suffix}"
   depends_on= [ google_backup_dr_backup_plan_association.bpa ]
diff --git a/google-beta/services/backupdr/data_source_backup_dr_management_server.go b/google-beta/services/backupdr/data_source_backup_dr_management_server.go
@@ -20,9 +20,6 @@ func DataSourceGoogleCloudBackupDRService() *schema.Resource {
 		Schema: dsSchema,
 	}
 }
-func flattenBackupDRManagementServerName(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
-	return v
-}
 
 func flattenBackupDRManagementServerResourceResp(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) map[string]interface{} {
 	if v == nil {
@@ -50,6 +47,10 @@ func flattenBackupDRManagementServerResource(v interface{}, d *schema.ResourceDa
 	return transformed
 }
 
+func flattenBackupDRManagementServerName(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func dataSourceGoogleCloudBackupDRServiceRead(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*transport_tpg.Config)
 	userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent)
@@ -61,7 +62,7 @@ func dataSourceGoogleCloudBackupDRServiceRead(d *schema.ResourceData, meta inter
 		return err
 	}
 	billingProject := project
-	url, err := tpgresource.ReplaceVars(d, config, "{{BackupDRBasePath}}projects/{{project}}/locations/{{location}}/managementServers")
+	url, err := tpgresource.ReplaceVars(d, config, `{{BackupDRBasePath}}projects/{{project}}/locations/{{location}}/managementServers`)
 	if err != nil {
 		return err
 	}
@@ -78,7 +79,8 @@ func dataSourceGoogleCloudBackupDRServiceRead(d *schema.ResourceData, meta inter
 	if err != nil {
 		return fmt.Errorf("Error reading ManagementServer: %s", err)
 	}
-	resourceResponse := flattenBackupDRManagementServerResourceResp(res["managementServers"], d, config)
+	managementServersResponse := res["managementServers"]
+	resourceResponse := flattenBackupDRManagementServerResourceResp(managementServersResponse, d, config)
 	if err := d.Set("project", project); err != nil {
 		return fmt.Errorf("Error reading ManagementServer: %s", err)
 	}
diff --git a/google-beta/services/backupdr/data_source_backup_dr_management_server_test.go b/google-beta/services/backupdr/data_source_backup_dr_management_server_test.go
@@ -48,7 +48,7 @@ func testAccCheckBackupDRManagementServerDestroyProducer(t *testing.T) func(s *t
 
 			config := acctest.GoogleProviderConfig(t)
 
-			url, err := tpgresource.ReplaceVarsForTest(config, rs, "{{BackupDRBasePath}}projects/{{project}}/locations/{{location}}/managementServers/{{name}}")
+			url, err := tpgresource.ReplaceVarsForTest(config, rs, `{{BackupDRBasePath}}projects/{{project}}/locations/{{location}}/managementServers`)
 			if err != nil {
 				return err
 			}
diff --git a/google-beta/services/backupdr/resource_backup_dr_backup_plan_association_generated_test.go b/google-beta/services/backupdr/resource_backup_dr_backup_plan_association_generated_test.go
@@ -41,7 +41,7 @@ func TestAccBackupDRBackupPlanAssociation_backupDrBpaExample(t *testing.T) {
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckBackupDRBackupPlanAssociationDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -60,13 +60,11 @@ func TestAccBackupDRBackupPlanAssociation_backupDrBpaExample(t *testing.T) {
 func testAccBackupDRBackupPlanAssociation_backupDrBpaExample(context map[string]interface{}) string {
 	return acctest.Nprintf(`
  resource "google_service_account" "mySA" {
-  provider = google-beta
   account_id   = "tf-test-my-custom%{random_suffix}"
   display_name = "Custom SA for VM Instance"
 }
 
 resource "google_compute_instance" "myinstance" {
-  provider = google-beta
   name         = "tf-test-test-instance%{random_suffix}"
   machine_type = "n2-standard-2"
   zone         = "us-central1-a"
@@ -95,15 +93,13 @@ resource "google_compute_instance" "myinstance" {
 }
 
 resource "google_backup_dr_backup_vault" "bv1" {
-  provider                                      = google-beta
   location                                      = "us-central1"
   backup_vault_id                               = "tf-test-bv-bpa%{random_suffix}"
   backup_minimum_enforced_retention_duration    = "100000s"
    force_delete = "true"
 }
 
 resource "google_backup_dr_backup_plan" "bp1" {
-  provider       = google-beta
   location       = "us-central1"
   backup_plan_id = "tf-test-bp-bpa-test%{random_suffix}"
   resource_type  = "compute.googleapis.com/Instance"
@@ -126,7 +122,6 @@ resource "google_backup_dr_backup_plan" "bp1" {
   }
 }
 resource "google_backup_dr_backup_plan_association" "my-backup-plan-association" {
-  provider = google-beta
   location = "us-central1"
   resource_type= "compute.googleapis.com/Instance"
   backup_plan_association_id          = "tf-test-my-bpa%{random_suffix}"
diff --git a/google-beta/services/backupdr/resource_backup_dr_backup_plan_generated_test.go b/google-beta/services/backupdr/resource_backup_dr_backup_plan_generated_test.go
@@ -39,7 +39,7 @@ func TestAccBackupDRBackupPlan_backupDrBackupPlanSimpleExample(t *testing.T) {
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckBackupDRBackupPlanDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
@@ -58,14 +58,12 @@ func TestAccBackupDRBackupPlan_backupDrBackupPlanSimpleExample(t *testing.T) {
 func testAccBackupDRBackupPlan_backupDrBackupPlanSimpleExample(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_backup_dr_backup_vault" "my_backup_vault" {
-  provider                                      = google-beta
   location                                      = "us-central1"
   backup_vault_id                               = "tf-test-backup-vault-simple-test%{random_suffix}"
   backup_minimum_enforced_retention_duration    = "100000s"
 }
 
 resource "google_backup_dr_backup_plan" "my-backup-plan-1" {
-  provider       = google-beta
   location       = "us-central1"
   backup_plan_id = "tf-test-backup-plan-simple-test%{random_suffix}"
   resource_type  = "compute.googleapis.com/Instance"
diff --git a/website/docs/r/backup_dr_backup_plan.html.markdown b/website/docs/r/backup_dr_backup_plan.html.markdown
@@ -23,8 +23,6 @@ description: |-
 
 A backup plan defines when and how to back up a resource, including the backup's schedule, retention, and location.
 
-~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider.
-See [Provider Versions](https://terraform.io/docs/providers/google/guides/provider_versions.html) for more details on beta resources.
 
 To get more information about BackupPlan, see:
 
@@ -37,14 +35,12 @@ To get more information about BackupPlan, see:
 
 ```hcl
 resource "google_backup_dr_backup_vault" "my_backup_vault" {
-  provider                                      = google-beta
   location                                      = "us-central1"
   backup_vault_id                               = "backup-vault-simple-test"
   backup_minimum_enforced_retention_duration    = "100000s"
 }
 
 resource "google_backup_dr_backup_plan" "my-backup-plan-1" {
-  provider       = google-beta
   location       = "us-central1"
   backup_plan_id = "backup-plan-simple-test"
   resource_type  = "compute.googleapis.com/Instance"
diff --git a/website/docs/r/backup_dr_backup_plan_association.html.markdown b/website/docs/r/backup_dr_backup_plan_association.html.markdown
@@ -23,8 +23,6 @@ description: |-
 
 A Backup and DR BackupPlanAssociation.
 
-~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider.
-See [Provider Versions](https://terraform.io/docs/providers/google/guides/provider_versions.html) for more details on beta resources.
 
 To get more information about BackupPlanAssociation, see:
 
@@ -37,13 +35,11 @@ To get more information about BackupPlanAssociation, see:
 
 ```hcl
  resource "google_service_account" "mySA" {
-  provider = google-beta
   account_id   = "my-custom"
   display_name = "Custom SA for VM Instance"
 }
 
 resource "google_compute_instance" "myinstance" {
-  provider = google-beta
   name         = "test-instance"
   machine_type = "n2-standard-2"
   zone         = "us-central1-a"
@@ -72,15 +68,13 @@ resource "google_compute_instance" "myinstance" {
 }
 
 resource "google_backup_dr_backup_vault" "bv1" {
-  provider                                      = google-beta
   location                                      = "us-central1"
   backup_vault_id                               = "bv-bpa"
   backup_minimum_enforced_retention_duration    = "100000s"
    force_delete = "true"
 }
 
 resource "google_backup_dr_backup_plan" "bp1" {
-  provider       = google-beta
   location       = "us-central1"
   backup_plan_id = "bp-bpa-test"
   resource_type  = "compute.googleapis.com/Instance"
@@ -103,7 +97,6 @@ resource "google_backup_dr_backup_plan" "bp1" {
   }
 }
 resource "google_backup_dr_backup_plan_association" "my-backup-plan-association" {
-  provider = google-beta
   location = "us-central1"
   resource_type= "compute.googleapis.com/Instance"
   backup_plan_association_id          = "my-bpa"
diff --git a/website/docs/r/backup_dr_management_server.html.markdown b/website/docs/r/backup_dr_management_server.html.markdown
@@ -23,8 +23,6 @@ description: |-
 
 A Backup and DR Management Server (Also referred as Management Console)
 
-~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider.
-See [Provider Versions](https://terraform.io/docs/providers/google/guides/provider_versions.html) for more details on beta resources.
 
 To get more information about ManagementServer, see:
 
@@ -37,12 +35,10 @@ To get more information about ManagementServer, see:
 
 ```hcl
 resource "google_compute_network" "default" {
-  provider = google-beta
   name = "vpc-network"
 }
 
 resource "google_compute_global_address" "private_ip_address" {
-  provider = google-beta
   name          = "vpc-network"
   address_type  = "INTERNAL"
   purpose       = "VPC_PEERING"
@@ -51,14 +47,12 @@ resource "google_compute_global_address" "private_ip_address" {
 }
 
 resource "google_service_networking_connection" "default" {
-  provider = google-beta
   network                 = google_compute_network.default.id
   service                 = "servicenetworking.googleapis.com"
   reserved_peering_ranges = [google_compute_global_address.private_ip_address.name]
 }
 
 resource "google_backup_dr_management_server" "ms-console" {
-  provider = google-beta
   location = "us-central1"
   name     = "ms-console"
   type     = "BACKUP_RESTORE" 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:note
	`2`	`+Marking BackupDR resources GA`
	`3`	+```
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,6 @@ func DataSourceGoogleCloudBackupDRService() *schema.Resource {`
`20`	`20`	`Schema: dsSchema,`
`21`	`21`	`}`
`22`	`22`	`}`
`23`		`-func flattenBackupDRManagementServerName(v interface{}, d schema.ResourceData, config transport_tpg.Config) interface{} {`
`24`		`- return v`
`25`		`-}`
`26`	`23`
`27`	`24`	`func flattenBackupDRManagementServerResourceResp(v interface{}, d schema.ResourceData, config transport_tpg.Config) map[string]interface{} {`
`28`	`25`	`if v == nil {`
`@@ -50,6 +47,10 @@ func flattenBackupDRManagementServerResource(v interface{}, d *schema.ResourceDa`
`50`	`47`	`return transformed`
`51`	`48`	`}`
`52`	`49`
	`50`	`+func flattenBackupDRManagementServerName(v interface{}, d schema.ResourceData, config transport_tpg.Config) interface{} {`
	`51`	`+ return v`
	`52`	`+}`
	`53`	`+`
`53`	`54`	`func dataSourceGoogleCloudBackupDRServiceRead(d *schema.ResourceData, meta interface{}) error {`
`54`	`55`	`config := meta.(*transport_tpg.Config)`
`55`	`56`	`userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent)`
`@@ -61,7 +62,7 @@ func dataSourceGoogleCloudBackupDRServiceRead(d *schema.ResourceData, meta inter`
`61`	`62`	`return err`
`62`	`63`	`}`
`63`	`64`	`billingProject := project`
`64`		`- url, err := tpgresource.ReplaceVars(d, config, "{{BackupDRBasePath}}projects/{{project}}/locations/{{location}}/managementServers")`
	`65`	+ url, err := tpgresource.ReplaceVars(d, config, `{{BackupDRBasePath}}projects/{{project}}/locations/{{location}}/managementServers`)
`65`	`66`	`if err != nil {`
`66`	`67`	`return err`
`67`	`68`	`}`
`@@ -78,7 +79,8 @@ func dataSourceGoogleCloudBackupDRServiceRead(d *schema.ResourceData, meta inter`
`78`	`79`	`if err != nil {`
`79`	`80`	`return fmt.Errorf("Error reading ManagementServer: %s", err)`
`80`	`81`	`}`
`81`		`- resourceResponse := flattenBackupDRManagementServerResourceResp(res["managementServers"], d, config)`
	`82`	`+ managementServersResponse := res["managementServers"]`
	`83`	`+ resourceResponse := flattenBackupDRManagementServerResourceResp(managementServersResponse, d, config)`
`82`	`84`	`if err := d.Set("project", project); err != nil {`
`83`	`85`	`return fmt.Errorf("Error reading ManagementServer: %s", err)`
`84`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func testAccCheckBackupDRManagementServerDestroyProducer(t testing.T) func(s t`
`48`	`48`
`49`	`49`	`config := acctest.GoogleProviderConfig(t)`
`50`	`50`
`51`		`- url, err := tpgresource.ReplaceVarsForTest(config, rs, "{{BackupDRBasePath}}projects/{{project}}/locations/{{location}}/managementServers/{{name}}")`
	`51`	+ url, err := tpgresource.ReplaceVarsForTest(config, rs, `{{BackupDRBasePath}}projects/{{project}}/locations/{{location}}/managementServers`)
`52`	`52`	`if err != nil {`
`53`	`53`	`return err`
`54`	`54`	`}`