Add json output to envs ls

cmoog · cmoog · commit bfa54f11e598 · 2020-08-02T18:53:10.000-05:00
diff --git a/cmd/coder/envs.go b/cmd/coder/envs.go
@@ -1,13 +1,18 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
+	"os"
 
 	"cdr.dev/coder-cli/internal/x/xtabwriter"
 	"github.com/urfave/cli"
+
+	"go.coder.com/flog"
 )
 
 func makeEnvsCommand() cli.Command {
+	var outputFmt string
 	return cli.Command{
 		Name:        "envs",
 		Usage:       "Interact with Coder environments",
@@ -23,19 +28,34 @@ func makeEnvsCommand() cli.Command {
 					entClient := requireAuth()
 					envs := getEnvs(entClient)
 
-					w := xtabwriter.NewWriter()
-					if len(envs) > 0 {
-						_, err := fmt.Fprintln(w, xtabwriter.StructFieldNames(envs[0]))
-						requireSuccess(err, "failed to write header: %v", err)
-					}
-					for _, env := range envs {
-						_, err := fmt.Fprintln(w, xtabwriter.StructValues(env))
-						requireSuccess(err, "failed to write row: %v", err)
+					switch outputFmt {
+					case "human":
+						w := xtabwriter.NewWriter()
+						if len(envs) > 0 {
+							_, err := fmt.Fprintln(w, xtabwriter.StructFieldNames(envs[0]))
+							requireSuccess(err, "failed to write header: %v", err)
+						}
+						for _, env := range envs {
+							_, err := fmt.Fprintln(w, xtabwriter.StructValues(env))
+							requireSuccess(err, "failed to write row: %v", err)
+						}
+						err := w.Flush()
+						requireSuccess(err, "failed to flush tab writer: %v", err)
+					case "json":
+						err := json.NewEncoder(os.Stdout).Encode(envs)
+						requireSuccess(err, "failed to write json: %v", err)
+					default:
+						flog.Fatal("unknown --output value %q", outputFmt)
 					}
-					err := w.Flush()
-					requireSuccess(err, "failed to flush tab writer: %v", err)
 				},
-				Flags: nil,
+				Flags: []cli.Flag{
+					cli.StringFlag{
+						Name:        "output",
+						Usage:       "json | human",
+						Value:       "human",
+						Destination: &outputFmt,
+					},
+				},
 			},
 		},
 	}
diff --git a/cmd/coder/secrets.go b/cmd/coder/secrets.go
@@ -31,7 +31,7 @@ func makeSecretsCmd() cli.Command {
 				Name:      "rm",
 				Usage:     "Remove one or more secrets by name",
 				ArgsUsage: "[...secret_name]",
-				Action:    removeSecret,
+				Action:    removeSecrets,
 			},
 			{
 				Name:      "view",
@@ -172,7 +172,7 @@ func viewSecret(c *cli.Context) {
 	requireSuccess(err, "failed to write: %v", err)
 }
 
-func removeSecret(c *cli.Context) {
+func removeSecrets(c *cli.Context) {
 	var (
 		client = requireAuth()
 		names  = append([]string{c.Args().First()}, c.Args().Tail()...)
diff --git a/cmd/coder/users.go b/cmd/coder/users.go
@@ -25,7 +25,7 @@ func makeUsersCmd() cli.Command {
 				Flags: []cli.Flag{
 					cli.StringFlag{
 						Name:        "output",
-						Usage:       "(json | human)",
+						Usage:       "json | human",
 						Value:       "human",
 						Destination: &output,
 					},
