Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

enter "n" to cancel setup

pull/10616/head
Kelvin Wang 2018-10-11 20:49:00 -04:00
parent 91792ddf38
commit b5e7b5f138
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/influx/setup.go
View File

@ -66,8 +66,6 @@ func getOnboardingRequest() (or *platform.OnboardingRequest) {
Writer: os.Stdout, Writer: os.Stdout,
Reader: os.Stdin, Reader: os.Stdin,
} }
var confirmed bool
for !confirmed {
or = new(platform.OnboardingRequest) or = new(platform.OnboardingRequest)
fmt.Println(promptWithColor(`Welcome to InfluxDB 2.0!`, colorYellow)) fmt.Println(promptWithColor(`Welcome to InfluxDB 2.0!`, colorYellow))
or.User = getInput(ui, "Please type your primary username", "") or.User = getInput(ui, "Please type your primary username", "")
@ -75,7 +73,9 @@ func getOnboardingRequest() (or *platform.OnboardingRequest) {
or.Org = getInput(ui, "Please type your primary organization name.\r\nOr ENTER to use \"default\"", "default") or.Org = getInput(ui, "Please type your primary organization name.\r\nOr ENTER to use \"default\"", "default")
or.Bucket = getInput(ui, "Please type your primary bucket name.\r\nOr ENTER to use \"default\"", "default") or.Bucket = getInput(ui, "Please type your primary bucket name.\r\nOr ENTER to use \"default\"", "default")
confirmed = getConfirm(ui, or) if confirmed := getConfirm(ui, or); !confirmed {
fmt.Println("Setup is canceled.")
os.Exit(1)
} }
return or return or
@ -100,13 +100,14 @@ func promptWithColor(s string, color []byte) string {
} }
func getConfirm(ui *input.UI, or *platform.OnboardingRequest) bool { func getConfirm(ui *input.UI, or *platform.OnboardingRequest) bool {
prompt := promptWithColor("Confirm? (y/n)", colorRed)
for {
fmt.Print(promptWithColor(fmt.Sprintf(` fmt.Print(promptWithColor(fmt.Sprintf(`
You have entered: You have entered:
Username: %s Username: %s
Organization: %s Organization: %s
Bucket: %s Bucket: %s
`, or.User, or.Org, or.Bucket), colorCyan)) `, or.User, or.Org, or.Bucket), colorCyan))
prompt := promptWithColor("Confirm? (y/n)", colorRed)
result, err := ui.Ask(prompt, &input.Options{ result, err := ui.Ask(prompt, &input.Options{
HideOrder: true, HideOrder: true,
}) })
@ -116,8 +117,11 @@ You have entered:
switch result { switch result {
case "y": case "y":
return true return true
default: case "n":
return false return false
default:
continue
}
} }
} }