chore: fix low hanging lint issues (#9253)

aslilac · web-flow · commit 697b0283c565 · 2023-08-22T12:32:37.000-06:00
diff --git a/coderd/httpmw/workspaceagent_test.go b/coderd/httpmw/workspaceagent_test.go
@@ -52,6 +52,7 @@ func TestWorkspaceAgent(t *testing.T) {
 		req.Header.Set(codersdk.SessionTokenHeader, authToken.String())
 		rtr.ServeHTTP(rw, req)
 
+		//nolint:bodyclose // Closed in `t.Cleanup`
 		res := rw.Result()
 		t.Cleanup(func() { _ = res.Body.Close() })
 		require.Equal(t, http.StatusOK, res.StatusCode)
diff --git a/coderd/oauthpki/oidcpki.go b/coderd/oauthpki/oidcpki.go
@@ -8,7 +8,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"encoding/pem"
-	"fmt"
 	"io"
 	"net/http"
 	"net/url"
@@ -243,7 +242,7 @@ func (src *jwtTokenSource) Token() (*oauth2.Token, error) {
 	}
 
 	if unmarshalError != nil {
-		return nil, fmt.Errorf("oauth2: cannot unmarshal token: %w", err)
+		return nil, xerrors.Errorf("oauth2: cannot unmarshal token: %w", err)
 	}
 
 	newToken := &oauth2.Token{
@@ -264,7 +263,7 @@ func (src *jwtTokenSource) Token() (*oauth2.Token, error) {
 		// decode returned id token to get expiry
 		claimSet, err := jws.Decode(v)
 		if err != nil {
-			return nil, fmt.Errorf("oauth2: error decoding JWT token: %w", err)
+			return nil, xerrors.Errorf("oauth2: error decoding JWT token: %w", err)
 		}
 		newToken.Expiry = time.Unix(claimSet.Exp, 0)
 	}
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -807,7 +807,7 @@ func (api *API) runEntitlementsLoop(ctx context.Context) {
 	subscribed := false
 
 	defer func() {
-		// If this function ends, it means the context was cancelled and this
+		// If this function ends, it means the context was canceled and this
 		// coderd is shutting down. In this case, post a pubsub message to
 		// tell other coderd's to resync their entitlements. This is required to
 		// make sure things like replica counts are updated in the UI.

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`	`"encoding/base64"`
`9`	`9`	`"encoding/json"`
`10`	`10`	`"encoding/pem"`
`11`		`- "fmt"`
`12`	`11`	`"io"`
`13`	`12`	`"net/http"`
`14`	`13`	`"net/url"`
`@@ -243,7 +242,7 @@ func (src jwtTokenSource) Token() (oauth2.Token, error) {`
`243`	`242`	`}`
`244`	`243`
`245`	`244`	`if unmarshalError != nil {`
`246`		`- return nil, fmt.Errorf("oauth2: cannot unmarshal token: %w", err)`
	`245`	`+ return nil, xerrors.Errorf("oauth2: cannot unmarshal token: %w", err)`
`247`	`246`	`}`
`248`	`247`
`249`	`248`	`newToken := &oauth2.Token{`
`@@ -264,7 +263,7 @@ func (src jwtTokenSource) Token() (oauth2.Token, error) {`
`264`	`263`	`// decode returned id token to get expiry`
`265`	`264`	`claimSet, err := jws.Decode(v)`
`266`	`265`	`if err != nil {`
`267`		`- return nil, fmt.Errorf("oauth2: error decoding JWT token: %w", err)`
	`266`	`+ return nil, xerrors.Errorf("oauth2: error decoding JWT token: %w", err)`
`268`	`267`	`}`
`269`	`268`	`newToken.Expiry = time.Unix(claimSet.Exp, 0)`
`270`	`269`	`}`