linting changes (#15213)

Author: kushallunkad-google

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

@@ -90,6 +90,53 @@ func DataSourceGoogleCloudBackupDRBackupPlanAssociations() *schema.Resource {
 							Type:     schema.TypeString,
 							Computed: true,
 						},
+						"data_source": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"rules_config_info": {
+							Type:        schema.TypeList,
+							Computed:    true,
+							Description: "Message for rules config info",
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"rule_id": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "Backup Rule id fetched from backup plan.",
+									},
+									"last_backup_state": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "State of last backup taken.",
+									},
+									"last_backup_error": {
+										Type:        schema.TypeList,
+										Computed:    true,
+										Description: "google.rpc.Status object to store the last backup error",
+										Elem: &schema.Resource{
+											Schema: map[string]*schema.Schema{
+												"code": {
+													Type:        schema.TypeInt,
+													Computed:    true,
+													Description: "The status code, which should be an enum value of [google.rpc.Code]",
+												},
+												"message": {
+													Type:        schema.TypeString,
+													Computed:    true,
+													Description: "A developer-facing error message, which should be in English.",
+												},
+											},
+										},
+									},
+									"last_successful_backup_consistency_time": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "The point in time when the last successful backup was captured from the source",
+									},
+								},
+							},
+						},
 					},
 				},
 			},
@@ -139,7 +186,10 @@ func dataSourceGoogleCloudBackupDRBackupPlanAssociationsRead(d *schema.ResourceD
 			"name":        association["name"],
 			"resource":    association["resource"],
 			"backup_plan": association["backupPlan"],
-			"create_time": association["createTime"],
+			"data_source": association["dataSource"],
+		}
+		if rules, ok := association["rulesConfigInfo"].([]interface{}); ok {
+			flattened["rules_config_info"] = flattenRulesConfigInfo(rules)
 		}
 		associations = append(associations, flattened)
 	}
@@ -152,3 +202,29 @@ func dataSourceGoogleCloudBackupDRBackupPlanAssociationsRead(d *schema.ResourceD
 
 	return nil
 }
+
+func flattenRulesConfigInfo(rules []interface{}) []map[string]interface{} {
+	result := make([]map[string]interface{}, 0, len(rules))
+	for _, rule := range rules {
+		ruleMap := rule.(map[string]interface{})
+		flatRule := map[string]interface{}{
+			"rule_id":           ruleMap["ruleId"],
+			"last_backup_state": ruleMap["lastBackupState"],
+		}
+
+		if consistencyTime, ok := ruleMap["lastSuccessfulBackupConsistencyTime"].(string); ok {
+			flatRule["last_successful_backup_consistency_time"] = consistencyTime
+		}
+
+		if errInfo, ok := ruleMap["lastBackupError"].(map[string]interface{}); ok {
+			flatRule["last_backup_error"] = []map[string]interface{}{
+				{
+					"code":    errInfo["code"],
+					"message": errInfo["message"],
+				},
+			}
+		}
+		result = append(result, flatRule)
+	}
+	return result
+}

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

@@ -176,8 +176,6 @@ func testAccCheckBackupPlanAssociationInList(dataSourceName, instanceName, backu
 		projectID := project.Primary.Attributes["project_id"]
 		projectNumber := project.Primary.Attributes["number"]
 
-		fmt.Printf("\n--- Performing Direct Association Check ---\n")
-
 		// 1. Reconstruct the 'resource' string using the project NUMBER and instance ID
 		//    to match the format returned by the BackupDR API.
 		instanceID := instance.Primary.Attributes["instance_id"]
@@ -191,21 +189,32 @@ func testAccCheckBackupPlanAssociationInList(dataSourceName, instanceName, backu
 
 		associationsCount, _ := strconv.Atoi(ds.Primary.Attributes["associations.#"])
 		fmt.Printf("Total associations found by data source: %d\n", associationsCount)
+		found := false
 
 		for i := 0; i < associationsCount; i++ {
 			resourceAttr := ds.Primary.Attributes[fmt.Sprintf("associations.%d.resource", i)]
 			backupPlanAttr := ds.Primary.Attributes[fmt.Sprintf("associations.%d.backup_plan", i)]
 
-			fmt.Printf("Found Association #%d: Resource='%s', BackupPlan='%s'\n", i, resourceAttr, backupPlanAttr)
-
 			if resourceAttr == expectedResource && backupPlanAttr == expectedBackupPlan {
-				fmt.Println("--- Match found! Test successful. ---")
-				return nil
+				prefix := fmt.Sprintf("associations.%d.", i)
+				checks := []resource.TestCheckFunc{
+					resource.TestCheckResourceAttrSet(dataSourceName, prefix+"name"),
+					resource.TestCheckResourceAttrSet(dataSourceName, prefix+"data_source"),
+
+					resource.TestCheckResourceAttrSet(dataSourceName, prefix+"rules_config_info.0.rule_id"),
+					resource.TestCheckResourceAttrSet(dataSourceName, prefix+"rules_config_info.0.last_backup_state"),
+				}
+				if err := resource.ComposeTestCheckFunc(checks...)(s); err != nil {
+					return fmt.Errorf("error checking new fields for association %d: %v", i, err)
+				}
+				found = true
+				break
 			}
 		}
-
-		fmt.Println("--- No match found after checking all associations. ---")
-		return fmt.Errorf("no matching backup plan association found in data source '%s' for resource '%s'", dataSourceName, expectedResource)
+		if !found {
+			return fmt.Errorf("no matching backup plan association found in data source '%s' for resource '%s'", dataSourceName, expectedResource)
+		}
+		return nil
 	}
 }
 

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

@@ -8,9 +8,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.
-
 ## Example Usage
 
 ```hcl

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

@@ -8,16 +8,14 @@ description: |-
 
 Provides a list of Backup and DR BackupPlanAssociations for a specific resource type.
 
-~> **Warning:** This datasource 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 datasources.
-
 ## Example Usage
 
 ```hcl
 data "google_backup_dr_backup_plan_associations" "compute_instance_associations" {
   location      = "us-central1"
   resource_type = "compute.googleapis.com/Instance"
 }
+```
 
 ## Argument Reference
 
@@ -43,6 +41,13 @@ Each entry in the `associations` list contains the following fields:
 *   `name` - The full name of the backup plan association resource.
 *   `resource` - The resource to which the backup plan is applied.
 *   `backup_plan` - The backup plan to which the resource is attached.
-*   `create_time` - The time when the association was created.
+*   `data_source` - The resource name of data source which will be used as storage location for backups taken.
+*   `rules_config_info` - A list containing information about the backup rules. Each object in the list contains:
+    *   `rule_id` - Backup Rule id fetched from backup plan.
+    *   `last_backup_state` - State of last backup taken.
+    *   `last_successful_backup_consistency_time` - The point in time when the last successful backup was captured from the source.
+    *   `last_backup_error` - A block containing details of the last backup error, if any.
+        *   `code` - The status code, which should be an enum value of [google.rpc.Code].
+        *   `message` - A developer-facing error message.
 
 See [google_backup_dr_backup_plan_associations](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/backup_dr_backup_plan_associations) resource for details of the available attributes.

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

@@ -8,26 +8,23 @@ description: |-
 
 Get information about a specific Backup and DR data source reference.
 
-~> **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.
-
 ## Example Usage
 
 This example shows how to get the details of a specific data source reference by its ID. The ID is often obtained from the `google_backup_dr_data_source_references` data source.
 
 ```hcl
-data "google_backup_dr_data_source_references" "all_sql_references" {
+data "google_backup_dr_data_source_references" "all_csql_references" {
   location      = "us-central1"
   resource_type = "sqladmin.googleapis.com/Instance"
 }
 
 data "google_backup_dr_data_source_reference" "my_reference" {
   location                 = "us-central1"
-  data_source_reference_id = element(split("/", data.google_backup_dr_data_source_references.all_sql_references.data_source_references[0].name), 5)
+  data_source_reference_id = element(split("/", data.google_backup_dr_data_source_references.all_csql_references.data_source_references[0].name), 5)
 }
 
-output "specific_reference_gcp_resource_name" {
-  value = data.google_backup_dr_data_source_reference.my_reference.gcp_resource_name
+output "my_data_source_reference" {
+  value = data.google_backup_dr_data_source_reference.my_reference
 }
 ```
 

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

@@ -8,19 +8,16 @@ description: |-
 
 A list of Backup and DR data source references.
 
-~> **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.
-
 ## Example Usage
 
 ```hcl
-data "google_backup_dr_data_source_references" "my_sql_references" {
+data "google_backup_dr_data_source_references" "csql_data_source_reference" {
   location      = "us-central1"
   resource_type = "sqladmin.googleapis.com/Instance"
 }
 
-output "first_sql_reference_name" {
-  name = data.google_backup_dr_data_source_references.my_sql_references.data_source_references[0].name
+output "all_csql_data_source_references" {
+  allReferences = data.google_backup_dr_data_source_references.my_sql_references.data_source_references
 }
 ```
 
@@ -30,7 +27,7 @@ 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 , it will be added soon )
+*   `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**)
 
 *   `project` - (Optional) The ID of the project in which the resource belongs. If it is not provided, the provider project is used.
 
@@ -39,22 +36,22 @@ The following arguments are supported:
 
 In addition to the arguments listed above, the following attributes are exported:
 
-*  data\_source\_references - A list of the data source references found. Each element of this list has the following attributes:
+* data\_source\_references - A list of the data source references found. Each element of this list has the following attributes:
 
-    1.   `name`- The full name of the data source reference.
+  1.   `name`- The full name of the data source reference.
 
-    2.   `data_source`- The underlying data source resource.
+  2.   `data_source`- The underlying data source resource.
 
-    3.   `backup_config_state`- The state of the backup config for the data source.
+  3.   `backup_config_state`- The state of the backup config for the data source.
 
-    4.   `backup_count`- The number of backups for the data source.
+  4.   `backup_count`- The number of backups for the data source.
 
-    5.   `last_backup_state`- The state of the last backup.
+  5.   `last_backup_state`- The state of the last backup.
 
-    6.   `last_successful_backup_time`- The last time a successful backup was made.
+  6.   `last_successful_backup_time`- The last time a successful backup was made.
 
-    7.  `gcp_resource_name`- The GCP resource name for the data source.
+  7.  `gcp_resource_name`- The GCP resource name for the data source.
 
-    8.   `resource_type`- The type of the referenced resource.
+  8.   `resource_type`- The type of the referenced resource.
 
 See [google_backup_dr_data_source_references](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/backup_dr_data_source_references) resource for details of the available attributes.