More improvements

cmoog · cmoog · commit 748409ebafdd · 2020-07-31T17:38:22.000-05:00
diff --git a/cmd/coder/main.go b/cmd/coder/main.go
@@ -35,6 +35,12 @@ func main() {
 	app.Name = "coder"
 	app.Usage = "coder provides a CLI for working with an existing Coder Enterprise installation"
 	app.Version = fmt.Sprintf("%s %s %s/%s", version, runtime.Version(), runtime.GOOS, runtime.GOARCH)
+	app.Author = "Coder Technologies Inc."
+	app.CommandNotFound = func(c *cli.Context, s string) {
+		flog.Fatal("command %q not found", s)
+	}
+	app.Email = "support@coder.com"
+
 	app.Commands = []cli.Command{
 		makeLoginCmd(),
 		makeLogoutCmd(),
diff --git a/cmd/coder/secrets.go b/cmd/coder/secrets.go
@@ -28,8 +28,8 @@ func makeSecretsCmd() cli.Command {
 			makeCreateSecret(),
 			{
 				Name:      "rm",
-				Usage:     "Remove a secret by name",
-				ArgsUsage: "[secret_name]",
+				Usage:     "Remove one or more secrets by name",
+				ArgsUsage: "[...secret_name]",
 				Action:    removeSecret,
 			},
 			{
@@ -175,14 +175,23 @@ func viewSecret(c *cli.Context) {
 func removeSecret(c *cli.Context) {
 	var (
 		client = requireAuth()
-		name   = c.Args().First()
+		names  = append([]string{c.Args().First()}, c.Args().Tail()...)
 	)
-	if name == "" {
-		flog.Fatal("[name] is a required argument")
+	if len(names) < 1 || names[0] == "" {
+		flog.Fatal("[...secret_name] is a required argument")
 	}
 
-	err := client.DeleteSecretByName(name)
-	requireSuccess(err, "failed to delete secret: %v", err)
-
-	flog.Info("Successfully deleted secret %q", name)
+	errorSeen := false
+	for _, n := range names {
+		err := client.DeleteSecretByName(n)
+		if err != nil {
+			flog.Error("failed to delete secret: %v", err)
+			errorSeen = true
+		} else {
+			flog.Info("Successfully deleted secret %q", n)
+		}
+	}
+	if errorSeen {
+		os.Exit(1)
+	}
 }
diff --git a/cmd/coder/users.go b/cmd/coder/users.go
@@ -14,20 +14,17 @@ import (
 func makeUsersCmd() cli.Command {
 	var output string
 	return cli.Command{
-		Name:      "users",
-		Usage:     "Interact with Coder user accounts",
-		ArgsUsage: "[subcommand] <flags>",
+		Name:  "users",
+		Usage: "Interact with Coder user accounts",
 		Subcommands: []cli.Command{
 			{
-				Name:        "ls",
-				Usage:       "list all user accounts",
-				Description: "",
-				Action:      listUsers(&output),
+				Name:   "ls",
+				Usage:  "list all user accounts",
+				Action: listUsers(&output),
 				Flags: []cli.Flag{
 					cli.StringFlag{
 						Name:        "output",
 						Usage:       "(json | human)",
-						Required:    false,
 						Value:       "human",
 						Destination: &output,
 					},
