Fixed issue with tab segfaulting and hoisted errors to top of file

Author: null93

internal/clean.go

@@ -11,17 +11,17 @@ import (
 
 var (
 	cleanAll         = false
-	allowedCleanArgs = []string{"creds", "sso"}
+	allowedCleanArgs = []string{"cached", "sso"}
 )
 
 var cleanCmd = &cobra.Command{
 	Use:       "clean [" + strings.Join(allowedCleanArgs, "] [") + "]",
-	Short:     "Clean sso and role credentials from cache",
+	Short:     "Clean sso client credentials and role credentials from cache",
 	Args:      cobra.RangeArgs(1, 2),
 	ValidArgs: allowedCleanArgs,
-	Example:   "  knox clean creds\n  knox clean sso -a\n  knox clean creds sso",
+	Example:   "  knox clean cached\n  knox clean sso -a\n  knox clean cached sso",
 	Run: func(cmd *cobra.Command, args []string) {
-		if slices.Contains(args, "creds") {
+		if slices.Contains(args, "cached") {
 			roles, err := credentials.GetSavedRolesWithCredentials()
 			if err != nil {
 				ExitWithError(1, "failed to get role credentials", err)
@@ -65,5 +65,5 @@ var cleanCmd = &cobra.Command{
 func init() {
 	RootCmd.AddCommand(cleanCmd)
 	cleanCmd.Flags().SortFlags = true
-	cleanCmd.Flags().BoolVarP(&cleanAll, "all", "a", cleanAll, "Delete even if not expired credentials")
+	cleanCmd.Flags().BoolVarP(&cleanAll, "all", "a", cleanAll, "Delete even if not expired")
 }

internal/root.go

@@ -125,12 +125,10 @@ func SelectRoleCredentialsStartingFromCache() (string, *credentials.Role) {
 	var sessions credentials.Sessions
 	var session *credentials.Session
 	var role *credentials.Role
-	role, action, err = tui.SelectRolesCredentials()
-	if action != "" {
-		return action, nil
-	}
-	if err != nil {
+	if role, action, err = tui.SelectRolesCredentials(); err != nil {
 		ExitWithError(1, "failed to pick a role", err)
+	} else if action != "" {
+		return action, nil
 	}
 	if role.Credentials == nil || role.Credentials.IsExpired() {
 		if sessions, err = credentials.GetSessions(); err != nil {

sdk/credentials/session.go

@@ -20,6 +20,11 @@ import (
 	"gopkg.in/ini.v1"
 )
 
+var (
+	ErrorRoleCredentialsNil = fmt.Errorf("role credentials are nil")
+	ErrRoleNil              = fmt.Errorf("role cannot be nil")
+)
+
 type Instances []Instance
 
 type Instance struct {
@@ -74,7 +79,7 @@ func (r Roles) FindByName(name string) *Role {
 func (r *Role) GetManagedInstances() (Instances, error) {
 	instances := Instances{}
 	if r.Credentials == nil {
-		return instances, fmt.Errorf("role credentials are nil")
+		return instances, ErrorRoleCredentialsNil
 	}
 	staticProvider := awscredentials.NewStaticCredentialsProvider(
 		r.Credentials.AccessKeyId,
@@ -376,7 +381,7 @@ func (s *Session) GetRoles(accountId string) (Roles, error) {
 
 func (s *Session) RefreshRoleCredentials(role *Role) error {
 	if role == nil {
-		return fmt.Errorf("role cannot be nil")
+		return ErrRoleNil
 	}
 	options := sso.Options{Region: s.Region}
 	client := sso.New(options)

sdk/picker/picker.go

@@ -191,14 +191,8 @@ func (p *picker) Pick() (*option, *keys.KeyCode) {
 	defer ansi.ClearDown()
 	defer ansi.ShowCursor()
 	p.render()
-	var firedKeyCode keys.KeyCode
+	var firedActionKeyCode * keys.KeyCode
 	keyboard.Listen(func(key keys.Key) (stop bool, err error) {
-		for _, action := range p.actions {
-			if key.Code == action.key {
-				firedKeyCode = action.key
-				return true, nil
-			}
-		}
 		if key.Code == keys.CtrlC {
 			p.selectedIndex = -1
 			return true, nil
@@ -240,13 +234,19 @@ func (p *picker) Pick() (*option, *keys.KeyCode) {
 				p.render()
 			}
 		}
+		for _, action := range p.actions {
+			if key.Code == action.key {
+				firedActionKeyCode = &action.key
+				return true, nil
+			}
+		}
 		return false, nil
 	})
 	if p.selectedIndex < 0 {
-		return nil, nil
+		return nil, firedActionKeyCode
 	}
 	if p.selectedIndex >= len(p.filtered) {
-		return nil, nil
+		return nil, firedActionKeyCode
 	}
-	return p.filtered[p.selectedIndex], &firedKeyCode
+	return p.filtered[p.selectedIndex], firedActionKeyCode
 }

sdk/tui/tui.go

@@ -14,7 +14,12 @@ import (
 )
 
 var (
-	MaxItemsToShow int = 10
+	MaxItemsToShow              int = 10
+	ErrNotPickedSession             = fmt.Errorf("no sso session picked")
+	ErrNotPickedAccount             = fmt.Errorf("no account picked")
+	ErrNotPickedRole                = fmt.Errorf("no role picked")
+	ErrNotPickedInstance            = fmt.Errorf("no instance picked")
+	ErrNotPickedRoleCredentials     = fmt.Errorf("no role credentials picked")
 )
 
 func ClientLogin(session *credentials.Session) error {
@@ -74,7 +79,7 @@ func SelectSession(sessions credentials.Sessions) (string, string, error) {
 		return "", "toggle-view", nil
 	}
 	if selection == nil {
-		return "", "", fmt.Errorf("no sso session picked")
+		return "", "", ErrNotPickedSession
 	}
 	return selection.Value.(string), "", nil
 }
@@ -98,7 +103,7 @@ func SelectAccount(session *credentials.Session) (string, string, error) {
 		return "", "back", nil
 	}
 	if selection == nil {
-		return "", "", fmt.Errorf("no account picked")
+		return "", "", ErrNotPickedAccount
 	}
 	return selection.Value.(string), "", nil
 }
@@ -123,7 +128,7 @@ func SelectRole(roles credentials.Roles) (string, string, error) {
 		return "", "back", nil
 	}
 	if selection == nil {
-		return "", "", fmt.Errorf("no role picked")
+		return "", "", ErrNotPickedRole
 	}
 	return selection.Value.(string), "", nil
 }
@@ -147,7 +152,7 @@ func SelectInstance(role *credentials.Role) (string, string, error) {
 		return "", "back", nil
 	}
 	if selection == nil {
-		return "", "", fmt.Errorf("no instance picked")
+		return "", "", ErrNotPickedInstance
 	}
 	return selection.Value.(string), "", nil
 }
@@ -176,7 +181,7 @@ func SelectRolesCredentials() (*credentials.Role, string, error) {
 		return nil, "toggle-view", nil
 	}
 	if selection == nil {
-		return nil, "", fmt.Errorf("no role credentials picked")
+		return nil, "", ErrNotPickedRoleCredentials
 	}
 	selected := selection.Value.(credentials.Role)
 	return &selected, "", nil