Set prompt interactive and force modes immediately upon parsing flags.

Commands should not be responsible for setting these modes before invoking runners.

Author: mitchell-as

cmd/state/internal/cmdtree/clean.go

@@ -53,19 +53,13 @@ func newCleanUninstallCommand(prime *primer.Values, globals *globalOptions) *cap
 				return err
 			}
 
-			if globals.NonInteractive {
-				prime.Prompt().SetInteractive(false)
-			}
-			if globals.Force {
-				prime.Prompt().SetForce(true)
-				params.Force = true
-			}
+			params.Force = globals.Force
 			return runner.Run(&params)
 		},
 	)
 }
 
-func newCleanCacheCommand(prime *primer.Values, globals *globalOptions) *captain.Command {
+func newCleanCacheCommand(prime *primer.Values) *captain.Command {
 	runner := clean.NewCache(prime)
 	params := clean.CacheParams{}
 	return captain.NewCommand(
@@ -83,9 +77,6 @@ func newCleanCacheCommand(prime *primer.Values, globals *globalOptions) *captain
 			},
 		},
 		func(ccmd *captain.Command, _ []string) error {
-			if globals.NonInteractive {
-				prime.Prompt().SetInteractive(false)
-			}
 			return runner.Run(&params)
 		},
 	)
@@ -102,10 +93,7 @@ func newCleanConfigCommand(prime *primer.Values, globals *globalOptions) *captai
 		[]*captain.Flag{},
 		[]*captain.Argument{},
 		func(ccmd *captain.Command, _ []string) error {
-			if globals.Force {
-				prime.Prompt().SetForce(true)
-				params.Force = true
-			}
+			params.Force = globals.Force
 			return runner.Run(&params)
 		},
 	)

cmd/state/internal/cmdtree/cmdtree.go

@@ -79,7 +79,7 @@ func New(prime *primer.Values, args ...string) *CmdTree {
 	cleanCmd := newCleanCommand(prime)
 	cleanCmd.AddChildren(
 		newCleanUninstallCommand(prime, globals),
-		newCleanCacheCommand(prime, globals),
+		newCleanCacheCommand(prime),
 		newCleanConfigCommand(prime, globals),
 	)
 
@@ -95,7 +95,7 @@ func New(prime *primer.Values, args ...string) *CmdTree {
 	eventsCmd := newEventsCommand(prime)
 	eventsCmd.AddChildren(newEventsLogCommand(prime))
 
-	installCmd := newInstallCommand(prime, globals)
+	installCmd := newInstallCommand(prime)
 	uninstallCmd := newUninstallCommand(prime)
 	importCmd := newImportCommand(prime, globals)
 	searchCmd := newSearchCommand(prime)
@@ -137,8 +137,8 @@ func New(prime *primer.Values, args ...string) *CmdTree {
 
 	updateCmd := newUpdateCommand(prime)
 	updateCmd.AddChildren(
-		newUpdateLockCommand(prime, globals),
-		newUpdateUnlockCommand(prime, globals))
+		newUpdateLockCommand(prime),
+		newUpdateUnlockCommand(prime))
 
 	branchCmd := newBranchCommand(prime)
 	branchCmd.AddChildren(
@@ -157,7 +157,7 @@ func New(prime *primer.Values, args ...string) *CmdTree {
 
 	useCmd := newUseCommand(prime)
 	useCmd.AddChildren(
-		newUseResetCommand(prime, globals),
+		newUseResetCommand(prime),
 		newUseShowCommand(prime),
 	)
 
@@ -204,8 +204,8 @@ func New(prime *primer.Values, args ...string) *CmdTree {
 		prepareCmd,
 		newProtocolCommand(prime),
 		newExecCommand(prime, args...),
-		newRevertCommand(prime, globals),
-		newResetCommand(prime, globals),
+		newRevertCommand(prime),
+		newResetCommand(prime),
 		secretsCmd,
 		branchCmd,
 		newLearnCommand(prime),
@@ -302,12 +302,14 @@ func newStateCommand(globals *globalOptions, prime *primer.Values) *captain.Comm
 				Description: locale.T("flag_state_non_interactive_description"),
 				Shorthand:   "n",
 				Persist:     true,
+				OnUse:       func() { prime.Prompt().SetInteractive(false) },
 				Value:       &globals.NonInteractive,
 			},
 			{
 				Name:        "force",
 				Description: locale.T("flag_state_force_description"),
 				Persist:     true,
+				OnUse:       func() { prime.Prompt().SetForce(true) },
 				Value:       &globals.Force,
 			},
 			{
@@ -325,10 +327,6 @@ func newStateCommand(globals *globalOptions, prime *primer.Values) *captain.Comm
 		},
 		[]*captain.Argument{},
 		func(ccmd *captain.Command, args []string) error {
-			if globals.Verbose {
-				logging.CurrentHandler().SetVerbose(true)
-			}
-
 			return runner.Run(ccmd.Usage)
 		},
 	)

cmd/state/internal/cmdtree/packages.go

@@ -50,7 +50,7 @@ func newPackagesCommand(prime *primer.Values) *captain.Command {
 	return cmd
 }
 
-func newInstallCommand(prime *primer.Values, globals *globalOptions) *captain.Command {
+func newInstallCommand(prime *primer.Values) *captain.Command {
 	runner := install.New(prime, model.NamespacePackage)
 
 	params := install.Params{}
@@ -82,9 +82,6 @@ func newInstallCommand(prime *primer.Values, globals *globalOptions) *captain.Co
 					return locale.WrapInputError(err, "err_install_packages_args", "Invalid install arguments")
 				}
 			}
-			if globals.Force {
-				prime.Prompt().SetForce(true)
-			}
 			return runner.Run(params)
 		},
 	)

cmd/state/internal/cmdtree/reset.go

@@ -7,7 +7,7 @@ import (
 	"github.com/ActiveState/cli/internal/runners/reset"
 )
 
-func newResetCommand(prime *primer.Values, globals *globalOptions) *captain.Command {
+func newResetCommand(prime *primer.Values) *captain.Command {
 	runner := reset.New(prime)
 	params := &reset.Params{}
 
@@ -25,9 +25,6 @@ func newResetCommand(prime *primer.Values, globals *globalOptions) *captain.Comm
 			},
 		},
 		func(ccmd *captain.Command, args []string) error {
-			if globals.NonInteractive {
-				prime.Prompt().SetInteractive(false)
-			}
 			return runner.Run(params)
 		},
 	).SetGroup(VCSGroup).SetSupportsStructuredOutput()

cmd/state/internal/cmdtree/revert.go

@@ -7,7 +7,7 @@ import (
 	"github.com/ActiveState/cli/internal/runners/revert"
 )
 
-func newRevertCommand(prime *primer.Values, globals *globalOptions) *captain.Command {
+func newRevertCommand(prime *primer.Values) *captain.Command {
 	runner := revert.New(prime)
 	params := &revert.Params{}
 
@@ -32,9 +32,6 @@ func newRevertCommand(prime *primer.Values, globals *globalOptions) *captain.Com
 			},
 		},
 		func(ccmd *captain.Command, args []string) error {
-			if globals.NonInteractive {
-				prime.Prompt().SetInteractive(false)
-			}
 			return runner.Run(params)
 		},
 	).SetGroup(VCSGroup).SetSupportsStructuredOutput()

cmd/state/internal/cmdtree/update.go

@@ -34,7 +34,7 @@ func newUpdateCommand(prime *primer.Values) *captain.Command {
 	return cmd
 }
 
-func newUpdateLockCommand(prime *primer.Values, globals *globalOptions) *captain.Command {
+func newUpdateLockCommand(prime *primer.Values) *captain.Command {
 	runner := update.NewLock(prime)
 	params := update.LockParams{}
 
@@ -52,9 +52,6 @@ func newUpdateLockCommand(prime *primer.Values, globals *globalOptions) *captain
 		},
 		[]*captain.Argument{},
 		func(cmd *captain.Command, args []string) error {
-			if globals.NonInteractive {
-				prime.Prompt().SetInteractive(false)
-			}
 			return runner.Run(&params)
 		},
 	)
@@ -63,7 +60,7 @@ func newUpdateLockCommand(prime *primer.Values, globals *globalOptions) *captain
 	return cmd
 }
 
-func newUpdateUnlockCommand(prime *primer.Values, globals *globalOptions) *captain.Command {
+func newUpdateUnlockCommand(prime *primer.Values) *captain.Command {
 	runner := update.NewUnlock(prime)
 	params := update.UnlockParams{}
 
@@ -75,9 +72,6 @@ func newUpdateUnlockCommand(prime *primer.Values, globals *globalOptions) *capta
 		[]*captain.Flag{},
 		[]*captain.Argument{},
 		func(cmd *captain.Command, args []string) error {
-			if globals.NonInteractive {
-				prime.Prompt().SetInteractive(false)
-			}
 			return runner.Run(&params)
 		},
 	)

cmd/state/internal/cmdtree/use.go

@@ -33,7 +33,7 @@ func newUseCommand(prime *primer.Values) *captain.Command {
 	return cmd
 }
 
-func newUseResetCommand(prime *primer.Values, globals *globalOptions) *captain.Command {
+func newUseResetCommand(prime *primer.Values) *captain.Command {
 	params := &use.ResetParams{}
 
 	return captain.NewCommand(
@@ -44,9 +44,6 @@ func newUseResetCommand(prime *primer.Values, globals *globalOptions) *captain.C
 		[]*captain.Flag{},
 		[]*captain.Argument{},
 		func(_ *captain.Command, _ []string) error {
-			if globals.NonInteractive {
-				prime.Prompt().SetInteractive(false)
-			}
 			return use.NewReset(prime).Run(params)
 		},
 	)

internal/captain/command.go

@@ -521,6 +521,9 @@ func (c *Command) flagByName(name string, persistOnly bool) *Flag {
 			return flag
 		}
 	}
+	if c.parent != nil {
+		return c.parent.flagByName(name, persistOnly)
+	}
 	return nil
 }
 

internal/prompt/prompt.go

@@ -28,6 +28,7 @@ type Prompter interface {
 	IsInteractive() bool
 	SetInteractive(bool)
 	SetForce(bool)
+	IsForced() bool
 }
 
 // ValidatorFunc is a function pass to the Prompter to perform validation
@@ -80,6 +81,8 @@ const (
 )
 
 // Input prompts the user for input.  The user can specify available validation flags to trigger validation of responses
+// If the prompt is non-interactive, it returns defaultResponse.
+// If the prompt is forced, it returns forcedResponse if not nil, or defaultResponse.
 func (p *Prompt) Input(title, message string, defaultResponse *string, forcedResponse *string, flags ...ValidatorFlag) (string, error) {
 	return p.InputAndValidate(title, message, defaultResponse, forcedResponse, func(val interface{}) error {
 		return nil
@@ -98,6 +101,8 @@ func interactiveInputError(message string) error {
 }
 
 // InputAndValidate prompts an input field and allows you to specfiy a custom validation function as well as the built in flags
+// If the prompt is non-interactive, it returns defaultResponse.
+// If the prompt is forced, it returns forcedResponse if not nil, or defaultResponse.
 func (p *Prompt) InputAndValidate(title, message string, defaultResponse *string, forcedResponse *string, validator ValidatorFunc, flags ...ValidatorFlag) (string, error) {
 	if p.isForced {
 		response := forcedResponse
@@ -154,7 +159,9 @@ func (p *Prompt) InputAndValidate(title, message string, defaultResponse *string
 	return response, nil
 }
 
-// Select prompts the user to select one entry from multiple choices
+// Select prompts the user to select one entry from multiple choices.
+// If the prompt is non-interactive, it returns defaultChoice.
+// If the prompt is forced, it returns forcedChoice if not nil, or defaultChoice.
 func (p *Prompt) Select(title, message string, choices []string, defaultChoice *string, forcedChoice *string) (string, error) {
 	if p.isForced {
 		choice := forcedChoice
@@ -199,6 +206,8 @@ func (p *Prompt) Select(title, message string, choices []string, defaultChoice *
 }
 
 // Confirm prompts user for yes or no response.
+// If the prompt is non-interactive, it returns defaultChoice.
+// If the prompt is forced, it returns forcedChoice if not nil, or defaultChoice.
 func (p *Prompt) Confirm(title, message string, defaultChoice *bool, forcedChoice *bool) (bool, error) {
 	if p.isForced {
 		choice := forcedChoice
@@ -259,7 +268,7 @@ func translateConfirm(confirm bool) string {
 // InputSecret prompts the user for input and obfuscates the text in stdout.
 // Will fail if empty.
 func (p *Prompt) InputSecret(title, message string, flags ...ValidatorFlag) (string, error) {
-	if !p.isInteractive {
+	if !p.isInteractive || p.isForced {
 		return "", interactiveInputError(message)
 	}
 	var response string

internal/runbits/auth/login.go

@@ -29,13 +29,12 @@ var OpenURI = osutils.OpenURI
 
 // Authenticate will prompt the user for authentication
 func Authenticate(cfg keypairs.Configurable, out output.Outputer, prompt prompt.Prompter, auth *authentication.Auth) error {
-	return AuthenticateWithInput("", "", "", false, cfg, out, prompt, auth)
+	return AuthenticateWithInput("", "", "", cfg, out, prompt, auth)
 }
 
 // AuthenticateWithInput will prompt the user for authentication if the input doesn't already provide it
 func AuthenticateWithInput(
 	username, password, totp string,
-	nonInteractive bool,
 	cfg keypairs.Configurable,
 	out output.Outputer,
 	prompt prompt.Prompter,
@@ -44,7 +43,7 @@ func AuthenticateWithInput(
 	logging.Debug("Authenticating with input")
 
 	credentials := &mono_models.Credentials{Username: username, Password: password, Totp: totp}
-	if err := ensureCredentials(credentials, prompt, nonInteractive); err != nil {
+	if err := ensureCredentials(credentials, prompt); err != nil {
 		return locale.WrapInputError(err, "login_cancelled")
 	}
 
@@ -133,10 +132,10 @@ func RequireAuthentication(message string, cfg keypairs.Configurable, out output
 	return nil
 }
 
-func ensureCredentials(credentials *mono_models.Credentials, prompter prompt.Prompter, nonInteractive bool) error {
+func ensureCredentials(credentials *mono_models.Credentials, prompter prompt.Prompter) error {
 	var err error
 	if credentials.Username == "" {
-		if nonInteractive {
+		if !prompter.IsInteractive() || prompter.IsForced() {
 			return locale.NewInputError("err_auth_needinput")
 		}
 		credentials.Username, err = prompter.Input("", locale.T("username_prompt"), ptr.To(""), nil, prompt.InputRequired)
@@ -146,7 +145,7 @@ func ensureCredentials(credentials *mono_models.Credentials, prompter prompt.Pro
 	}
 
 	if credentials.Password == "" {
-		if nonInteractive {
+		if !prompter.IsInteractive() || prompter.IsForced() {
 			return locale.NewInputError("err_auth_needinput")
 		}
 		credentials.Password, err = prompter.InputSecret("", locale.T("password_prompt"), prompt.InputRequired)