fixup! Move user flag to entclient req options

cmoog · cmoog · commit c3d6592ca557 · 2020-08-12T10:22:01.000-05:00
diff --git a/cmd/coder/shell.go b/cmd/coder/shell.go
@@ -20,23 +20,22 @@ import (
 	"go.coder.com/flog"
 )
 
-func getEnvsForCompletion(user string) []string {
-	// TODO(@cmoog): Enable this if speed issue can be resolved. Otherwise, all commands will take > 1 second.
-	return nil
-
-	var envNames []string
-	client, err := newClient()
-	if err != nil {
-		return envNames
-	}
-	envs, err := getEnvs(context.TODO(), client, user)
-	if err != nil {
-		return envNames
-	}
-	for _, e := range envs {
-		envNames = append(envNames, e.Name)
+func getEnvsForCompletion(user string) func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+	return func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+		var envNames []string
+		client, err := newClient()
+		if err != nil {
+			return envNames, cobra.ShellCompDirectiveDefault
+		}
+		envs, err := getEnvs(context.TODO(), client, user)
+		if err != nil {
+			return envNames, cobra.ShellCompDirectiveDefault
+		}
+		for _, e := range envs {
+			envNames = append(envNames, e.Name)
+		}
+		return envNames, cobra.ShellCompDirectiveDefault
 	}
-	return envNames
 }
 
 func makeShellCmd() *cobra.Command {
@@ -46,7 +45,7 @@ func makeShellCmd() *cobra.Command {
 		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(entclient.Me),
+		ValidArgsFunction:  getEnvsForCompletion(entclient.Me),
 		RunE:               shell,
 		Example:            "coder sh backend-env",
 	}
diff --git a/cmd/coder/urls.go b/cmd/coder/urls.go
@@ -25,11 +25,11 @@ func makeURLCmd() *cobra.Command {
 		Short: "Interact with environment DevURLs",
 	}
 	lsCmd := &cobra.Command{
-		Use:       "ls [environment_name]",
-		Short:     "List all DevURLs for an environment",
-		Args:      cobra.ExactArgs(1),
-		ValidArgs: getEnvsForCompletion(entclient.Me),
-		RunE:      makeListDevURLs(&outputFmt),
+		Use:               "ls [environment_name]",
+		Short:             "List all DevURLs for an environment",
+		Args:              cobra.ExactArgs(1),
+		ValidArgsFunction: getEnvsForCompletion(entclient.Me),
+		RunE:              makeListDevURLs(&outputFmt),
 	}
 	lsCmd.Flags().StringVarP(&outputFmt, "output", "o", "human", "human|json")
 
diff --git a/internal/entclient/secrets.go b/internal/entclient/secrets.go
@@ -16,10 +16,13 @@ type Secret struct {
 	UpdatedAt   time.Time `json:"updated_at" tab:"-"`
 }
 
+// ReqOptions define api request configuration options
 type ReqOptions struct {
+	// User defines the users whose resources should be targeted
 	User string
 }
 
+// DefaultReqOptions define reasonable defaults for an api request
 var DefaultReqOptions = &ReqOptions{
 	User: Me,
 }

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,13 @@ type Secret struct {`
`16`	`16`	UpdatedAt time.Time `json:"updated_at" tab:"-"`
`17`	`17`	`}`
`18`	`18`
	`19`	`+// ReqOptions define api request configuration options`
`19`	`20`	`type ReqOptions struct {`
	`21`	`+ // User defines the users whose resources should be targeted`
`20`	`22`	`User string`
`21`	`23`	`}`
`22`	`24`
	`25`	`+// DefaultReqOptions define reasonable defaults for an api request`
`23`	`26`	`var DefaultReqOptions = &ReqOptions{`
`24`	`27`	`User: Me,`
`25`	`28`	`}`