Change arg to prompt and refer to it as a driver

Author: lox

main.go

@@ -30,10 +30,10 @@ func (w logWriter) Write(b []byte) (int, error) {
 }
 
 func main() {
-
 	var (
 		prompts          = prompt.Available()
 		debug            = kingpin.Flag("debug", "Show debugging output").Bool()
+		promptDriver     = kingpin.Flag("prompt", fmt.Sprintf("Prompt driver to use  %v", prompts)).Default("terminal").OverrideDefaultFromEnvar("AWS_VAULT_PROMPT").Enum(prompts...)
 		add              = kingpin.Command("add", "Adds credentials, prompts if none provided")
 		addProfile       = add.Arg("profile", "Name of the profile").Required().String()
 		addFromEnv       = add.Flag("env", "Read the credentials from the environment").Bool()
@@ -42,7 +42,6 @@ func main() {
 		execNoSession    = exec.Flag("no-session", "Use root credentials, no session created").Short('n').Bool()
 		execSessDuration = exec.Flag("session-ttl", "Expiration time for aws session").Default("4h").OverrideDefaultFromEnvar("AWS_SESSION_TTL").Short('t').Duration()
 		execMfaToken     = exec.Flag("mfa-token", "The mfa token to use").Short('m').String()
-		execMfaPrompt    = exec.Flag("mfa-prompt", fmt.Sprintf("Prompt to use for mfa, from %v", prompts)).Default("terminal").OverrideDefaultFromEnvar("AWS_VAULT_PROMPT").Enum(prompts...)
 		execServer       = exec.Flag("server", "Run the server in the background for credentials").Short('s').Bool()
 		execProfile      = exec.Arg("profile", "Name of the profile").Required().String()
 		execCmd          = exec.Arg("cmd", "Command to execute").Default(os.Getenv("SHELL")).String()
@@ -53,7 +52,6 @@ func main() {
 		login            = kingpin.Command("login", "Generate a login link for the AWS Console")
 		loginProfile     = login.Arg("profile", "Name of the profile").Required().String()
 		loginMfaToken    = login.Flag("mfa-token", "The mfa token to use").Short('t').String()
-		loginMfaPrompt   = login.Flag("mfa-prompt", fmt.Sprintf("Prompt to use for mfa, from %v", prompts)).Default("terminal").OverrideDefaultFromEnvar("AWS_VAULT_PROMPT").Enum(prompts...)
 		server           = kingpin.Command("server", "Run an ec2 instance role server locally")
 	)
 
@@ -115,7 +113,7 @@ func main() {
 			Duration:    *execSessDuration,
 			Signals:     signals,
 			MfaToken:    *execMfaToken,
-			MfaPrompt:   prompt.Method(*execMfaPrompt),
+			MfaPrompt:   prompt.Method(*promptDriver),
 			StartServer: *execServer,
 			NoSession:   *execNoSession,
 		})
@@ -125,7 +123,7 @@ func main() {
 			Profile:   *loginProfile,
 			Keyring:   keyring,
 			MfaToken:  *loginMfaToken,
-			MfaPrompt: prompt.Method(*loginMfaPrompt),
+			MfaPrompt: prompt.Method(*promptDriver),
 		})
 
 	case server.FullCommand():