fixup! fix: improve codersdk error messages when not JSON

deansheather · deansheather · commit c2e3df3b868b · 2022-10-12T16:03:23.000Z
diff --git a/cli/cliui/provisionerjob.go b/cli/cliui/provisionerjob.go
@@ -134,7 +134,7 @@ func ProvisionerJob(ctx context.Context, writer io.Writer, opts ProvisionerJobOp
 
 	logs, closer, err := opts.Logs()
 	if err != nil {
-		return xerrors.Errorf("logs: %w", err)
+		return xerrors.Errorf("begin streaming logs: %w", err)
 	}
 	defer closer.Close()
 
diff --git a/codersdk/client.go b/codersdk/client.go
@@ -133,6 +133,9 @@ func readBodyAsError(res *http.Response) error {
 		if len(resp) > 1024 {
 			resp = append(resp[:1024], []byte("...")...)
 		}
+		if len(resp) == 0 {
+			resp = []byte("no response body")
+		}
 		return &Error{
 			statusCode: res.StatusCode,
 			Response: Response{

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func ProvisionerJob(ctx context.Context, writer io.Writer, opts ProvisionerJobOp`
`134`	`134`
`135`	`135`	`logs, closer, err := opts.Logs()`
`136`	`136`	`if err != nil {`
`137`		`- return xerrors.Errorf("logs: %w", err)`
	`137`	`+ return xerrors.Errorf("begin streaming logs: %w", err)`
`138`	`138`	`}`
`139`	`139`	`defer closer.Close()`
`140`	`140`