Ignore host when searching for postgres sql user in read from list (#…

…3857)

Signed-off-by: Modular Magician <magic-modules@google.com>

google/resource_sql_database_instance_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/hashicorp/terraform/helper/acctest"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
+
 	sqladmin "google.golang.org/api/sqladmin/v1beta4"
 )
 

google/resource_sql_user.go

@@ -125,11 +125,13 @@ func resourceSqlUserRead(d *schema.ResourceData, meta interface{}) error {
 
 	var user *sqladmin.User
 	for _, currentUser := range users.Items {
-		// The second part of this conditional is irrelevant for postgres instances because
-		// host and currentUser.Host will always both be empty.
-		if currentUser.Name == name && currentUser.Host == host {
-			user = currentUser
-			break
+		if currentUser.Name == name {
+			// Host can only be empty for postgres instances,
+			// so don't compare the host if the API host is empty.
+			if currentUser.Host == "" || currentUser.Host == host {
+				user = currentUser
+				break
+			}
 		}
 	}