Merge pull request #272 from DopplerHQ/configure-set-stdin

Support supplying `doppler configure set` value on stdin
DopplerHQ · Oct 25, 2021 · 8d7e3b2 · 8d7e3b2
2 parents a22b27a + 07d368f
commit 8d7e3b2
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 12 deletions.
diff --git a/pkg/cmd/configure.go b/pkg/cmd/configure.go
@@ -16,8 +16,10 @@ limitations under the License.
 package cmd
 
 import (
+	"bufio"
 	"errors"
 	"fmt"
+	"os"
 	"strings"
 
 	"github.com/DopplerHQ/cli/pkg/configuration"
@@ -86,7 +88,7 @@ doppler configure get key otherkey`,
 	ValidArgsFunction: currentConfigOptionsValidArgs,
 	Args: func(cmd *cobra.Command, args []string) error {
 		if len(args) == 0 {
-			return errors.New("requires at least 1 arg(s), only received 0")
+			return errors.New("requires at least 1 arg(s), received 0")
 		}
 
 		for _, arg := range args {
@@ -123,11 +125,20 @@ doppler configure set key=123 otherkey=456`,
 	ValidArgsFunction: configOptionsValidArgs,
 	Args: func(cmd *cobra.Command, args []string) error {
 		if len(args) == 0 {
-			return errors.New("requires at least 1 arg(s), only received 0")
+			return errors.New("requires at least 1 arg(s), received 0")
 		}
 
 		if !strings.Contains(args[0], "=") {
-			if len(args) == 2 {
+			if len(args) == 1 {
+				hasData, e := utils.HasDataOnStdIn()
+				if e != nil {
+					utils.HandleError(e)
+				}
+				if !hasData {
+					return errors.New("Value must be suppied on stdin or as an argument")
+				}
+				return nil
+			} else if len(args) == 2 {
 				if configuration.IsValidConfigOption(args[0]) || configuration.IsTranslatableConfigOption(args[0]) {
 					return nil
 				}
@@ -139,9 +150,12 @@ doppler configure set key=123 otherkey=456`,
 
 		for _, arg := range args {
 			option := strings.Split(arg, "=")
-			if len(option) < 2 || (!configuration.IsValidConfigOption(option[0]) && !configuration.IsTranslatableConfigOption(option[0])) {
+			if !configuration.IsValidConfigOption(option[0]) && !configuration.IsTranslatableConfigOption(option[0]) {
 				return errors.New("invalid option " + option[0])
 			}
+			if len(option) < 2 {
+				return errors.New("option " + option[0] + " requires a value")
+			}
 		}
 
 		return nil
@@ -150,7 +164,28 @@ doppler configure set key=123 otherkey=456`,
 		jsonFlag := utils.OutputJSON
 
 		options := map[string]string{}
-		if !strings.Contains(args[0], "=") {
+
+		if len(args) == 1 && !strings.Contains(args[0], "=") {
+			var input []string
+			scanner := bufio.NewScanner(os.Stdin)
+			// read input from stdin
+			for {
+				if ok := scanner.Scan(); !ok {
+					if e := scanner.Err(); e != nil {
+						utils.HandleError(e, "Unable to read input from stdin")
+					}
+
+					break
+				}
+
+				s := scanner.Text()
+				input = append(input, s)
+			}
+
+			key := args[0]
+			value := strings.Join(input, "\n")
+			options[key] = value
+		} else if !strings.Contains(args[0], "=") {
 			options[args[0]] = args[1]
 		} else {
 			for _, option := range args {
@@ -183,7 +218,7 @@ doppler configure unset key otherkey`,
 	ValidArgsFunction: currentConfigOptionsValidArgs,
 	Args: func(cmd *cobra.Command, args []string) error {
 		if len(args) == 0 {
-			return errors.New("requires at least 1 arg(s), only received 0")
+			return errors.New("requires at least 1 arg(s), received 0")
 		}
 
 		for _, arg := range args {

diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
@@ -61,7 +61,7 @@ doppler run --command "YOUR_COMMAND && YOUR_OTHER_COMMAND"`,
 				return errors.New("arg(s) may not be set when using --command flag")
 			}
 		} else if len(args) == 0 {
-			return errors.New("requires at least 1 arg(s), only received 0")
+			return errors.New("requires at least 1 arg(s), received 0")
 		}
 
 		return nil

diff --git a/pkg/cmd/secrets.go b/pkg/cmd/secrets.go
@@ -237,13 +237,11 @@ func setSecrets(cmd *cobra.Command, args []string) {
 		// format: 'doppler secrets set KEY' (interactive)
 
 		// check for existing data on stdin
-		stat, e := os.Stdin.Stat()
+		hasData, e := utils.HasDataOnStdIn()
 		if e != nil {
-			utils.HandleError(e, "Unable to stat stdin")
+			utils.HandleError(e)
 		}
-
-		dataOnStdin := (stat.Mode() & os.ModeCharDevice) == 0
-		interactiveMode := !dataOnStdin
+		interactiveMode := !hasData
 		if interactiveMode {
 			if !canPromptUser {
 				utils.HandleError(errors.New("Secret value must be provided when using --no-interactive"))

diff --git a/pkg/utils/io.go b/pkg/utils/io.go
@@ -16,6 +16,7 @@ limitations under the License.
 package utils
 
 import (
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -76,3 +77,14 @@ func WriteTempFile(name string, data []byte, perm os.FileMode) (string, error) {
 
 	return tmpFileName, nil
 }
+
+func HasDataOnStdIn() (bool, error) {
+	stat, e := os.Stdin.Stat()
+	if e != nil {
+		LogDebugError(e)
+		return false, errors.New("Unable to stat stdin")
+	}
+
+	hasData := (stat.Mode() & os.ModeCharDevice) == 0
+	return hasData, nil
+}
diff --git a/tests/e2e/configure.sh b/tests/e2e/configure.sh
@@ -101,6 +101,13 @@ config="$("$DOPPLER_BINARY" configure get config --configuration=./temp-config -
 
 beforeEach
 
+# test set using stdin
+echo 123 | "$DOPPLER_BINARY" configure set config --configuration=./temp-config --scope=/ --silent
+config="$("$DOPPLER_BINARY" configure get config --configuration=./temp-config --scope=/ --json)"
+[[ "$config" == '{"enclave.config":"123"}' ]] || error "ERROR: unexpected config contents after 'set' w/ stdin"
+
+beforeEach
+
 #
 # CLI v3 compatability tests (DPLR-435)
 #