fixup! fixup! fixup! fixup! Add integration tests for Secrets commands

cmoog · cmoog · commit 88b6ebc24876 · 2020-07-30T09:16:07.000-05:00
diff --git a/ci/integration/integration_test.go b/ci/integration/integration_test.go
@@ -70,7 +70,7 @@ func TestCoderCLI(t *testing.T) {
 	var user entclient.User
 	c.Run(ctx, `coder users ls -o json | jq -c '.[] | select( .username == "charlie")'`).Assert(t,
 		tcli.Success(),
-		jsonUnmarshals(&user),
+		stdoutUnmarshalsJSON(&user),
 	)
 	assert.Equal(t, "user email is as expected", "charlie@coder.com", user.Email)
 	assert.Equal(t, "username is as expected", "Charlie", user.Name)
@@ -148,7 +148,7 @@ func TestSecrets(t *testing.T) {
 	)
 }
 
-func jsonUnmarshals(target interface{}) tcli.Assertion {
+func stdoutUnmarshalsJSON(target interface{}) tcli.Assertion {
 	return func(t *testing.T, r *tcli.CommandResult) {
 		slog.Helper()
 		err := json.Unmarshal(r.Stdout, target)
diff --git a/cmd/coder/users.go b/cmd/coder/users.go
@@ -6,6 +6,7 @@ import (
 	"os"
 
 	"cdr.dev/coder-cli/internal/x/xtabwriter"
+	"cdr.dev/coder-cli/internal/x/xvalidate"
 	"github.com/spf13/pflag"
 
 	"go.coder.com/cli"
@@ -37,6 +38,7 @@ type listCmd struct {
 }
 
 func (cmd *listCmd) Run(fl *pflag.FlagSet) {
+	xvalidate.Validate(cmd)
 	entClient := requireAuth()
 
 	users, err := entClient.Users()
@@ -61,7 +63,6 @@ func (cmd *listCmd) Run(fl *pflag.FlagSet) {
 	default:
 		exitUsage(fl)
 	}
-
 }
 
 func (cmd *listCmd) RegisterFlags(fl *pflag.FlagSet) {
@@ -75,3 +76,10 @@ func (cmd *listCmd) Spec() cli.CommandSpec {
 		Desc:  "list all users",
 	}
 }
+
+func (cmd *listCmd) Validate() (e []error) {
+	if !(cmd.outputFmt == "json" || cmd.outputFmt == "human") {
+		e = append(e, fmt.Errorf(`--output must be "json" or "human"`))
+	}
+	return e
+}

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func TestCoderCLI(t *testing.T) {`
`70`	`70`	`var user entclient.User`
`71`	`71`	c.Run(ctx, `coder users ls -o json \| jq -c '.[] \| select( .username == "charlie")'`).Assert(t,
`72`	`72`	`tcli.Success(),`
`73`		`- jsonUnmarshals(&user),`
	`73`	`+ stdoutUnmarshalsJSON(&user),`
`74`	`74`	`)`
`75`	`75`	`assert.Equal(t, "user email is as expected", "charlie@coder.com", user.Email)`
`76`	`76`	`assert.Equal(t, "username is as expected", "Charlie", user.Name)`
`@@ -148,7 +148,7 @@ func TestSecrets(t *testing.T) {`
`148`	`148`	`)`
`149`	`149`	`}`
`150`	`150`
`151`		`-func jsonUnmarshals(target interface{}) tcli.Assertion {`
	`151`	`+func stdoutUnmarshalsJSON(target interface{}) tcli.Assertion {`
`152`	`152`	`return func(t testing.T, r tcli.CommandResult) {`
`153`	`153`	`slog.Helper()`
`154`	`154`	`err := json.Unmarshal(r.Stdout, target)`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`"os"`
`7`	`7`
`8`	`8`	`"cdr.dev/coder-cli/internal/x/xtabwriter"`
	`9`	`+ "cdr.dev/coder-cli/internal/x/xvalidate"`
`9`	`10`	`"github.com/spf13/pflag"`
`10`	`11`
`11`	`12`	`"go.coder.com/cli"`
`@@ -37,6 +38,7 @@ type listCmd struct {`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`func (cmd listCmd) Run(fl pflag.FlagSet) {`
	`41`	`+ xvalidate.Validate(cmd)`
`40`	`42`	`entClient := requireAuth()`
`41`	`43`
`42`	`44`	`users, err := entClient.Users()`
`@@ -61,7 +63,6 @@ func (cmd listCmd) Run(fl pflag.FlagSet) {`
`61`	`63`	`default:`
`62`	`64`	`exitUsage(fl)`
`63`	`65`	`}`
`64`		`-`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`func (cmd listCmd) RegisterFlags(fl pflag.FlagSet) {`
`@@ -75,3 +76,10 @@ func (cmd *listCmd) Spec() cli.CommandSpec {`
`75`	`76`	`Desc: "list all users",`
`76`	`77`	`}`
`77`	`78`	`}`
	`79`	`+`
	`80`	`+func (cmd *listCmd) Validate() (e []error) {`
	`81`	`+ if !(cmd.outputFmt == "json" \|\| cmd.outputFmt == "human") {`
	`82`	+ e = append(e, fmt.Errorf(`--output must be "json" or "human"`))
	`83`	`+ }`
	`84`	`+ return e`
	`85`	`+}`