Skip to content

Commit eaa9393

Browse files
hperlory-bot
authored andcommitted
chore: fix golangci-lint issues in Hydra
GitOrigin-RevId: 03eb601af45a17c6e7403f37a13cba79775b44ef
1 parent 5c51033 commit eaa9393

27 files changed

+51
-51
lines changed

fosite/authorize_request_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func (f *Fosite) authorizeRequestParametersFromOpenIDConnectRequest(ctx context.
7373
if err != nil {
7474
return errorsx.WithStack(ErrInvalidRequestURI.WithHintf("Unable to fetch OpenID Connect request parameters from 'request_uri' because: %s.", err.Error()).WithWrap(err).WithDebug(err.Error()))
7575
}
76-
defer response.Body.Close()
76+
defer func(Body io.ReadCloser) { _ = Body.Close() }(response.Body)
7777
response.Body = io.NopCloser(io.LimitReader(response.Body, 10*1024*1024)) // limit to 10MiB
7878

7979
if response.StatusCode != http.StatusOK {

fosite/authorize_request_handler_oidc_request_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ func TestAuthorizeRequestParametersFromOpenIDConnectRequest(t *testing.T) {
6767
validNoneRequestObject := mustGenerateNoneAssertion(t, jwt.MapClaims{"scope": "foo", "foo": "bar", "baz": "baz", "state": "some-state"})
6868

6969
var reqH http.HandlerFunc = func(rw http.ResponseWriter, r *http.Request) {
70-
rw.Write([]byte(validRequestObject))
70+
_, err := rw.Write([]byte(validRequestObject))
71+
require.NoError(t, err)
7172
}
7273
reqTS := httptest.NewServer(reqH)
7374
defer reqTS.Close()

fosite/client_authentication_jwks_strategy.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,9 @@ func (s *DefaultJWKSFetcherStrategy) Resolve(ctx context.Context, location strin
112112
if err != nil {
113113
return nil, errorsx.WithStack(ErrServerError.WithHintf("Unable to fetch JSON Web Keys from location '%s'. Check for typos or other network issues.", location).WithWrap(err).WithDebug(err.Error()))
114114
}
115-
defer response.Body.Close()
115+
defer func() {
116+
_ = response.Body.Close()
117+
}()
116118

117119
if response.StatusCode < 200 || response.StatusCode >= 400 {
118120
return nil, errorsx.WithStack(ErrServerError.WithHintf("Expected successful status code in range of 200 - 399 from location '%s' but received code %d.", location, response.StatusCode))

fosite/client_authentication_jwks_strategy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func TestDefaultJWKSFetcherStrategy(t *testing.T) {
167167
t.Run("case=error_encoding", func(t *testing.T) {
168168
s := NewDefaultJWKSFetcherStrategy()
169169
h = func(w http.ResponseWriter, r *http.Request) {
170-
w.Write([]byte("[]"))
170+
_, _ = w.Write([]byte("[]"))
171171
}
172172
ts := httptest.NewServer(h)
173173
defer ts.Close()

fosite/device_write.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (f *Fosite) WriteDeviceResponse(ctx context.Context, rw http.ResponseWriter
3232
}
3333

3434
r, err := json.Marshal(deviceResponse)
35-
rw.Write(r)
35+
_, _ = rw.Write(r)
3636
if err != nil {
3737
http.Error(rw, ErrServerError.WithWrap(err).WithDebug(err.Error()).Error(), http.StatusInternalServerError)
3838
return

fosite/go_mod_indirect_pins.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
//go:build tools
5-
// +build tools
65

76
package fosite
87

fosite/integration/authorize_code_grant_public_client_pkce_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func runAuthorizeCodeGrantWithPublicClientAndPKCETest(t *testing.T, strategy oau
9898
"code_verifier": {verifier},
9999
})
100100
require.NoError(t, err)
101-
defer resp.Body.Close()
101+
defer func(Body io.ReadCloser) { _ = Body.Close() }(resp.Body)
102102

103103
body, err := io.ReadAll(resp.Body)
104104
require.NoError(t, err)

fosite/integration/authorize_code_grant_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ func runAuthorizeCodeGrantDupeCodeTest(t *testing.T, strategy oauth2.CoreStrateg
152152
ts := mockServer(t, f, &fosite.DefaultSession{})
153153
defer ts.Close()
154154

155-
oauthClient := newOAuth2Client(ts)
155+
newOAuth2Client(ts)
156156
fositeStore.Clients["my-client"].(*fosite.DefaultClient).RedirectURIs[0] = ts.URL + "/callback"
157157

158-
oauthClient = newOAuth2Client(ts)
158+
oauthClient := newOAuth2Client(ts)
159159
state := "12345678901234567890"
160160

161161
resp, err := http.Get(oauthClient.AuthCodeURL(state))

fosite/integration/authorize_device_grant_request_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ func exchangeForAccessToken(t *testing.T) {
183183

184184
tokenSource := cl.TokenSource(t.Context(), token)
185185
refreshed, err := tokenSource.Token()
186+
require.NoError(t, err)
186187

187188
assert.NotEmpty(t, refreshed.AccessToken)
188189
assert.NotEmpty(t, refreshed.RefreshToken)

fosite/integration/authorize_jwt_bearer_test.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package integration_test
55

66
import (
77
"context"
8+
"errors"
89
"net/http"
910
"testing"
1011
"time"
@@ -265,7 +266,8 @@ func (s *authorizeJWTBearerSuite) TestBadResponseForSecondRequestWithSameJTI() {
265266
},
266267
}
267268

268-
client.GetToken(ctx, config, nil)
269+
_, err := client.GetToken(ctx, config, nil)
270+
require.NoError(s.T(), err)
269271
token2, err := client.GetToken(ctx, config, nil)
270272

271273
s.assertBadResponse(s.T(), token2, err)
@@ -285,7 +287,8 @@ func (s *authorizeJWTBearerSuite) TestSuccessResponseForSecondRequestWithSameJTI
285287
},
286288
}
287289

288-
client.GetToken(ctx, config, nil)
290+
_, err := client.GetToken(ctx, config, nil)
291+
require.NoError(s.T(), err)
289292

290293
time.Sleep(time.Second)
291294
config.Expiry = jwt.NewNumericDate(time.Now().Add(time.Hour))
@@ -396,7 +399,8 @@ func (s *authorizeJWTBearerSuite) assertBadResponse(t *testing.T, token *clients
396399
assert.Nil(t, token)
397400
assert.NotNil(t, err)
398401

399-
retrieveError, ok := err.(*clients.RequestError)
402+
var retrieveError *clients.RequestError
403+
ok := errors.As(err, &retrieveError)
400404
assert.True(t, ok)
401405
assert.Equal(t, retrieveError.Response.StatusCode, http.StatusBadRequest)
402406
}

0 commit comments

Comments
 (0)