chore: fix golangci-lint issues in Hydra

GitOrigin-RevId: 03eb601af45a17c6e7403f37a13cba79775b44ef

Author: hperl

fosite/authorize_request_handler.go

@@ -73,7 +73,7 @@ func (f *Fosite) authorizeRequestParametersFromOpenIDConnectRequest(ctx context.
 		if err != nil {
 			return errorsx.WithStack(ErrInvalidRequestURI.WithHintf("Unable to fetch OpenID Connect request parameters from 'request_uri' because: %s.", err.Error()).WithWrap(err).WithDebug(err.Error()))
 		}
-		defer response.Body.Close()
+		defer func(Body io.ReadCloser) { _ = Body.Close() }(response.Body)
 		response.Body = io.NopCloser(io.LimitReader(response.Body, 10*1024*1024)) // limit to 10MiB
 
 		if response.StatusCode != http.StatusOK {

fosite/authorize_request_handler_oidc_request_test.go

@@ -67,7 +67,8 @@ func TestAuthorizeRequestParametersFromOpenIDConnectRequest(t *testing.T) {
 	validNoneRequestObject := mustGenerateNoneAssertion(t, jwt.MapClaims{"scope": "foo", "foo": "bar", "baz": "baz", "state": "some-state"})
 
 	var reqH http.HandlerFunc = func(rw http.ResponseWriter, r *http.Request) {
-		rw.Write([]byte(validRequestObject))
+		_, err := rw.Write([]byte(validRequestObject))
+		require.NoError(t, err)
 	}
 	reqTS := httptest.NewServer(reqH)
 	defer reqTS.Close()

fosite/client_authentication_jwks_strategy.go

@@ -112,7 +112,9 @@ func (s *DefaultJWKSFetcherStrategy) Resolve(ctx context.Context, location strin
 		if err != nil {
 			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()))
 		}
-		defer response.Body.Close()
+		defer func() {
+			_ = response.Body.Close()
+		}()
 
 		if response.StatusCode < 200 || response.StatusCode >= 400 {
 			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

@@ -167,7 +167,7 @@ func TestDefaultJWKSFetcherStrategy(t *testing.T) {
 	t.Run("case=error_encoding", func(t *testing.T) {
 		s := NewDefaultJWKSFetcherStrategy()
 		h = func(w http.ResponseWriter, r *http.Request) {
-			w.Write([]byte("[]"))
+			_, _ = w.Write([]byte("[]"))
 		}
 		ts := httptest.NewServer(h)
 		defer ts.Close()

fosite/device_write.go

@@ -32,7 +32,7 @@ func (f *Fosite) WriteDeviceResponse(ctx context.Context, rw http.ResponseWriter
 	}
 
 	r, err := json.Marshal(deviceResponse)
-	rw.Write(r)
+	_, _ = rw.Write(r)
 	if err != nil {
 		http.Error(rw, ErrServerError.WithWrap(err).WithDebug(err.Error()).Error(), http.StatusInternalServerError)
 		return

fosite/go_mod_indirect_pins.go

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 //go:build tools
-// +build tools
 
 package fosite
 

fosite/integration/authorize_code_grant_public_client_pkce_test.go

@@ -98,7 +98,7 @@ func runAuthorizeCodeGrantWithPublicClientAndPKCETest(t *testing.T, strategy oau
 					"code_verifier": {verifier},
 				})
 				require.NoError(t, err)
-				defer resp.Body.Close()
+				defer func(Body io.ReadCloser) { _ = Body.Close() }(resp.Body)
 
 				body, err := io.ReadAll(resp.Body)
 				require.NoError(t, err)

fosite/integration/authorize_code_grant_test.go

@@ -152,10 +152,10 @@ func runAuthorizeCodeGrantDupeCodeTest(t *testing.T, strategy oauth2.CoreStrateg
 	ts := mockServer(t, f, &fosite.DefaultSession{})
 	defer ts.Close()
 
-	oauthClient := newOAuth2Client(ts)
+	newOAuth2Client(ts)
 	fositeStore.Clients["my-client"].(*fosite.DefaultClient).RedirectURIs[0] = ts.URL + "/callback"
 
-	oauthClient = newOAuth2Client(ts)
+	oauthClient := newOAuth2Client(ts)
 	state := "12345678901234567890"
 
 	resp, err := http.Get(oauthClient.AuthCodeURL(state))

fosite/integration/authorize_device_grant_request_test.go

@@ -183,6 +183,7 @@ func exchangeForAccessToken(t *testing.T) {
 
 				tokenSource := cl.TokenSource(t.Context(), token)
 				refreshed, err := tokenSource.Token()
+				require.NoError(t, err)
 
 				assert.NotEmpty(t, refreshed.AccessToken)
 				assert.NotEmpty(t, refreshed.RefreshToken)

fosite/integration/authorize_jwt_bearer_test.go

@@ -5,6 +5,7 @@ package integration_test
 
 import (
 	"context"
+	"errors"
 	"net/http"
 	"testing"
 	"time"
@@ -265,7 +266,8 @@ func (s *authorizeJWTBearerSuite) TestBadResponseForSecondRequestWithSameJTI() {
 		},
 	}
 
-	client.GetToken(ctx, config, nil)
+	_, err := client.GetToken(ctx, config, nil)
+	require.NoError(s.T(), err)
 	token2, err := client.GetToken(ctx, config, nil)
 
 	s.assertBadResponse(s.T(), token2, err)
@@ -285,7 +287,8 @@ func (s *authorizeJWTBearerSuite) TestSuccessResponseForSecondRequestWithSameJTI
 		},
 	}
 
-	client.GetToken(ctx, config, nil)
+	_, err := client.GetToken(ctx, config, nil)
+	require.NoError(s.T(), err)
 
 	time.Sleep(time.Second)
 	config.Expiry = jwt.NewNumericDate(time.Now().Add(time.Hour))
@@ -396,7 +399,8 @@ func (s *authorizeJWTBearerSuite) assertBadResponse(t *testing.T, token *clients
 	assert.Nil(t, token)
 	assert.NotNil(t, err)
 
-	retrieveError, ok := err.(*clients.RequestError)
+	var retrieveError *clients.RequestError
+	ok := errors.As(err, &retrieveError)
 	assert.True(t, ok)
 	assert.Equal(t, retrieveError.Response.StatusCode, http.StatusBadRequest)
 }