lint

f0ssel · f0ssel · commit b69dd021bc8f · 2022-05-17T20:38:05.000Z
diff --git a/codersdk/client.go b/codersdk/client.go
@@ -86,10 +86,13 @@ func (c *Client) Request(ctx context.Context, method, path string, body interfac
 func (c *Client) websocket(ctx context.Context, path string) (*websocket.Conn, error) {
 	serverURL, err := c.URL.Parse(path)
 	if err != nil {
-		return nil, xerrors.Errorf("parse url: %w", err)
+		return nil, xerrors.Errorf("parse path: %w", err)
 	}
 
 	apiURL, err := url.Parse(serverURL.String())
+	if err != nil {
+		return nil, xerrors.Errorf("parse server url: %w", err)
+	}
 	apiURL.Scheme = "ws"
 	if serverURL.Scheme == "https" {
 		apiURL.Scheme = "wss"
@@ -100,7 +103,7 @@ func (c *Client) websocket(ctx context.Context, path string) (*websocket.Conn, e
 	apiURL.RawQuery = q.Encode()
 
 	//nolint:bodyclose
-	conn, _, err := websocket.Dial(context.Background(), apiURL.String(), &websocket.DialOptions{
+	conn, _, err := websocket.Dial(ctx, apiURL.String(), &websocket.DialOptions{
 		HTTPClient: c.HTTPClient,
 	})
 	if err != nil {
diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go
@@ -102,7 +102,7 @@ func (w *WorkspaceWatcher) Read(ctx context.Context) (Workspace, error) {
 	var ws Workspace
 	err := wsjson.Read(ctx, w.conn, &ws)
 	if err != nil {
-		return ws, xerrors.Errorf("read workspace: %w")
+		return ws, xerrors.Errorf("read workspace: %w", err)
 	}
 
 	return ws, nil

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ func (w *WorkspaceWatcher) Read(ctx context.Context) (Workspace, error) {`
`102`	`102`	`var ws Workspace`
`103`	`103`	`err := wsjson.Read(ctx, w.conn, &ws)`
`104`	`104`	`if err != nil {`
`105`		`- return ws, xerrors.Errorf("read workspace: %w")`
	`105`	`+ return ws, xerrors.Errorf("read workspace: %w", err)`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`return ws, nil`