From 42fecdf0e383e5b6eca421ab8dc297871aac78ea Mon Sep 17 00:00:00 2001 From: Samruddhi Rahegaonkar Date: Sat, 31 Jan 2026 09:43:07 +0530 Subject: [PATCH 1/2] fix: return errors in user elevate command Signed-off-by: Samruddhi Rahegaonkar --- cmd/harbor/root/user/elevate.go | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/cmd/harbor/root/user/elevate.go b/cmd/harbor/root/user/elevate.go index 060f8380..28903fb6 100644 --- a/cmd/harbor/root/user/elevate.go +++ b/cmd/harbor/root/user/elevate.go @@ -14,10 +14,11 @@ package user import ( + "fmt" + "github.com/goharbor/harbor-cli/pkg/api" "github.com/goharbor/harbor-cli/pkg/prompt" "github.com/goharbor/harbor-cli/pkg/views" - log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) @@ -27,42 +28,38 @@ func ElevateUserCmd() *cobra.Command { Short: "elevate user", Long: "elevate user to admin role", Args: cobra.MaximumNArgs(1), - Run: func(cmd *cobra.Command, args []string) { + RunE: func(cmd *cobra.Command, args []string) error { var err error var userId int64 if len(args) > 0 { userId, err = api.GetUsersIdByName(args[0]) if err != nil { - log.Errorf("failed to get user id for '%s': %v", args[0], err) - return + return fmt.Errorf("failed to get user id for '%s': %v", args[0], err) } if userId == 0 { - log.Errorf("User with name '%s' not found", args[0]) - return + return fmt.Errorf("user with name '%s' not found", args[0]) } } else { userId = prompt.GetUserIdFromUser() } confirm, err := views.ConfirmElevation() if err != nil { - log.Errorf("failed to confirm elevation: %v", err) - return + return fmt.Errorf("failed to confirm elevation: %v", err) } if !confirm { - log.Error("User did not confirm elevation. Aborting command.") - return + return fmt.Errorf("User did not confirm elevation. Aborting command.") } err = api.ElevateUser(userId) if err != nil { if isUnauthorizedError(err) { - log.Error("Permission denied: Admin privileges are required to execute this command.") + return fmt.Errorf("Permission denied: Admin privileges are required to execute this command.") } else { - log.Errorf("failed to elevate user: %v", err) + return fmt.Errorf("failed to elevate user: %v", err) } } + return nil }, } - return cmd } From 9976d6b916b09b337ef4664674986bcaf338dd22 Mon Sep 17 00:00:00 2001 From: Samruddhi Rahegaonkar Date: Sat, 7 Feb 2026 09:55:53 +0530 Subject: [PATCH 2/2] fix: overall loging Signed-off-by: Samruddhi Rahegaonkar --- cmd/harbor/main.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/harbor/main.go b/cmd/harbor/main.go index 98ffff65..246d3f7f 100644 --- a/cmd/harbor/main.go +++ b/cmd/harbor/main.go @@ -14,14 +14,15 @@ package main import ( + "fmt" "os" "github.com/goharbor/harbor-cli/cmd/harbor/root" ) func main() { - err := root.RootCmd().Execute() - if err != nil { + if err := root.RootCmd().Execute(); err != nil { + fmt.Fprintln(os.Stderr, err) os.Exit(1) } }