Migrate envs

cmoog · cmoog · commit 4391216f13c9 · 2020-08-03T12:29:16.000-05:00
diff --git a/cmd/coder/envs.go b/cmd/coder/envs.go
@@ -3,27 +3,31 @@ package main
 import (
 	"fmt"
 
-	"github.com/spf13/pflag"
-
-	"go.coder.com/cli"
+	"github.com/urfave/cli"
 )
 
-type envsCmd struct {
-}
-
-func (cmd envsCmd) Spec() cli.CommandSpec {
-	return cli.CommandSpec{
-		Name: "envs",
-		Desc: "get a list of environments owned by the authenticated user",
-	}
-}
-
-func (cmd envsCmd) Run(fl *pflag.FlagSet) {
-	entClient := requireAuth()
-
-	envs := getEnvs(entClient)
-
-	for _, env := range envs {
-		fmt.Println(env.Name)
+func makeEnvsCommand() cli.Command {
+	return cli.Command{
+		Name:        "envs",
+		UsageText:   "",
+		Description: "interact with Coder environments",
+		Subcommands: []cli.Command{
+			{
+				Name:        "ls",
+				Usage:       "list all environments owned by the active user",
+				UsageText:   "",
+				Description: "",
+				ArgsUsage:   "[...flags]>",
+				Action: func(c *cli.Context) {
+					entClient := requireAuth()
+					envs := getEnvs(entClient)
+
+					for _, env := range envs {
+						fmt.Println(env.Name)
+					}
+				},
+				Flags: nil,
+			},
+		},
 	}
 }
diff --git a/cmd/coder/main.go b/cmd/coder/main.go
@@ -37,7 +37,6 @@ func (r *rootCmd) Spec() cdrcli.CommandSpec {
 
 func (r *rootCmd) Subcommands() []cdrcli.Command {
 	return []cdrcli.Command{
-		&envsCmd{},
 		&syncCmd{},
 		&urlsCmd{},
 	}
@@ -67,6 +66,7 @@ func main() {
 		makeUsersCmd(),
 		makeConfigSSHCmd(),
 		makeSecretsCmd(),
+		makeEnvsCommand(),
 	}
 	err = app.Run(os.Args)
 	if err != nil {
diff --git a/cmd/coder/shell.go b/cmd/coder/shell.go
@@ -26,24 +26,9 @@ func makeShellCmd() cli.Command {
 		Description:     "execute a remote command on the environment\\nIf no command is specified, the default shell is opened.",
 		SkipFlagParsing: true,
 		SkipArgReorder:  true,
-
-		ShortName:              "",
-		Aliases:                nil,
-		UsageText:              "",
-		ArgsUsage:              "",
-		Category:               "",
-		BashComplete:           nil,
-		Before:                 nil,
-		After:                  nil,
-		Action:                 shell,
-		OnUsageError:           nil,
-		Subcommands:            nil,
-		Flags:                  nil,
-		HideHelp:               false,
-		Hidden:                 false,
-		UseShortOptionHandling: false,
-		HelpName:               "",
-		CustomHelpTemplate:     "",
+		UsageText:       "",
+		ArgsUsage:       "",
+		Action:          shell,
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ func (r *rootCmd) Spec() cdrcli.CommandSpec {`
`37`	`37`
`38`	`38`	`func (r *rootCmd) Subcommands() []cdrcli.Command {`
`39`	`39`	`return []cdrcli.Command{`
`40`		`- &envsCmd{},`
`41`	`40`	`&syncCmd{},`
`42`	`41`	`&urlsCmd{},`
`43`	`42`	`}`
`@@ -67,6 +66,7 @@ func main() {`
`67`	`66`	`makeUsersCmd(),`
`68`	`67`	`makeConfigSSHCmd(),`
`69`	`68`	`makeSecretsCmd(),`
	`69`	`+ makeEnvsCommand(),`
`70`	`70`	`}`
`71`	`71`	`err = app.Run(os.Args)`
`72`	`72`	`if err != nil {`