fixup! Add --user flag to "secrets" and "envs"

cmoog · cmoog · commit a5f34c95e7aa · 2020-08-07T17:06:05.000-05:00
diff --git a/cmd/coder/envs.go b/cmd/coder/envs.go
@@ -18,7 +18,7 @@ func makeEnvsCommand() *cobra.Command {
 		Short: "Interact with Coder environments",
 		Long:  "Perform operations on the Coder environments owned by the active user.",
 	}
-	cmd.PersistentFlags().StringVar(&user, "user",entclient.Me, "Specify the user whose resources to target")
+	cmd.PersistentFlags().StringVar(&user, "user", entclient.Me, "Specify the user whose resources to target")
 
 	lsCmd := &cobra.Command{
 		Use:   "ls",
diff --git a/cmd/coder/secrets.go b/cmd/coder/secrets.go
@@ -156,30 +156,30 @@ func listSecrets(user *string) func(cmd *cobra.Command, _ []string) error {
 }
 
 func makeViewSecret(user *string) func(cmd *cobra.Command, args []string) error {
-return func (_ *cobra.Command, args []string) error {
-var (
-client = requireAuth(*user)
-name = args[0]
-)
-if name == "" {
-return xerrors.New("[name] is a required argument")
-}
+	return func(_ *cobra.Command, args []string) error {
+		var (
+			client = requireAuth(*user)
+			name   = args[0]
+		)
+		if name == "" {
+			return xerrors.New("[name] is a required argument")
+		}
 
-secret, err := client.SecretByName(name)
-if err != nil {
-return xerrors.Errorf("get secret by name: %w", err)
-}
+		secret, err := client.SecretByName(name)
+		if err != nil {
+			return xerrors.Errorf("get secret by name: %w", err)
+		}
 
-_, err = fmt.Fprintln(os.Stdout, secret.Value)
-if err != nil {
-return xerrors.Errorf("write secret value: %w", err)
-}
-return nil
-}
+		_, err = fmt.Fprintln(os.Stdout, secret.Value)
+		if err != nil {
+			return xerrors.Errorf("write secret value: %w", err)
+		}
+		return nil
+	}
 }
 
 func makeRemoveSecrets(user *string) func(c *cobra.Command, args []string) error {
-	return func (_ *cobra.Command, args []string) error {
+	return func(_ *cobra.Command, args []string) error {
 		var (
 			client = requireAuth(*user)
 		)
@@ -203,4 +203,3 @@ func makeRemoveSecrets(user *string) func(c *cobra.Command, args []string) error
 		return nil
 	}
 }
-
diff --git a/cmd/coder/shell.go b/cmd/coder/shell.go
@@ -20,9 +20,9 @@ import (
 	"go.coder.com/flog"
 )
 
-func getEnvsForCompletion() []string {
+func getEnvsForCompletion(user string) []string {
 	var envNames []string
-	client, err := newClient()
+	client, err := newClient(user)
 	if err != nil {
 		return envNames
 	}
@@ -43,7 +43,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(),
+		ValidArgs:          getEnvsForCompletion(entclient.Me),
 		RunE:               shell,
 		Example:            "coder sh backend-env",
 	}
diff --git a/cmd/coder/urls.go b/cmd/coder/urls.go
@@ -27,7 +27,7 @@ func makeURLCmd() *cobra.Command {
 		Use:       "ls [environment_name]",
 		Short:     "List all DevURLs for an environment",
 		Args:      cobra.ExactArgs(1),
-		ValidArgs: getEnvsForCompletion(),
+		ValidArgs: getEnvsForCompletion(entclient.Me),
 		RunE:      makeListDevURLs(&outputFmt),
 	}
 	lsCmd.Flags().StringVarP(&outputFmt, "output", "o", "human", "human|json")

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ func makeEnvsCommand() *cobra.Command {`
`18`	`18`	`Short: "Interact with Coder environments",`
`19`	`19`	`Long: "Perform operations on the Coder environments owned by the active user.",`
`20`	`20`	`}`
`21`		`- cmd.PersistentFlags().StringVar(&user, "user",entclient.Me, "Specify the user whose resources to target")`
	`21`	`+ cmd.PersistentFlags().StringVar(&user, "user", entclient.Me, "Specify the user whose resources to target")`
`22`	`22`
`23`	`23`	`lsCmd := &cobra.Command{`
`24`	`24`	`Use: "ls",`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@ import (`
`20`	`20`	`"go.coder.com/flog"`
`21`	`21`	`)`
`22`	`22`
`23`		`-func getEnvsForCompletion() []string {`
	`23`	`+func getEnvsForCompletion(user string) []string {`
`24`	`24`	`var envNames []string`
`25`		`- client, err := newClient()`
	`25`	`+ client, err := newClient(user)`
`26`	`26`	`if err != nil {`
`27`	`27`	`return envNames`
`28`	`28`	`}`
`@@ -43,7 +43,7 @@ func makeShellCmd() *cobra.Command {`
`43`	`43`	`Long: "Execute a remote command on the environment\\nIf no command is specified, the default shell is opened.",`
`44`	`44`	`Args: cobra.MinimumNArgs(1),`
`45`	`45`	`DisableFlagParsing: true,`
`46`		`- ValidArgs: getEnvsForCompletion(),`
	`46`	`+ ValidArgs: getEnvsForCompletion(entclient.Me),`
`47`	`47`	`RunE: shell,`
`48`	`48`	`Example: "coder sh backend-env",`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func makeURLCmd() *cobra.Command {`
`27`	`27`	`Use: "ls [environment_name]",`
`28`	`28`	`Short: "List all DevURLs for an environment",`
`29`	`29`	`Args: cobra.ExactArgs(1),`
`30`		`- ValidArgs: getEnvsForCompletion(),`
	`30`	`+ ValidArgs: getEnvsForCompletion(entclient.Me),`
`31`	`31`	`RunE: makeListDevURLs(&outputFmt),`
`32`	`32`	`}`
`33`	`33`	`lsCmd.Flags().StringVarP(&outputFmt, "output", "o", "human", "human\|json")`