cmd/prompt: remove uses of github.com/AlecAivazis/survey/v2

cmd/compose/options.go

@@ -162,7 +162,7 @@ func promptForInterpolatedVariables(ctx context.Context, dockerCli command.Cli,
 
 	// Prompt for confirmation
 	userInput := prompt.NewPrompt(dockerCli.In(), dockerCli.Out())
-	msg := "\nDo you want to proceed with these variables? [Y/n]: "
+	msg := "\nDo you want to proceed with these variables?"
 	confirmed, err := userInput.Confirm(msg, true)
 	if err != nil {
 		return err
@@ -286,7 +286,7 @@ func confirmRemoteIncludes(dockerCli command.Cli, options buildOptions, assumeYe
 	}
 	_, _ = fmt.Fprintln(dockerCli.Out(), "\nRemote includes could potentially be malicious. Make sure you trust the source.")
 
-	msg := "Do you want to continue? [y/N]: "
+	msg := "Do you want to continue?"
 	confirmed, err := prompt.NewPrompt(dockerCli.In(), dockerCli.Out()).Confirm(msg, false)
 	if err != nil {
 		return err

cmd/compose/options_test.go

@@ -403,7 +403,7 @@ func TestConfirmRemoteIncludes(t *testing.T) {
 				"  - oci://registry.example.com/stack:latest\n" +
 				"  - git://github.com/user/repo.git\n" +
 				"\nRemote includes could potentially be malicious. Make sure you trust the source.\n" +
-				"Do you want to continue? [y/N]: ",
+				"Do you want to continue?",
 		},
 		{
 			name: "user rejects remote includes",
@@ -422,7 +422,7 @@ func TestConfirmRemoteIncludes(t *testing.T) {
 			wantOutput: "\nWarning: This Compose project includes files from remote sources:\n" +
 				"  - oci://registry.example.com/stack:latest\n" +
 				"\nRemote includes could potentially be malicious. Make sure you trust the source.\n" +
-				"Do you want to continue? [y/N]: ",
+				"Do you want to continue?",
 		},
 	}
 

cmd/prompt/prompt.go

@@ -17,74 +17,107 @@
 package prompt
 
 import (
+	"bufio"
+	"errors"
 	"fmt"
 	"io"
+	"strings"
+	"unicode"
 
-	"github.com/AlecAivazis/survey/v2"
 	"github.com/docker/cli/cli/streams"
 
 	"github.com/docker/compose/v5/pkg/utils"
 )
 
 //go:generate mockgen -destination=./prompt_mock.go -self_package "github.com/docker/compose/v5/pkg/prompt" -package=prompt . UI
 
+var errInterrupt = errors.New("interrupt")
+
 // UI - prompt user input
 type UI interface {
 	Confirm(message string, defaultValue bool) (bool, error)
 }
 
 func NewPrompt(stdin *streams.In, stdout *streams.Out) UI {
 	if stdin.IsTerminal() {
-		return User{stdin: streamsFileReader{stdin}, stdout: streamsFileWriter{stdout}}
+		return User{stdin: stdin, reader: bufio.NewReader(stdin), stdout: stdout}
 	}
 	return Pipe{stdin: stdin, stdout: stdout}
 }
 
 // User - in a terminal
 type User struct {
-	stdout streamsFileWriter
-	stdin  streamsFileReader
-}
-
-// adapt streams.Out to terminal.FileWriter
-type streamsFileWriter struct {
-	stream *streams.Out
-}
-
-func (s streamsFileWriter) Write(p []byte) (n int, err error) {
-	return s.stream.Write(p)
-}
-
-func (s streamsFileWriter) Fd() uintptr {
-	return s.stream.FD()
+	stdout io.Writer
+	stdin  *streams.In
+	reader *bufio.Reader
 }
 
-// adapt streams.In to terminal.FileReader
-type streamsFileReader struct {
-	stream *streams.In
-}
+// Confirm asks for yes or no input
+func (u User) Confirm(message string, defaultValue bool) (bool, error) {
+	if err := u.stdin.SetRawTerminal(); err != nil {
+		return false, err
+	}
+	defer u.stdin.RestoreTerminal()
 
-func (s streamsFileReader) Read(p []byte) (n int, err error) {
-	return s.stream.Read(p)
-}
+	prompt := " [y/N]: "
+	if defaultValue {
+		prompt = " [Y/n]: "
+	}
 
-func (s streamsFileReader) Fd() uintptr {
-	return s.stream.FD()
+	for {
+		_, _ = fmt.Fprint(u.stdout, message+prompt)
+
+		answer, err := readLine(u.reader, u.stdout)
+		if err != nil {
+			return false, err
+		}
+
+		switch strings.ToLower(strings.TrimSpace(answer)) {
+		case "":
+			return defaultValue, nil
+		case "y", "yes":
+			return true, nil
+		case "n", "no":
+			return false, nil
+		}
+	}
 }
 
-// Confirm asks for yes or no input
-func (u User) Confirm(message string, defaultValue bool) (bool, error) {
-	qs := &survey.Confirm{
-		Message: message,
-		Default: defaultValue,
+func readLine(in io.RuneReader, out io.Writer) (string, error) {
+	var line []rune
+
+	for {
+		ch, _, err := in.ReadRune()
+		if err != nil {
+			return "", err
+		}
+
+		switch ch {
+		case 3: // Ctrl+C
+			_, _ = fmt.Fprint(out, "\r\n")
+			return "", errInterrupt
+
+		case 4: // Ctrl+D
+			return "", io.EOF
+
+		case '\r', '\n':
+			_, _ = fmt.Fprint(out, "\r\n")
+			return string(line), nil
+
+		case 127: // Backspace
+			if len(line) > 0 {
+				line = line[:len(line)-1]
+				_, _ = fmt.Fprint(out, "\b \b")
+			}
+
+		default:
+			if unicode.IsControl(ch) {
+				continue
+			}
+			line = append(line, ch)
+			_, _ = fmt.Fprintf(out, "%c", ch)
+		}
 	}
-	var b bool
-	err := survey.AskOne(qs, &b, func(options *survey.AskOptions) error {
-		options.Stdio.In = u.stdin
-		options.Stdio.Out = u.stdout
-		return nil
-	})
-	return b, err
 }
 
 // Pipe - aggregates prompt methods