Add completions for env names

cmoog · cmoog · commit 4752bfc01f78 · 2020-08-07T12:50:28.000-05:00
diff --git a/cmd/coder/auth.go b/cmd/coder/auth.go
@@ -5,30 +5,38 @@ import (
 
 	"cdr.dev/coder-cli/internal/config"
 	"cdr.dev/coder-cli/internal/entclient"
+	"golang.org/x/xerrors"
 
 	"go.coder.com/flog"
 )
 
 // requireAuth exits the process with a nonzero exit code if the user is not authenticated to make requests
 func requireAuth() *entclient.Client {
+	client, err := newClient()
+	if err != nil {
+		flog.Fatal("%v", err)
+	}
+	return client
+}
+
+func newClient() (*entclient.Client, error) {
 	sessionToken, err := config.Session.Read()
-	requireSuccess(err, "read session: %v (did you run coder login?)", err)
+	if err != nil {
+		return nil, xerrors.Errorf("read session: %v (did you run coder login?)", err)
+	}
 
 	rawURL, err := config.URL.Read()
-	requireSuccess(err, "read url: %v (did you run coder login?)", err)
+	if err != nil {
+		return nil, xerrors.Errorf("read url: %v (did you run coder login?)", err)
+	}
 
 	u, err := url.Parse(rawURL)
-	requireSuccess(err, "url misformatted: %v (try runing coder login)", err)
+	if err != nil {
+		return nil, xerrors.Errorf("url misformatted: %v (try runing coder login)", err)
+	}
 
 	return &entclient.Client{
 		BaseURL: u,
 		Token:   sessionToken,
-	}
-}
-
-// requireSuccess prints the given message and format args as a fatal error if err != nil
-func requireSuccess(err error, msg string, args ...interface{}) {
-	if err != nil {
-		flog.Fatal(msg, args...)
-	}
+	}, nil
 }
diff --git a/cmd/coder/shell.go b/cmd/coder/shell.go
@@ -19,18 +19,35 @@ import (
 	"go.coder.com/flog"
 )
 
+func getEnvsForCompletion() []string {
+	var envNames []string
+	client, err := newClient()
+	if err != nil {
+		return envNames
+	}
+	envs, err := getEnvs(client)
+	if err != nil {
+		return envNames
+	}
+	for _, e := range envs {
+		envNames = append(envNames, e.Name)
+	}
+	return envNames
+}
+
 func makeShellCmd() *cobra.Command {
 	return &cobra.Command{
 		Use:                "sh [environment_name] [<command [args...]>]",
 		Short:              "Open a shell and execute commands in a Coder environment",
 		Long:               "Execute a remote command on the environment\\nIf no command is specified, the default shell is opened.",
 		Args:               cobra.MinimumNArgs(1),
 		DisableFlagParsing: true,
+		ValidArgs:          getEnvsForCompletion(),
 		RunE:               shell,
 	}
 }
 
-func shell(cmd *cobra.Command, cmdArgs []string) error {
+func shell(_ *cobra.Command, cmdArgs []string) error {
 	var (
 		envName = cmdArgs[0]
 		ctx     = context.Background()
