google_sql_user: Fixed import where host is an IPv4 CIDR (#11523)

Author: rickard-von-essen

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

@@ -573,6 +573,19 @@ func resourceSqlUserImporter(d *schema.ResourceData, meta interface{}) ([]*schem
 		if err := d.Set("name", parts[3]); err != nil {
 			return nil, fmt.Errorf("Error setting name: %s", err)
 		}
+	} else if len(parts) == 5 {
+		if err := d.Set("project", parts[0]); err != nil {
+			return nil, fmt.Errorf("Error setting project: %s", err)
+		}
+		if err := d.Set("instance", parts[1]); err != nil {
+			return nil, fmt.Errorf("Error setting instance: %s", err)
+		}
+		if err := d.Set("host", fmt.Sprintf("%s/%s", parts[2], parts[3])); err != nil {
+			return nil, fmt.Errorf("Error setting host: %s", err)
+		}
+		if err := d.Set("name", parts[4]); err != nil {
+			return nil, fmt.Errorf("Error setting name: %s", err)
+		}
 	} else {
 		return nil, fmt.Errorf("Invalid specifier. Expecting {project}/{instance}/{name} for postgres instance and {project}/{instance}/{host}/{name} for MySQL instance")
 	}

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

@@ -34,6 +34,7 @@ func TestAccSqlUser_mysql(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGoogleSqlUserExists(t, "google_sql_user.user1"),
 					testAccCheckGoogleSqlUserExists(t, "google_sql_user.user2"),
+					testAccCheckGoogleSqlUserExists(t, "google_sql_user.user3"),
 				),
 			},
 			{
@@ -43,6 +44,13 @@ func TestAccSqlUser_mysql(t *testing.T) {
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"password"},
 			},
+			{
+				ResourceName:            "google_sql_user.user3",
+				ImportStateId:           fmt.Sprintf("%s/%s/10.0.0.0/24/admin", envvar.GetTestProjectFromEnv(), instance),
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"password"},
+			},
 		},
 	})
 }
@@ -341,6 +349,13 @@ resource "google_sql_user" "user2" {
   host     = "gmail.com"
   password = "hunter2"
 }
+
+resource "google_sql_user" "user3" {
+  name     = "admin"
+  instance = google_sql_database_instance.instance.name
+  host     = "10.0.0.0/24"
+  password = "hunter3"
+}
 `, instance, password)
 }