Add retries to SQL user insert and update operations.

Signed-off-by: Modular Magician <[email protected]>

google-beta/resource_sql_user.go

@@ -79,8 +79,13 @@ func resourceSqlUserCreate(d *schema.ResourceData, meta interface{}) error {
 
 	mutexKV.Lock(instanceMutexKey(project, instance))
 	defer mutexKV.Unlock(instanceMutexKey(project, instance))
-	op, err := config.clientSqlAdmin.Users.Insert(project, instance,
-		user).Do()
+	var op *sqladmin.Operation
+	insertFunc := func() error {
+		op, err = config.clientSqlAdmin.Users.Insert(project, instance,
+			user).Do()
+		return err
+	}
+	err = retryTimeDuration(insertFunc, d.Timeout(schema.TimeoutCreate))
 
 	if err != nil {
 		return fmt.Errorf("Error, failed to insert "+
@@ -172,8 +177,13 @@ func resourceSqlUserUpdate(d *schema.ResourceData, meta interface{}) error {
 
 		mutexKV.Lock(instanceMutexKey(project, instance))
 		defer mutexKV.Unlock(instanceMutexKey(project, instance))
-		op, err := config.clientSqlAdmin.Users.Update(project, instance, name,
-			user).Host(host).Do()
+		var op *sqladmin.Operation
+		updateFunc := func() error {
+			op, err = config.clientSqlAdmin.Users.Update(project, instance, name,
+				user).Host(host).Do()
+			return err
+		}
+		err = retryTimeDuration(updateFunc, d.Timeout(schema.TimeoutUpdate))
 
 		if err != nil {
 			return fmt.Errorf("Error, failed to update"+

google-beta/self_link_helpers.go

@@ -143,14 +143,6 @@ func GetLocationalResourcePropertiesFromSelfLinkString(selfLink string) (string,
 	}
 
 	s := strings.Split(parsed.Path, "/")
-
-	// This is a pretty bad way to tell if this is a self link, but stops us
-	// from accessing an index out of bounds and causing a panic. generally, we
-	// expect bad values to be partial URIs and names, so this will catch them
-	if len(s) < 9 {
-		return "", "", "", fmt.Errorf("value %s was not a self link", selfLink)
-	}
-
 	return s[4], s[6], s[8], nil
 }