From 2198b0568f7b7137545757c896191ef2a2bc720e Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Fri, 3 Feb 2017 16:07:04 -0800
Subject: [PATCH] Fix "command.PromptForConfirmation" to accept "enter" for the
 "N" default

This adjusts `command.PromptForConfirmation` in `cli/command/utils.go` to use `bufio`'s `ReadLine` rather than using `fmt.Fscan` for reading input, which makes `<Enter>` properly accept the default value of "No" as one would expect.

This new code actually came from `cli/command/plugin/install.go`'s `acceptPrivileges` function, which I've also refactored here to use `command.PromptForConfirmation` as it should.

Additionally, this updates `cli/command/plugin/upgrade.go`'s `runUpgrade` function to use `command.PromptForConfirmation` for further consistency.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
---
 cli/command/plugin/install.go | 10 +---------
 cli/command/plugin/upgrade.go | 13 +------------
 cli/command/utils.go          | 11 ++++-------
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/cli/command/plugin/install.go b/cli/command/plugin/install.go
index 631917a07c..15877761af 100644
--- a/cli/command/plugin/install.go
+++ b/cli/command/plugin/install.go
@@ -1,7 +1,6 @@
 package plugin
 
 import (
-	"bufio"
 	"errors"
 	"fmt"
 	"strings"
@@ -178,13 +177,6 @@ func acceptPrivileges(dockerCli *command.DockerCli, name string) func(privileges
 		for _, privilege := range privileges {
 			fmt.Fprintf(dockerCli.Out(), " - %s: %v\n", privilege.Name, privilege.Value)
 		}
-
-		fmt.Fprint(dockerCli.Out(), "Do you grant the above permissions? [y/N] ")
-		reader := bufio.NewReader(dockerCli.In())
-		line, _, err := reader.ReadLine()
-		if err != nil {
-			return false, err
-		}
-		return strings.ToLower(string(line)) == "y", nil
+		return command.PromptForConfirmation(dockerCli.In(), dockerCli.Out(), "Do you grant the above permissions?"), nil
 	}
 }
diff --git a/cli/command/plugin/upgrade.go b/cli/command/plugin/upgrade.go
index d212cd7e52..6861aa1b32 100644
--- a/cli/command/plugin/upgrade.go
+++ b/cli/command/plugin/upgrade.go
@@ -1,7 +1,6 @@
 package plugin
 
 import (
-	"bufio"
 	"context"
 	"fmt"
 	"strings"
@@ -64,17 +63,7 @@ func runUpgrade(dockerCli *command.DockerCli, opts pluginOptions) error {
 
 	fmt.Fprintf(dockerCli.Out(), "Upgrading plugin %s from %s to %s\n", p.Name, old, remote)
 	if !opts.skipRemoteCheck && remote.String() != old.String() {
-		_, err := fmt.Fprint(dockerCli.Out(), "Plugin images do not match, are you sure? ")
-		if err != nil {
-			return errors.Wrap(err, "error writing to stdout")
-		}
-
-		rdr := bufio.NewReader(dockerCli.In())
-		line, _, err := rdr.ReadLine()
-		if err != nil {
-			return errors.Wrap(err, "error reading from stdin")
-		}
-		if strings.ToLower(string(line)) != "y" {
+		if !command.PromptForConfirmation(dockerCli.In(), dockerCli.Out(), "Plugin images do not match, are you sure?") {
 			return errors.New("canceling upgrade request")
 		}
 	}
diff --git a/cli/command/utils.go b/cli/command/utils.go
index f9255cf87f..4c52ce61b2 100644
--- a/cli/command/utils.go
+++ b/cli/command/utils.go
@@ -1,6 +1,7 @@
 package command
 
 import (
+	"bufio"
 	"fmt"
 	"io"
 	"os"
@@ -80,11 +81,7 @@ func PromptForConfirmation(ins *InStream, outs *OutStream, message string) bool
 		ins = NewInStream(os.Stdin)
 	}
 
-	answer := ""
-	n, _ := fmt.Fscan(ins, &answer)
-	if n != 1 || (answer != "y" && answer != "Y") {
-		return false
-	}
-
-	return true
+	reader := bufio.NewReader(ins)
+	answer, _, _ := reader.ReadLine()
+	return strings.ToLower(string(answer)) == "y"
 }