Fixed remote installer accepting TOS in non-interactive mode.

mitchell-as · mitchell-as · commit 9d57da838d31 · 2024-12-18T17:01:35.000-05:00
diff --git a/cmd/state-remote-installer/main.go b/cmd/state-remote-installer/main.go
@@ -173,9 +173,13 @@ func main() {
 }
 
 func execute(out output.Outputer, prompt prompt.Prompter, cfg *config.Instance, an analytics.Dispatcher, args []string, params *Params) error {
+	if params.nonInteractive {
+		prompt.SetInteractive(false)
+	}
+	defaultChoice := params.nonInteractive
 	msg := locale.Tr("tos_disclaimer", constants.TermsOfServiceURLLatest)
 	msg += locale.Tr("tos_disclaimer_prompt", constants.TermsOfServiceURLLatest)
-	cont, err := prompt.Confirm(locale.Tr("install_remote_title"), msg, ptr.To(true), nil)
+	cont, err := prompt.Confirm(locale.Tr("install_remote_title"), msg, &defaultChoice, nil)
 	if err != nil {
 		return errs.Wrap(err, "Not confirmed")
 	}

Original file line number	Diff line number	Diff line change
`@@ -173,9 +173,13 @@ func main() {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`func execute(out output.Outputer, prompt prompt.Prompter, cfg config.Instance, an analytics.Dispatcher, args []string, params Params) error {`
	`176`	`+ if params.nonInteractive {`
	`177`	`+ prompt.SetInteractive(false)`
	`178`	`+ }`
	`179`	`+ defaultChoice := params.nonInteractive`
`176`	`180`	`msg := locale.Tr("tos_disclaimer", constants.TermsOfServiceURLLatest)`
`177`	`181`	`msg += locale.Tr("tos_disclaimer_prompt", constants.TermsOfServiceURLLatest)`
`178`		`- cont, err := prompt.Confirm(locale.Tr("install_remote_title"), msg, ptr.To(true), nil)`
	`182`	`+ cont, err := prompt.Confirm(locale.Tr("install_remote_title"), msg, &defaultChoice, nil)`
`179`	`183`	`if err != nil {`
`180`	`184`	`return errs.Wrap(err, "Not confirmed")`
`181`	`185`	`}`