fix(rdb): allow toggling is-admin without password when generate-pass… (#4719)

Co-authored-by: Rémy Léone <[email protected]>

Author: jremy42

internal/namespaces/audit_trail/v1alpha1/audit_trail_cli.go

@@ -8,7 +8,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
-	"github.com/scaleway/scaleway-sdk-go/api/audit_trail/v1alpha1"
+	audit_trail "github.com/scaleway/scaleway-sdk-go/api/audit_trail/v1alpha1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 

internal/namespaces/inference/v1beta1/custom_endpoint.go

@@ -42,7 +42,9 @@ func endpointCreateBuilder(c *core.Command) *core.Command {
 			endpointToCreate.Public = publicEndpoint
 		}
 		if endpoint.PrivateNetwork != nil && endpoint.PrivateNetwork.PrivateNetworkID != "" {
-			endpointToCreate.PrivateNetwork = &inference.EndpointSpecPrivateNetwork{PrivateNetworkID: endpoint.PrivateNetwork.PrivateNetworkID}
+			endpointToCreate.PrivateNetwork = &inference.EndpointSpecPrivateNetwork{
+				PrivateNetworkID: endpoint.PrivateNetwork.PrivateNetworkID,
+			}
 		}
 		createEndpointreq.Endpoint = &endpointToCreate
 

internal/namespaces/rdb/v1/custom_user.go

@@ -7,6 +7,7 @@ import (
 	"reflect"
 
 	"github.com/scaleway/scaleway-cli/v2/core"
+	"github.com/scaleway/scaleway-cli/v2/internal/interactive"
 	"github.com/scaleway/scaleway-cli/v2/internal/passwordgenerator"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
@@ -170,34 +171,48 @@ func userUpdateBuilder(c *core.Command) *core.Command {
 		api := rdb.NewAPI(client)
 
 		customRequest := argsI.(*rdbUpdateUserRequestCustom)
-
 		updateUserRequest := customRequest.UpdateUserRequest
 
 		var err error
-		if customRequest.GeneratePassword && customRequest.Password == nil {
-			updateUserRequest.Password = new(string)
-			*updateUserRequest.Password, err = passwordgenerator.GeneratePassword(21, 1, 1, 1, 1)
-			if err != nil {
-				return nil, err
-			}
-			fmt.Printf("Your generated password is %v \n", *updateUserRequest.Password)
-			fmt.Printf("\n")
-		}
 
-		if !customRequest.GeneratePassword && customRequest.Password == nil {
-			return nil, errors.New(
-				"you must provide a password when generate-password is set to false",
-			)
+		if customRequest.GeneratePassword || customRequest.Password != nil {
+			switch {
+			case customRequest.GeneratePassword && customRequest.Password == nil:
+				updateUserRequest.Password = new(string)
+				pwd, err := passwordgenerator.GeneratePassword(21, 1, 1, 1, 1)
+				if err != nil {
+					return nil, err
+				}
+				*updateUserRequest.Password = pwd
+
+				_, err = interactive.Println("Your generated password is", pwd)
+				if err != nil {
+					return nil, err
+				}
+
+			case !customRequest.GeneratePassword && customRequest.Password == nil:
+				return nil, errors.New(
+					"you must provide a password when generate-password is set to false",
+				)
+
+			default:
+				updateUserRequest.Password = customRequest.Password
+			}
 		}
 
 		user, err := api.UpdateUser(updateUserRequest)
 		if err != nil {
 			return nil, err
 		}
 
+		respPwd := ""
+		if updateUserRequest.Password != nil {
+			respPwd = *updateUserRequest.Password
+		}
+
 		result := rdbUpdateUserResponseCustom{
 			User:     user,
-			Password: *updateUserRequest.Password,
+			Password: respPwd,
 		}
 
 		return result, nil