fixup! Migrate more logs to clog

cmoog · cmoog · commit be8a73a960dd · 2020-10-21T13:18:14.000-05:00
diff --git a/internal/clog/error.go b/internal/clog/error.go
@@ -37,17 +37,9 @@ func (r RichCLIMessage) String() string {
 	return str.String()
 }
 
-// Wrap wraps the underling error, but does not add context IF a downstream
-// error is a RichCLIError. The original human-readable message is retained.
-func Wrap(err error, msg string) error {
-	var cliError RichCLIError
-	if xerrors.As(err, &cliError) {
-		return xerrors.Errorf("%s: %w", msg, cliError.error)
-	}
-	return xerrors.Errorf("%s: %w", msg, err)
-}
-
 // Log logs the given error to stderr, defaulting to "fatal" if the error is not a RichCLIError.
+// If the error is a RichCLIError, the plain error chain is ignored and the rich error
+// is logged on its own.
 func Log(err error) {
 	var cliErr RichCLIError
 	if !xerrors.As(err, &cliErr) {
diff --git a/internal/cmd/envs.go b/internal/cmd/envs.go
@@ -101,7 +101,7 @@ coder envs --user charlie@coder.com ls -o json \
 					if err != nil {
 						atomic.AddInt32(&fails, 1)
 						clog.Log(err)
-						return clog.Wrap(err, "find env by name")
+						return xerrors.Errorf("find env by name: %w", err)
 					}
 
 					if err = client.StopEnvironment(cmd.Context(), env.ID); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ coder envs --user charlie@coder.com ls -o json \`
`101`	`101`	`if err != nil {`
`102`	`102`	`atomic.AddInt32(&fails, 1)`
`103`	`103`	`clog.Log(err)`
`104`		`- return clog.Wrap(err, "find env by name")`
	`104`	`+ return xerrors.Errorf("find env by name: %w", err)`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`if err = client.StopEnvironment(cmd.Context(), env.ID); err != nil {`