improve guided setup wizard

- No longer crash if user hits ^D
- No longer error out on simple input errors
- Leading and trailing spaces are now skipped
- Number of questions is dramatically reduced without `--advanced` flag

Fixes: #530
Fixes: #531

Author: synfinatic

CHANGELOG.md

@@ -1,5 +1,17 @@
 # AWS SSO CLI Changelog
 
+## Unreleased
+
+### Bugs
+
+ * No longer crash during guided setup if user presses `<Del>` #531
+ * No longer error out on simple input errors during guided setup
+
+### Changes
+
+ * Guided setup is now more simple unless user provides the `--advanced` flag #530
+ * Guided setup now strips leading and trailing spaces
+
 ## [v1.12.0] - 2023-08-12
 
 ### Bugs

cmd/aws-sso/main.go

@@ -129,7 +129,6 @@ type CLI struct {
 	ConfigProfiles ConfigProfilesCmd `kong:"cmd,help='Update ~/.aws/config with AWS SSO profiles from the cache'"`
 	Config         ConfigCmd         `kong:"cmd,help='Run the configuration wizard'"`
 	Ecs            EcsCmd            `kong:"cmd,help='ECS Server commands'"`
-	Setup          SetupCmd          `kong:"cmd,hidden"` // need this so variables are visisble.
 	Version        VersionCmd        `kong:"cmd,help='Print version and exit'"`
 }
 
@@ -171,7 +170,7 @@ func main() {
 
 	if _, err := os.Stat(cli.ConfigFile); errors.Is(err, os.ErrNotExist) {
 		log.Warnf("No config file found!  Will now prompt you for a basic config...")
-		if err = setupWizard(&runCtx, false, false); err != nil {
+		if err = setupWizard(&runCtx, false, false, runCtx.Cli.Config.Advanced); err != nil {
 			log.Fatalf("%s", err.Error())
 		}
 	} else if err != nil {

cmd/aws-sso/setup_cmd.go

@@ -33,27 +33,20 @@ import (
 
 var ranSetup = false
 
-// SetupCmd defines the Kong args for the setup command (which currently doesn't exist)
-type SetupCmd struct{}
-
-// Run executes the setup command
-func (cc *SetupCmd) Run(ctx *RunContext) error {
-	return setupWizard(ctx, false, false)
-}
-
 type ConfigCmd struct {
 	// 	AddSSO bool `kong:"help='Add a new AWS SSO instance'"`
+	Advanced bool `kong:"help='Enable advanced configuration'"`
 }
 
 func (cc *ConfigCmd) Run(ctx *RunContext) error {
 	if err := backupConfig(ctx.Cli.ConfigFile); err != nil {
 		return err
 	}
 
-	return setupWizard(ctx, true, false) // ctx.Cli.Config.AddSSO)
+	return setupWizard(ctx, true, false, ctx.Cli.Config.Advanced) // ctx.Cli.Config.AddSSO)
 }
 
-func setupWizard(ctx *RunContext, reconfig, addSSO bool) error {
+func setupWizard(ctx *RunContext, reconfig, addSSO, advanced bool) error {
 	var s = ctx.Settings
 
 	// Don't run setup twice
@@ -87,17 +80,24 @@ func setupWizard(ctx *RunContext, reconfig, addSSO bool) error {
 		// - StartUrl/startHostname
 		// - InstanceName
 	} else {
-		instanceName := promptSsoInstance("")
+		instanceName := "Default"
+		if advanced {
+			instanceName = promptSsoInstance("")
+		}
 		startHostname := promptStartUrl("")
 		ssoRegion := promptAwsSsoRegion("")
-		defaultRegion := promptDefaultRegion(ssoRegion)
+
+		defaultRegion := ""
+		if advanced {
+			defaultRegion = promptDefaultRegion(ssoRegion)
+		}
 
 		s = &sso.Settings{
 			SSO:             map[string]*sso.SSOConfig{},
 			UrlAction:       "open",
 			LogLevel:        "error",
 			DefaultRegion:   defaultRegion,
-			ConsoleDuration: 60,
+			ConsoleDuration: 720,
 			CacheRefresh:    168,
 			AutoConfigCheck: false,
 			FullTextSearch:  true,
@@ -113,38 +113,41 @@ func setupWizard(ctx *RunContext, reconfig, addSSO bool) error {
 		}
 	}
 
-	// first, caching
-	s.CacheRefresh = promptCacheRefresh(s.CacheRefresh)
+	if advanced {
+		// first, caching
+		s.CacheRefresh = promptCacheRefresh(s.CacheRefresh)
 
-	if s.CacheRefresh > 0 {
-		s.AutoConfigCheck = promptAutoConfigCheck(s.AutoConfigCheck)
-	}
+		if s.CacheRefresh > 0 {
+			s.AutoConfigCheck = promptAutoConfigCheck(s.AutoConfigCheck)
+		}
 
-	// full text search?
-	s.FullTextSearch = promptFullTextSearch(s.FullTextSearch)
+		// full text search?
+		s.FullTextSearch = promptFullTextSearch(s.FullTextSearch)
 
-	// next how we open URLs
-	s.UrlAction = promptUrlAction(s.UrlAction)
-	s.ConfigProfilesUrlAction = promptConfigProfilesUrlAction(s.ConfigProfilesUrlAction, s.UrlAction)
+		// next how we open URLs
+		s.UrlAction = promptUrlAction(s.UrlAction)
 
-	// do we need urlExecCommand?
-	if s.UrlAction == url.Exec {
-		s.UrlExecCommand = promptUrlExecCommand(s.UrlExecCommand)
-	} else if s.UrlAction.IsContainer() {
-		s.UrlExecCommand = promptUseFirefox(s.UrlExecCommand)
-	} else {
-		s.UrlExecCommand = []string{}
-	}
+		s.ConfigProfilesUrlAction = promptConfigProfilesUrlAction(s.ConfigProfilesUrlAction, s.UrlAction)
 
-	// should we prompt user to override default browser?
-	if s.UrlAction == url.Open || s.ConfigProfilesUrlAction == url.ConfigProfilesOpen {
-		s.Browser = promptDefaultBrowser(s.Browser)
-	}
+		// do we need urlExecCommand?
+		if s.UrlAction == url.Exec {
+			s.UrlExecCommand = promptUrlExecCommand(s.UrlExecCommand)
+		} else if s.UrlAction.IsContainer() {
+			s.UrlExecCommand = promptUseFirefox(s.UrlExecCommand)
+		} else {
+			s.UrlExecCommand = []string{}
+		}
 
-	s.ConsoleDuration = promptConsoleDuration(s.ConsoleDuration)
-	s.HistoryLimit = promptHistoryLimit(s.HistoryLimit)
-	s.HistoryMinutes = promptHistoryMinutes(s.HistoryMinutes)
-	s.LogLevel = promptLogLevel(s.LogLevel)
+		// should we prompt user to override default browser?
+		if s.UrlAction == url.Open || s.ConfigProfilesUrlAction == url.ConfigProfilesOpen {
+			s.Browser = promptDefaultBrowser(s.Browser)
+		}
+
+		s.ConsoleDuration = promptConsoleDuration(s.ConsoleDuration)
+		s.HistoryLimit = promptHistoryLimit(s.HistoryLimit)
+		s.HistoryMinutes = promptHistoryMinutes(s.HistoryMinutes)
+		s.LogLevel = promptLogLevel(s.LogLevel)
+	}
 
 	if err := s.Validate(); err != nil {
 		return err