fix: add psc service attachment link in the data (#15930)

Signed-off-by: Julia Zou <[email protected]>

Author: yyzou-bot

mmv1/third_party/terraform/services/sql/data_source_sql_database_instances.go

@@ -179,6 +179,7 @@ func flattenDatasourceGoogleDatabaseInstancesList(fetchedInstances []*sqladmin.D
 		instance["master_instance_name"] = strings.TrimPrefix(rawInstance.MasterInstanceName, project+":")
 		instance["project"] = project
 		instance["self_link"] = rawInstance.SelfLink
+		instance["psc_service_attachment_link"] = rawInstance.PscServiceAttachmentLink
 
 		instances = append(instances, instance)
 	}

mmv1/third_party/terraform/services/sql/resource_sql_database_instance.go.tmpl

@@ -1530,7 +1530,6 @@ func resourceSqlDatabaseInstanceCreate(d *schema.ResourceData, meta interface{})
 	if _, ok := d.GetOk("node_count"); ok {
 		instance.NodeCount = int64(d.Get("node_count").(int))
 	}
-  
 	if _, ok := d.GetOk("root_password_wo_version"); ok {
 		instance.RootPassword = tpgresource.GetRawConfigAttributeAsString(d, "root_password_wo")
 	} else if _, ok := d.GetOk("root_password"); ok {
@@ -2184,6 +2183,9 @@ func resourceSqlDatabaseInstanceRead(d *schema.ResourceData, meta interface{}) e
 	if err := d.Set("maintenance_version", instance.MaintenanceVersion); err != nil {
 		return fmt.Errorf("Error setting maintenance_version: %s", err)
 	}
+	if err := d.Set("psc_service_attachment_link", instance.PscServiceAttachmentLink); err != nil {
+		return fmt.Errorf("Error setting psc_service_attachment_link: %s", err)
+	}
 	if err := d.Set("available_maintenance_versions", instance.AvailableMaintenanceVersions); err != nil {
 		return fmt.Errorf("Error setting available_maintenance_version: %s", err)
 	}
@@ -2571,6 +2573,10 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
 		instance.NodeCount = int64(d.Get("node_count").(int))
 	}
 
+	if _, ok := d.GetOk("psc_service_attachment_link"); ok {
+		instance.PscServiceAttachmentLink = d.Get("psc_service_attachment_link").(string)
+	}
+
 	// Database Version is required for all calls with Google ML integration enabled or it will be rejected by the API.
 	if d.Get("settings.0.enable_google_ml_integration").(bool) || len(_settings["connection_pool_config"].(*schema.Set).List()) > 0 {
 			instance.DatabaseVersion = databaseVersion

mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go.tmpl

@@ -5800,6 +5800,11 @@ func verifyPscOperation(resourceName string, isPscConfigExpected bool, expectedP
 			if !ok || allowedConsumerProjects != len(expectedAllowedConsumerProjects) {
 				return fmt.Errorf("settings.0.ip_configuration.0.psc_config.0.allowed_consumer_projects property is not present or set as expected in state of %s", resourceName)
 			}
+
+			pscServiceAttachmentLink, ok := resourceAttributes["psc_service_attachment_link"]
+			if !ok || pscServiceAttachmentLink == "" {
+				return fmt.Errorf("psc_service_attachment_link property value is empty")
+			}
 		}
 
 		return nil