Improve environment not found error message

cmoog · cmoog · commit efc1f6e4aca9 · 2020-10-20T23:12:22.000-05:00
diff --git a/internal/cmd/ceapi.go b/internal/cmd/ceapi.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"context"
+	"fmt"
 
 	"cdr.dev/coder-cli/coder-sdk"
 	"golang.org/x/xerrors"
@@ -72,5 +73,17 @@ func findEnv(ctx context.Context, client *coder.Client, envName, userEmail strin
 		found = append(found, env.Name)
 	}
 
-	return nil, coder.ErrNotFound
+	return nil, notFoundButDidFind{
+		needle:   envName,
+		haystack: found,
+	}
+}
+
+type notFoundButDidFind struct {
+	needle   string
+	haystack []string
+}
+
+func (n notFoundButDidFind) Error() string {
+	return fmt.Sprintf("\"%s\" not found in %q: %v", n.needle, n.haystack, coder.ErrNotFound)
 }
diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go
@@ -111,7 +111,7 @@ coder envs --user charlie@coder.com ls -o json \
 			}
 
 			if err = egroup.Wait(); err != nil {
-				return xerrors.Errorf("some stop operations failed: %w", err)
+				return xerrors.Errorf("some stop operations failed")
 			}
 			return nil
 		},
diff --git a/internal/cmd/shell.go b/internal/cmd/shell.go
@@ -153,7 +153,7 @@ func runCommand(ctx context.Context, envName, command string, args []string) err
 	if err != nil {
 		var closeErr websocket.CloseError
 		if xerrors.As(err, &closeErr) {
-			return xerrors.Errorf("network error, is %q online? (%w)", envName, err)
+			return xerrors.Errorf("network error, is %q online?", envName)
 		}
 		return xerrors.Errorf("start remote command: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ coder envs --user charlie@coder.com ls -o json \`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`if err = egroup.Wait(); err != nil {`
`114`		`- return xerrors.Errorf("some stop operations failed: %w", err)`
	`114`	`+ return xerrors.Errorf("some stop operations failed")`
`115`	`115`	`}`
`116`	`116`	`return nil`
`117`	`117`	`},`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ func runCommand(ctx context.Context, envName, command string, args []string) err`
`153`	`153`	`if err != nil {`
`154`	`154`	`var closeErr websocket.CloseError`
`155`	`155`	`if xerrors.As(err, &closeErr) {`
`156`		`- return xerrors.Errorf("network error, is %q online? (%w)", envName, err)`
	`156`	`+ return xerrors.Errorf("network error, is %q online?", envName)`
`157`	`157`	`}`
`158`	`158`	`return xerrors.Errorf("start remote command: %w", err)`
`159`	`159`	`}`