fixup! fixup! Add more secret creation input paths

cmoog · cmoog · commit 0649151f7cd8 · 2020-07-30T15:26:13.000-05:00
diff --git a/cmd/coder/secrets.go b/cmd/coder/secrets.go
@@ -7,6 +7,7 @@ import (
 
 	"cdr.dev/coder-cli/internal/entclient"
 	"cdr.dev/coder-cli/internal/x/xtabwriter"
+	"cdr.dev/coder-cli/internal/x/xvalidate"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/pflag"
 	"golang.org/x/xerrors"
@@ -125,6 +126,13 @@ func (cmd *createSecretCmd) Spec() cli.CommandSpec {
 	}
 }
 
+func (cmd *createSecretCmd) Validate() (e []error) {
+	if cmd.fromLiteral != "" && cmd.fromFile != "" {
+		e = append(e, xerrors.Errorf("--from-literal and --from-file cannot both be set"))
+	}
+	return e
+}
+
 func (cmd *createSecretCmd) Run(fl *pflag.FlagSet) {
 	var (
 		client = requireAuth()
@@ -135,6 +143,7 @@ func (cmd *createSecretCmd) Run(fl *pflag.FlagSet) {
 	if name == "" {
 		exitUsage(fl)
 	}
+	xvalidate.Validate(cmd)
 
 	if cmd.fromLiteral != "" {
 		value = cmd.fromLiteral
@@ -144,7 +153,7 @@ func (cmd *createSecretCmd) Run(fl *pflag.FlagSet) {
 		value = string(contents)
 	} else {
 		prompt := promptui.Prompt{
-			Label: "Value",
+			Label: "value",
 			Mask:  '*',
 			Validate: func(s string) error {
 				if len(s) < 1 {
