Merge pull request #8394 from hashicorp/b-input-spaces

command: use bufio.ReadString instead of scanning to get spaces

command/ui_input.go

@@ -11,6 +11,7 @@ import (
 	"os/signal"
 	"strings"
 	"sync"
+	"unicode"
 
 	"github.com/hashicorp/terraform/terraform"
 	"github.com/mitchellh/colorstring"
@@ -95,12 +96,13 @@ func (i *UIInput) Input(opts *terraform.InputOpts) (string, error) {
 	// interrupt this if we are interrupted (SIGINT)
 	result := make(chan string, 1)
 	go func() {
-		var line string
-		if _, err := fmt.Fscanln(r, &line); err != nil {
+		buf := bufio.NewReader(r)
+		line, err := buf.ReadString('\n')
+		if err != nil {
 			log.Printf("[ERR] UIInput scan err: %s", err)
 		}
 
-		result <- line
+		result <- strings.TrimRightFunc(line, unicode.IsSpace)
 	}()
 
 	select {

command/ui_input_test.go

@@ -26,3 +26,19 @@ func TestUIInputInput(t *testing.T) {
 		t.Fatalf("bad: %#v", v)
 	}
 }
+
+func TestUIInputInput_spaces(t *testing.T) {
+	i := &UIInput{
+		Reader: bytes.NewBufferString("foo bar\n"),
+		Writer: bytes.NewBuffer(nil),
+	}
+
+	v, err := i.Input(&terraform.InputOpts{})
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	if v != "foo bar" {
+		t.Fatalf("bad: %#v", v)
+	}
+}