Changed --view parameter to --cached

Author: null93

internal/connect.go

@@ -19,19 +19,13 @@ var connectCmd = &cobra.Command{
 	Use:   "connect",
 	Short: "Connect to an EC2 instance using session-manager-plugin",
 	Args:  cobra.ExactArgs(0),
-	PreRunE: func(cmd *cobra.Command, args []string) error {
-		if view != "session" && view != "cached" {
-			return fmt.Errorf("view must be either 'session' or 'cached'")
-		}
-		return nil
-	},
 	Run: func(cmd *cobra.Command, args []string) {
 		var err error
 		var role *credentials.Role
 		var action string
 		var binaryPath string
 		for {
-			if view == "session" {
+			if !selectCachedFirst {
 				action, role = SelectRoleCredentialsStartingFromSession()
 			} else {
 				action, role = SelectRoleCredentialsStartingFromCache()
@@ -87,6 +81,6 @@ func init() {
 	connectCmd.Flags().StringVarP(&accountId, "account-id", "a", accountId, "AWS account ID")
 	connectCmd.Flags().StringVarP(&roleName, "role-name", "r", roleName, "AWS role name")
 	connectCmd.Flags().StringVarP(&instanceId, "instance-id", "i", instanceId, "EC2 instance ID")
-	connectCmd.Flags().StringVarP(&view, "view", "v", view, "session or cached")
+	connectCmd.Flags().BoolVarP(&selectCachedFirst, "cached", "c", selectCachedFirst, "select from cached credentials")
 	connectCmd.Flags().Uint32VarP(&connectUid, "uid", "u", connectUid, "UID on instance to 'su' to")
 }

internal/root.go

@@ -14,14 +14,14 @@ import (
 )
 
 var (
-	Version     string = "0.0.0"
-	debug       bool   = false
-	view        string = "session"
-	connectUid  uint32 = 0
-	sessionName string
-	accountId   string
-	roleName    string
-	instanceId  string
+	Version           string = "0.0.0"
+	debug             bool   = false
+	selectCachedFirst bool   = false
+	connectUid        uint32 = 0
+	sessionName       string
+	accountId         string
+	roleName          string
+	instanceId        string
 )
 
 var RootCmd = &cobra.Command{
@@ -31,11 +31,7 @@ var RootCmd = &cobra.Command{
 }
 
 func toggleView() {
-	if view == "session" {
-		view = "cached"
-	} else {
-		view = "session"
-	}
+	selectCachedFirst = !selectCachedFirst
 }
 
 func goBack() {
@@ -134,7 +130,7 @@ func SelectRoleCredentialsStartingFromCache() (string, *credentials.Role) {
 		return action, nil
 	}
 	if err != nil {
-		return "toggle-view", nil
+		ExitWithError(1, "failed to pick a role", err)
 	}
 	if role.Credentials == nil || role.Credentials.IsExpired() {
 		if sessions, err = credentials.GetSessions(); err != nil {
@@ -161,7 +157,7 @@ func SelectRoleCredentialsStartingFromCache() (string, *credentials.Role) {
 	return "", role
 }
 
-func setupConfigFile () {
+func setupConfigFile() {
 	if homeDir, err := os.UserHomeDir(); err == nil {
 		os.MkdirAll(homeDir+"/.aws/knox", os.FileMode(0700))
 	}
@@ -170,12 +166,12 @@ func setupConfigFile () {
 	viper.SetConfigPermissions(os.FileMode(0600))
 	viper.AddConfigPath("$HOME/.aws/knox")
 	viper.SetDefault("default_connect_uid", uint32(0))
-	viper.SetDefault("default_view", "session")
+	viper.SetDefault("select_cached_first", false)
 	viper.SetDefault("max_items_to_show", 10)
 	viper.SafeWriteConfig()
 	viper.ReadInConfig()
 	tui.MaxItemsToShow = viper.GetInt("max_items_to_show")
-	view = viper.GetString("default_view")
+	selectCachedFirst = viper.GetBool("select_cached_first")
 	connectUid = viper.GetUint32("default_connect_uid")
 }
 

internal/select.go

@@ -11,17 +11,11 @@ var selectCmd = &cobra.Command{
 	Use:   "select",
 	Short: "Select specific AWS role credentials",
 	Args:  cobra.ExactArgs(0),
-	PreRunE: func(cmd *cobra.Command, args []string) error {
-		if view != "session" && view != "cached" {
-			return fmt.Errorf("view must be either 'session' or 'cached'")
-		}
-		return nil
-	},
 	Run: func(cmd *cobra.Command, args []string) {
 		var role *credentials.Role
 		var action string
 		for {
-			if view == "session" {
+			if !selectCachedFirst {
 				action, role = SelectRoleCredentialsStartingFromSession()
 			} else {
 				action, role = SelectRoleCredentialsStartingFromCache()
@@ -50,5 +44,5 @@ func init() {
 	selectCmd.Flags().StringVarP(&sessionName, "sso-session", "s", sessionName, "SSO session name")
 	selectCmd.Flags().StringVarP(&accountId, "account-id", "a", accountId, "AWS account ID")
 	selectCmd.Flags().StringVarP(&roleName, "role-name", "r", roleName, "AWS role name")
-	selectCmd.Flags().StringVarP(&view, "view", "v", view, "session or cached")
+	selectCmd.Flags().BoolVarP(&selectCachedFirst, "cached", "c", selectCachedFirst, "select from cached credentials")
 }