Converting backupdr data sources from fetch to list (#15645)

Co-authored-by: Cameron Thornton <[email protected]>

Author: kushallunkad-google

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

@@ -14,7 +14,6 @@ func DataSourceGoogleCloudBackupDRBackupPlanAssociation() *schema.Resource {
 	// Set 'Required' schema elements
 	tpgresource.AddRequiredFieldsToSchema(dsSchema, "backup_plan_association_id", "location")
 
-	// Set 'Optional' schema elements
 	tpgresource.AddOptionalFieldsToSchema(dsSchema, "project")
 	return &schema.Resource{
 		Read:   dataSourceGoogleCloudBackupDRBackupPlanAssociationRead,
@@ -64,10 +63,10 @@ func DataSourceGoogleCloudBackupDRBackupPlanAssociations() *schema.Resource {
 			},
 			"resource_type": {
 				Type:        schema.TypeString,
-				Required:    true,
+				Optional:    true,
 				Description: `The resource type of workload on which backup plan is applied. Examples include, "compute.googleapis.com/Instance", "compute.googleapis.com/Disk".`,
+				Deprecated:  "`resource_type` is deprecated and will be removed in a future major release.",
 			},
-
 			"associations": {
 				Type:        schema.TypeList,
 				Computed:    true,
@@ -157,9 +156,8 @@ func dataSourceGoogleCloudBackupDRBackupPlanAssociationsRead(d *schema.ResourceD
 	}
 
 	location := d.Get("location").(string)
-	resourceType := d.Get("resource_type").(string)
 
-	url := fmt.Sprintf("%sprojects/%s/locations/%s/backupPlanAssociations:fetchForResourceType?resourceType=%s", config.BackupDRBasePath, project, location, resourceType)
+	url := fmt.Sprintf("%sprojects/%s/locations/%s/backupPlanAssociations", config.BackupDRBasePath, project, location)
 
 	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 		Config:    config,

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

@@ -295,7 +295,6 @@ resource "google_backup_dr_backup_plan_association" "bpa" {
 
 data "google_backup_dr_backup_plan_associations" "bpas" {
   location      = "us-central1"
-  resource_type = "compute.googleapis.com/Instance"
   depends_on = [google_backup_dr_backup_plan_association.bpa]
 }
 `, context)

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

@@ -27,10 +27,10 @@ func DataSourceGoogleCloudBackupDRDataSourceReferences() *schema.Resource {
 			},
 			"resource_type": {
 				Type:        schema.TypeString,
-				Required:    true,
-				Description: `The resource type to get the data source references for. Examples include, "compute.googleapis.com/Instance", "sqladmin.googleapis.com/Instance".`,
+				Optional:    true,
+				Description: `The resource type of workload on which backup plan is applied. Examples include, "compute.googleapis.com/Instance", "compute.googleapis.com/Disk".`,
+				Deprecated:  "`resource_type` is deprecated and will be removed in a future major release.",
 			},
-
 			// Output: a computed list of the data source references found
 			"data_source_references": {
 				Type:        schema.TypeList,
@@ -96,9 +96,8 @@ func dataSourceGoogleCloudBackupDRDataSourceReferencesRead(d *schema.ResourceDat
 	}
 
 	location := d.Get("location").(string)
-	resourceType := d.Get("resource_type").(string)
 
-	url := fmt.Sprintf("%sprojects/%s/locations/%s/dataSourceReferences:fetchForResourceType?resourceType=%s", config.BackupDRBasePath, project, location, resourceType)
+	url := fmt.Sprintf("%sprojects/%s/locations/%s/dataSourceReferences", config.BackupDRBasePath, project, location)
 
 	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 		Config:    config,

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

@@ -16,7 +16,6 @@ func TestAccDataSourceGoogleBackupDRDataSourceReferences_basic(t *testing.T) {
 	var projectID string
 	context := map[string]interface{}{
 		"location":      "us-central1",
-		"resource_type": "sqladmin.googleapis.com/Instance",
 		"random_suffix": acctest.RandString(t, 10),
 	}
 
@@ -38,7 +37,6 @@ func TestAccDataSourceGoogleBackupDRDataSourceReferences_basic(t *testing.T) {
 						// Basic attribute checks
 						resource.TestCheckResourceAttr("data.google_backup_dr_data_source_references.default", "project", projectID),
 						resource.TestCheckResourceAttr("data.google_backup_dr_data_source_references.default", "location", context["location"].(string)),
-						resource.TestCheckResourceAttr("data.google_backup_dr_data_source_references.default", "resource_type", context["resource_type"].(string)),
 
 						// Check that the list itself is populated
 						resource.TestCheckResourceAttrSet("data.google_backup_dr_data_source_references.default", "data_source_references.#"),
@@ -141,7 +139,6 @@ resource "google_backup_dr_backup_plan_association" "bpa" {
 data "google_backup_dr_data_source_references" "default" {
    project       = data.google_project.project.project_id
    location      = "%{location}"
-   resource_type = "%{resource_type}"
    depends_on= [ google_backup_dr_backup_plan_association.bpa ]
    }
 `, context)
@@ -251,7 +248,6 @@ resource "google_backup_dr_backup_plan_association" "bpa" {
 data "google_backup_dr_data_source_references" "all_refs" {
 	project       = data.google_project.project.project_id
 	location      = "us-central1"
-	resource_type = "sqladmin.googleapis.com/Instance"
 	depends_on    = [google_backup_dr_backup_plan_association.bpa]
 }
 

mmv1/third_party/terraform/website/docs/d/backup_dr_backup_plan_associations.html.markdown

@@ -1,19 +1,18 @@
 ---
 subcategory: "Backup and DR Service"
 description: |-
-  Get information about a list of Backup and DR BackupPlanAssociations for a specific resource type .
+  Get information about a list of Backup and DR BackupPlanAssociations.
 ---
 
 # google_backup_dr_backup_plan_associations
 
-Provides a list of Backup and DR BackupPlanAssociations for a specific resource type.
+Provides a list of Backup and DR BackupPlanAssociations.
 
 ## Example Usage
 
 ```hcl
-data "google_backup_dr_backup_plan_associations" "compute_instance_associations" {
+data "google_backup_dr_backup_plan_associations" "all_associations" {
   location      = "us-central1"
-  resource_type = "compute.googleapis.com/Instance"
 }
 ```
 
@@ -22,8 +21,7 @@ data "google_backup_dr_backup_plan_associations" "compute_instance_associations"
 The following arguments are supported:
 
 * `location` - (Required)The location where the Backup Plan Association resources reside.
-* `resource_type` - (Required) The resource type of the workload. For example, sqladmin.googleapis.com/Instance or compute.googleapis.com/Instance.
-
+* `resource_type` - (Optional, Deprecated) The resource type of the workload. For example, sqladmin.googleapis.com/Instance or compute.googleapis.com/Instance. `resource_type` is deprecated and will be removed in a future major release.
 - - -
 
 * `project` - (Optional) The project in which the resource belongs. If it

mmv1/third_party/terraform/website/docs/d/backup_dr_data_source_references.html.markdown

@@ -11,13 +11,12 @@ A list of Backup and DR data source references.
 ## Example Usage
 
 ```hcl
-data "google_backup_dr_data_source_references" "csql_data_source_reference" {
+data "google_backup_dr_data_source_references" "data_source_reference" {
   location      = "us-central1"
-  resource_type = "sqladmin.googleapis.com/Instance"
 }
 
-output "all_csql_data_source_references" {
-  allReferences = data.google_backup_dr_data_source_references.my_sql_references.data_source_references
+output "all_data_source_references" {
+  allReferences = data.google_backup_dr_data_source_references.my_references.data_source_references
 }
 ```
 
@@ -26,8 +25,7 @@ output "all_csql_data_source_references" {
 The following arguments are supported:
 
 *   `location `- (Required) The location of the data source references.
-    
-*   `resource_type` - (Required) The resource type to get the data source references for. Examples include, "sqladmin.googleapis.com/Instance" , "compute.googleapis.com/Instance" (**right now this service not available for compute Instances and disk , it will be added soon**)
+*   `resource_type` - (Optional, Deprecated) The resource type to get the data source references for. Examples include, "sqladmin.googleapis.com/Instance" , "compute.googleapis.com/Instance". `resource_type` is deprecated and will be removed in a future major release.
 
 *   `project` - (Optional) The ID of the project in which the resource belongs. If it is not provided, the provider project is used.