Add --no-session to login

99designs · Jan 22, 2020 · a23e9fd · a23e9fd
1 parent a6c2a7c
commit a23e9fd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/cli/exec.go b/cli/exec.go
@@ -49,7 +49,7 @@ func ConfigureExecCommand(app *kingpin.Application) {
 		Short('d').
 		DurationVar(&input.SessionDuration)
 
-	cmd.Flag("no-session", "Don't create a session with GetSessionToken").
+	cmd.Flag("no-session", "Skip creating STS session with GetSessionToken").
 		Short('n').
 		BoolVar(&input.NoSession)
 

diff --git a/cli/login.go b/cli/login.go
@@ -23,6 +23,7 @@ type LoginCommandInput struct {
 	Path            string
 	Config          vault.Config
 	SessionDuration time.Duration
+	NoSession       bool
 }
 
 func ConfigureLoginCommand(app *kingpin.Application) {
@@ -34,6 +35,10 @@ func ConfigureLoginCommand(app *kingpin.Application) {
 		Short('d').
 		DurationVar(&input.SessionDuration)
 
+	cmd.Flag("no-session", "Skip creating STS session with GetSessionToken").
+		Short('n').
+		BoolVar(&input.NoSession)
+
 	cmd.Flag("mfa-token", "The MFA token to use").
 		Short('t').
 		StringVar(&input.Config.MfaToken)
@@ -63,6 +68,8 @@ func ConfigureLoginCommand(app *kingpin.Application) {
 }
 
 func LoginCommand(input LoginCommandInput) error {
+	vault.UseSession = !input.NoSession
+
 	configLoader.BaseConfig = input.Config
 	configLoader.ActiveProfile = input.ProfileName
 	config, err := configLoader.LoadFromProfile(input.ProfileName)