Database user password update uses new API endpoint for generating pa…

…ssword.

This is dependent on the merging / release of the equivalent branch in go-scalingo library.

cmd/databases.go

@@ -10,7 +10,7 @@
 	"github.com/urfave/cli/v2"
 
 	"github.com/Scalingo/cli/db"
 	dbUsers "github.com/Scalingo/cli/db/users"
 	"github.com/Scalingo/cli/detect"
 	"github.com/Scalingo/cli/utils"
 	"github.com/Scalingo/go-scalingo/v7"
@@ -272,7 +272,7 @@
 
 			username := c.Args().First()
 
-			err := dbUsers.UpdateUser(c.Context, currentApp, addonName, username)
+			err := dbUsers.UpdateUserPassword(c.Context, currentApp, addonName, username)
 			if err != nil {
 				errorQuit(c.Context, err)
 			}

db/users/update.go → db/users/update_password.go

@@ -8,10 +8,9 @@
 	"github.com/Scalingo/cli/io"
 	"github.com/Scalingo/go-scalingo/v7"
 	"github.com/Scalingo/go-utils/errors/v2"
-	"github.com/Scalingo/gopassword"
 )
 
-func UpdateUser(ctx context.Context, app, addonUUID, username string) error {
+func UpdateUserPassword(ctx context.Context, app, addonUUID, username string) error {
 	isSupported, err := doesDatabaseHandleUserManagement(ctx, app, addonUUID)
 	if err != nil {
 		return errors.Wrap(ctx, err, "get user management information")
@@ -60,25 +59,31 @@
 	isPasswordGenerated := false
 	if password == "" {
 		isPasswordGenerated = true
-		password = gopassword.Generate(64)
-		confirmedPassword = password
 	}
 
-	userUpdateParam := scalingo.DatabaseUpdateUserParam{
-		DatabaseID:           addonUUID,
-		Password:             password,
-		PasswordConfirmation: confirmedPassword,
-	}
-	databaseUsers, err := c.DatabaseUpdateUser(ctx, app, addonUUID, username, userUpdateParam)
-	if err != nil {
-		return errors.Wrap(ctx, err, "update password of the given database user")
-	}
+	var databaseUser scalingo.DatabaseUser
+
+	// We have two different API calls here to avoid breaking backwards compatibility of the CLI
+	if !isPasswordGenerated {
+		userUpdateParam := scalingo.DatabaseUpdateUserParam{
+			DatabaseID:           addonUUID,
+			Password:             password,
+			PasswordConfirmation: confirmedPassword,
+		}
+		databaseUser, err = c.DatabaseUpdateUser(ctx, app, addonUUID, username, userUpdateParam)
+		if err != nil {
+			return errors.Wrap(ctx, err, "update password of the given database user")
+		}
+	} else {
+		databaseUser, err = c.DatabaseUserPasswordReset(ctx, app, addonUUID, username)
+		if err != nil {
+			return errors.Wrap(ctx, err, "reset the password of the given database user")
+		}
 
-	if isPasswordGenerated {
-		fmt.Printf("User \"%s\" updated with password \"%s\".\n", databaseUsers.Name, password)
+		fmt.Printf("User \"%s\" updated with password \"%s\".\n", databaseUser.Name, databaseUser.Password)
 		return nil
 	}
 
-	fmt.Printf("User \"%s\" password updated.\n", databaseUsers.Name)
+	fmt.Printf("User \"%s\" password updated.\n", databaseUser.Name)
 	return nil
 }