Update variable reader to only prompt for each variable once

Author: Marton6

internals/secrethub/variable_reader.go

@@ -52,30 +52,37 @@ func (v *variableReader) ReadVariable(name string) (string, error) {
 }
 
 type promptMissingVariableReader struct {
-	reader tpl.VariableReader
-	io     ui.IO
+	reader  tpl.VariableReader
+	io      ui.IO
+	answers map[string]string
 }
 
 func newPromptMissingVariableReader(reader tpl.VariableReader, io ui.IO) tpl.VariableReader {
 	return &promptMissingVariableReader{
-		reader: reader,
-		io:     io,
+		reader:  reader,
+		io:      io,
+		answers: map[string]string{},
 	}
 }
 
 // ReadVariable fetches a template variable and prompts the user if it is not found.
 func (p *promptMissingVariableReader) ReadVariable(name string) (string, error) {
 	variable, err := p.reader.ReadVariable(name)
-	if err == tpl.ErrTemplateVarNotFound(name) {
-		question := fmt.Sprintf("What is the value of the \"%s\" template variable?\n", name)
-		answer, err := ui.Ask(p.io, question)
-		if err != nil {
-			return "", tpl.ErrTemplateVarNotFound(name)
-		}
-		return answer, nil
-	} else if err != nil {
-		return "", err
+	if err != tpl.ErrTemplateVarNotFound(name) {
+		return variable, err
+	}
+
+	variable, ok := p.answers[name]
+	if ok {
+		return variable, nil
+	}
+
+	question := fmt.Sprintf("What is the value of the \"%s\" template variable?\n", name)
+	variable, err = ui.Ask(p.io, question)
+	if err != nil {
+		return "", tpl.ErrTemplateVarNotFound(name)
 	}
+	p.answers[name] = variable
 
 	return variable, err
 }

internals/secrethub/variable_reader_test.go

@@ -1,7 +1,6 @@
 package secrethub
 
 import (
-	"bytes"
 	"testing"
 
 	"github.com/secrethub/secrethub-cli/internals/cli/ui"
@@ -120,39 +119,56 @@ func TestPromptVariableReader(t *testing.T) {
 	assert.OK(t, err)
 
 	cases := map[string]struct {
-		promptIn string
-		varName  string
-		expected string
-		err      error
+		promptIn []string
+		varNames []string
+		expected []string
+		err      []error
 	}{
 		"prompt": {
-			promptIn: "foobar",
-			varName:  "test5",
-			expected: "foobar",
+			promptIn: []string{"foobar\n"},
+			varNames: []string{"test5"},
+			expected: []string{"foobar"},
 		},
 		"no prompt": {
-			varName:  "test4",
-			expected: "testD",
+			varNames: []string{"test4"},
+			expected: []string{"testD"},
 		},
 		"from os env": {
-			varName:  "test2",
-			expected: "testB",
+			varNames: []string{"test2"},
+			expected: []string{"testB"},
 		},
 		"template vars shadow os env": {
-			varName:  "test1",
-			expected: "testAA",
+			varNames: []string{"test1"},
+			expected: []string{"testAA"},
+		},
+		"only prompt once": {
+			promptIn: []string{"foobar\n"},
+			varNames: []string{"test8", "test8"},
+			expected: []string{"foobar", "foobar"},
+		},
+		"prompt for each new variable": {
+			promptIn: []string{"foobar\n", "foo\n"},
+			varNames: []string{"test8", "test8", "test2", "test9", "test8", "test2"},
+			expected: []string{"foobar", "foobar", "testB", "foo", "foobar", "testB"},
 		},
 	}
 
 	for name, tc := range cases {
 		t.Run(name, func(t *testing.T) {
 			io := ui.NewFakeIO()
-			io.PromptIn.Buffer = bytes.NewBufferString(tc.promptIn)
-			reader = newPromptMissingVariableReader(reader, io)
+			io.PromptIn.Reads = tc.promptIn
 
-			val, err := reader.ReadVariable(tc.varName)
-			assert.Equal(t, val, tc.expected)
-			assert.Equal(t, err, tc.err)
+			reader := newPromptMissingVariableReader(reader, io)
+
+			for i, varName := range tc.varNames {
+				val, err := reader.ReadVariable(varName)
+				if tc.err != nil {
+					assert.Equal(t, err, tc.err[i])
+				} else {
+					assert.OK(t, err)
+				}
+				assert.Equal(t, val, tc.expected[i])
+			}
 		})
 	}
 }