Skip to content

Commit 65195ee

Browse files
authored
feat(cmd-flag): add --try-no-prompt flag (#1428)
2 parents 2ca0d46 + 0625a7b commit 65195ee

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

cmd/saml2aws/commands/login.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,10 @@ func resolveLoginDetails(account *cfg.IDPAccount, loginFlags *flags.LoginExecFla
269269
return loginDetails, nil
270270
}
271271

272+
if loginFlags.TryNoPrompt && loginDetails.Username != "" && loginDetails.Password != "" {
273+
return loginDetails, nil
274+
}
275+
272276
if account.Provider != "Shell" {
273277
err = saml2aws.PromptForLoginDetails(loginDetails, account.Provider)
274278
if err != nil {

cmd/saml2aws/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ func main() {
126126
cmdLogin.Flag("download-browser-driver", "Automatically download browsers for Browser IDP. (env: SAML2AWS_AUTO_BROWSER_DOWNLOAD)").Envar("SAML2AWS_AUTO_BROWSER_DOWNLOAD").BoolVar(&loginFlags.DownloadBrowser)
127127
cmdLogin.Flag("disable-sessions", "Do not use Okta sessions. Uses Okta sessions by default. (env: SAML2AWS_OKTA_DISABLE_SESSIONS)").Envar("SAML2AWS_OKTA_DISABLE_SESSIONS").BoolVar(&commonFlags.DisableSessions)
128128
cmdLogin.Flag("disable-remember-device", "Do not remember Okta MFA device. Remembers MFA device by default. (env: SAML2AWS_OKTA_DISABLE_REMEMBER_DEVICE)").Envar("SAML2AWS_OKTA_DISABLE_REMEMBER_DEVICE").BoolVar(&commonFlags.DisableRememberDevice)
129+
cmdLogin.Flag("try-no-prompt", "Only prompt for credentials if they cannot be read from keyring").BoolVar(&loginFlags.TryNoPrompt)
129130

130131
// `exec` command and settings
131132
cmdExec := app.Command("exec", "Exec the supplied command with env vars from STS token.")

pkg/flags/flags.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ type LoginExecFlags struct {
5050
DuoMFAOption string
5151
ExecProfile string
5252
CredentialProcess bool
53+
TryNoPrompt bool
5354
}
5455

5556
type ConsoleFlags struct {

0 commit comments

Comments
 (0)