CLOUDP-153329 Update the atlas setup to mimic atlas deployments setup (#3410)

Author: fmenezes

internal/cli/setup/confirm_default_setup.go

@@ -19,9 +19,27 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/AlecAivazis/survey/v2"
 	"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/telemetry"
 )
 
+var errCancel = errors.New("user-aborted. Not creating cluster")
+
+func (opts *Opts) promptSettings() error {
+	opts.settings = defaultSettings
+
+	p := &survey.Select{
+		Message: "How do you want to set up your Atlas cluster?",
+		Options: settingOptions,
+		Default: opts.settings,
+		Description: func(value string, _ int) string {
+			return settingsDescription[value]
+		},
+	}
+
+	return telemetry.TrackAskOne(p, &opts.settings, nil)
+}
+
 func (opts *Opts) askConfirmDefaultQuestion(values *clusterSettings) error {
 	if opts.Confirm {
 		return nil
@@ -47,6 +65,7 @@ Cluster Name:				%s%s
 Cloud Provider and Region:		%s - %s
 Database User Username:			%s%s
 Allow connections from (IP Address):	%s
+
 `,
 		values.ClusterName,
 		clusterTier,
@@ -57,13 +76,15 @@ Allow connections from (IP Address):	%s
 		strings.Join(values.IPAddresses, ", "),
 	)
 
-	q := newClusterDefaultConfirm(opts.Tier)
-	if err := telemetry.TrackAskOne(q, &opts.Confirm); err != nil {
+	if err := opts.promptSettings(); err != nil {
 		return err
 	}
 
-	if !opts.Confirm {
-		return errors.New("user-aborted. Not creating cluster")
+	if opts.settings == cancelSettings {
+		return errCancel
 	}
+
+	opts.Confirm = opts.settings == defaultSettings // acts same as --force
+
 	return nil
 }

internal/cli/setup/prompt.go

@@ -92,15 +92,3 @@ func newClusterCreateConfirm() survey.Prompt {
 		Default: true,
 	}
 }
-
-func newClusterDefaultConfirm(tier string) survey.Prompt {
-	message := "Do you want to set up your Atlas database with default settings?"
-	if tier != DefaultAtlasTier {
-		message = "Are you ready to create your Atlas cluster with the above settings?"
-	}
-
-	return &survey.Confirm{
-		Message: message,
-		Default: true,
-	}
-}

internal/cli/setup/setup_cmd.go

@@ -53,6 +53,18 @@ const (
 	defaultRegionGCP    = "US_EAST_4"
 	defaultRegionAzure  = "US_EAST_2"
 	defaultRegionGov    = "US_GOV_EAST_1"
+	defaultSettings     = "default"
+	customSettings      = "custom"
+	cancelSettings      = "cancel"
+)
+
+var (
+	settingOptions      = []string{defaultSettings, customSettings, cancelSettings}
+	settingsDescription = map[string]string{
+		defaultSettings: "With default settings",
+		customSettings:  "With custom settings",
+		cancelSettings:  "Cancel setup",
+	}
 )
 
 var errNeedsProject = errors.New("ensure you select or add a project to the profile")
@@ -127,6 +139,7 @@ type Opts struct {
 	EnableTerminationProtection bool
 	flags                       *pflag.FlagSet
 	flagSet                     map[string]struct{}
+	settings                    string
 
 	// control
 	skipRegister bool
@@ -439,11 +452,18 @@ func (opts *Opts) setupCluster() error {
 		return dErr
 	}
 
-	if err := opts.askConfirmDefaultQuestion(values); err != nil || !opts.Confirm {
+	if err := opts.askConfirmDefaultQuestion(values); err != nil {
+		if errors.Is(err, errCancel) {
+			_, _ = fmt.Println(err.Error())
+			return nil
+		}
+		return err
+	}
+
+	if !opts.Confirm {
 		fmt.Print(setupTemplateIntro)
 
-		err = opts.interactiveSetup()
-		if err != nil {
+		if err := opts.interactiveSetup(); err != nil {
 			return err
 		}
 	} else {