Fix autocompletion of profile names. Fixes #506

99designs · Feb 10, 2020 · e05eb98 · e05eb98
1 parent 0b449e7
commit e05eb98
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/cli/exec.go b/cli/exec.go
@@ -67,7 +67,7 @@ func ConfigureExecCommand(app *kingpin.Application) {
 
 	cmd.Arg("profile", "Name of the profile").
 		Required().
-		HintAction(awsConfigFile.ProfileNames).
+		HintAction(getProfileNames).
 		StringVar(&input.ProfileName)
 
 	cmd.Arg("cmd", "Command to execute, defaults to $SHELL").

diff --git a/cli/global.go b/cli/global.go
@@ -99,10 +99,10 @@ func ConfigureGlobals(app *kingpin.Application) {
 				return err
 			}
 		}
-		if awsConfigFile == nil {
-			awsConfigFile, err = vault.LoadConfigFromEnv()
-		}
+
+		awsConfigFile, err = vault.LoadConfigFromEnv()
 		configLoader = &vault.ConfigLoader{File: awsConfigFile}
+
 		return err
 	})
 }
@@ -120,3 +120,7 @@ func fileKeyringPassphrasePrompt(prompt string) (string, error) {
 	fmt.Println()
 	return string(b), nil
 }
+
+func getProfileNames() []string {
+	return awsConfigFile.ProfileNames()
+}
diff --git a/cli/login.go b/cli/login.go
@@ -52,7 +52,7 @@ func ConfigureLoginCommand(app *kingpin.Application) {
 
 	cmd.Arg("profile", "Name of the profile").
 		Required().
-		HintAction(awsConfigFile.ProfileNames).
+		HintAction(getProfileNames).
 		StringVar(&input.ProfileName)
 
 	cmd.Action(func(c *kingpin.ParseContext) error {

diff --git a/cli/rm.go b/cli/rm.go
@@ -22,7 +22,7 @@ func ConfigureRemoveCommand(app *kingpin.Application) {
 
 	cmd.Arg("profile", "Name of the profile").
 		Required().
-		HintAction(awsConfigFile.ProfileNames).
+		HintAction(getProfileNames).
 		StringVar(&input.ProfileName)
 
 	cmd.Flag("sessions-only", "Only remove sessions, leave credentials intact").

diff --git a/cli/rotate.go b/cli/rotate.go
@@ -30,7 +30,7 @@ func ConfigureRotateCommand(app *kingpin.Application) {
 
 	cmd.Arg("profile", "Name of the profile").
 		Required().
-		HintAction(awsConfigFile.ProfileNames).
+		HintAction(getProfileNames).
 		StringVar(&input.ProfileName)
 
 	cmd.Action(func(c *kingpin.ParseContext) error {