fix lint

f0ssel · f0ssel · commit b1464246137b · 2022-05-17T20:43:41.000Z
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -9,7 +9,6 @@ import (
 	"net/http"
 	"time"
 
-	"cdr.dev/slog"
 	"github.com/go-chi/chi/v5"
 	"github.com/google/uuid"
 	"github.com/moby/moby/pkg/namesgenerator"
@@ -18,6 +17,8 @@ import (
 	"nhooyr.io/websocket"
 	"nhooyr.io/websocket/wsjson"
 
+	"cdr.dev/slog"
+
 	"github.com/coder/coder/coderd/autobuild/schedule"
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/coderd/httpapi"
diff --git a/codersdk/client.go b/codersdk/client.go
@@ -81,9 +81,9 @@ func (c *Client) Request(ctx context.Context, method, path string, body interfac
 	return resp, err
 }
 
-// websocket opens a websocket connection on that path provided.
-// The caller is responsible for closing the websocket.Conn.
-func (c *Client) websocket(ctx context.Context, path string) (*websocket.Conn, error) {
+// dialWebsocket opens a dialWebsocket connection on that path provided.
+// The caller is responsible for closing the dialWebsocket.Conn.
+func (c *Client) dialWebsocket(ctx context.Context, path string) (*websocket.Conn, error) {
 	serverURL, err := c.URL.Parse(path)
 	if err != nil {
 		return nil, xerrors.Errorf("parse path: %w", err)
diff --git a/codersdk/workspaces.go b/codersdk/workspaces.go
@@ -118,7 +118,7 @@ func (w *WorkspaceWatcher) Close() error {
 }
 
 func (c *Client) WatchWorkspace(ctx context.Context, id uuid.UUID) (*WorkspaceWatcher, error) {
-	conn, err := c.websocket(ctx, fmt.Sprintf("/api/v2/workspaces/%s/watch", id))
+	conn, err := c.dialWebsocket(ctx, fmt.Sprintf("/api/v2/workspaces/%s/watch", id))
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func (w *WorkspaceWatcher) Close() error {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`func (c Client) WatchWorkspace(ctx context.Context, id uuid.UUID) (WorkspaceWatcher, error) {`
`121`		`- conn, err := c.websocket(ctx, fmt.Sprintf("/api/v2/workspaces/%s/watch", id))`
	`121`	`+ conn, err := c.dialWebsocket(ctx, fmt.Sprintf("/api/v2/workspaces/%s/watch", id))`
`122`	`122`	`if err != nil {`
`123`	`123`	`return nil, err`
`124`	`124`	`}`