From 4c82e65bec30e9e514210748208d17ae7b3b9ed7 Mon Sep 17 00:00:00 2001 From: aman Date: Sat, 18 Jul 2026 11:48:15 +0530 Subject: [PATCH] chore(lint): enable errcheck and fix test-file findings Turn on errcheck in golangci and resolve the seventeen findings in test files: blank-assign fixture setup calls without a test handle in scope, and assert the ones that feed expected values or reset shared state. Co-Authored-By: Claude Fable 5 --- .golangci.yml | 1 + .../api/v1beta1connect/authenticate_test.go | 27 ++++++++++--------- .../postgres/prospect_repository_test.go | 2 +- pkg/server/webhook_bridge_test.go | 4 +-- test/e2e/regression/authentication_test.go | 2 +- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 33257124d..c086fa30a 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -6,6 +6,7 @@ output: linters: default: none enable: + - errcheck - forbidigo - gosec - govet diff --git a/internal/api/v1beta1connect/authenticate_test.go b/internal/api/v1beta1connect/authenticate_test.go index c562ae3e3..3e4bc251f 100644 --- a/internal/api/v1beta1connect/authenticate_test.go +++ b/internal/api/v1beta1connect/authenticate_test.go @@ -16,6 +16,7 @@ import ( frontierv1beta1 "github.com/raystack/frontier/proto/v1beta1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/require" ) func TestConnectHandler_AuthToken_ServiceUser(t *testing.T) { @@ -176,9 +177,9 @@ func TestConnectHandler_GetJWKs(t *testing.T) { // Create a test key set testKeySet := jwk.NewSet() testKey, _ := jwk.FromRaw([]byte("test-key-data")) - testKey.Set(jwk.KeyIDKey, "test-key-id") - testKey.Set(jwk.KeyTypeKey, "oct") - testKeySet.AddKey(testKey) + _ = testKey.Set(jwk.KeyIDKey, "test-key-id") + _ = testKey.Set(jwk.KeyTypeKey, "oct") + _ = testKeySet.AddKey(testKey) authn.EXPECT().JWKs(mock.Anything).Return(testKeySet) }, @@ -214,15 +215,15 @@ func TestConnectHandler_GetJWKs(t *testing.T) { // First key testKey1, _ := jwk.FromRaw([]byte("test-key-data-1")) - testKey1.Set(jwk.KeyIDKey, "test-key-id-1") - testKey1.Set(jwk.KeyTypeKey, "oct") - testKeySet.AddKey(testKey1) + _ = testKey1.Set(jwk.KeyIDKey, "test-key-id-1") + _ = testKey1.Set(jwk.KeyTypeKey, "oct") + _ = testKeySet.AddKey(testKey1) // Second key testKey2, _ := jwk.FromRaw([]byte("test-key-data-2")) - testKey2.Set(jwk.KeyIDKey, "test-key-id-2") - testKey2.Set(jwk.KeyTypeKey, "oct") - testKeySet.AddKey(testKey2) + _ = testKey2.Set(jwk.KeyIDKey, "test-key-id-2") + _ = testKey2.Set(jwk.KeyTypeKey, "oct") + _ = testKeySet.AddKey(testKey2) authn.EXPECT().JWKs(mock.Anything).Return(testKeySet) }, @@ -297,9 +298,9 @@ func TestToJSONWebKey(t *testing.T) { keySet: func() jwk.Set { keySet := jwk.NewSet() testKey, _ := jwk.FromRaw([]byte("test-key-data")) - testKey.Set(jwk.KeyIDKey, "test-key-id") - testKey.Set(jwk.KeyTypeKey, "oct") - keySet.AddKey(testKey) + _ = testKey.Set(jwk.KeyIDKey, "test-key-id") + _ = testKey.Set(jwk.KeyTypeKey, "oct") + _ = keySet.AddKey(testKey) return keySet }(), expectError: false, @@ -326,7 +327,7 @@ func TestToJSONWebKey(t *testing.T) { // Verify the structure is correct keySetJson, _ := json.Marshal(tt.keySet) var expectedJWKS JsonWebKeySet - json.Unmarshal(keySetJson, &expectedJWKS) + require.NoError(t, json.Unmarshal(keySetJson, &expectedJWKS)) assert.Equal(t, len(expectedJWKS.Keys), len(result.Keys)) } }) diff --git a/internal/store/postgres/prospect_repository_test.go b/internal/store/postgres/prospect_repository_test.go index e390838e7..ef46a8420 100644 --- a/internal/store/postgres/prospect_repository_test.go +++ b/internal/store/postgres/prospect_repository_test.go @@ -519,7 +519,7 @@ func (s *ProspectRepositoryTestSuite) TestDelete() { for _, tc := range testCases { s.Run(tc.Description, func() { // Reset the test data for each test case - s.cleanup() + s.Require().NoError(s.cleanup()) s.SetupTest() if tc.SetupFn != nil { diff --git a/pkg/server/webhook_bridge_test.go b/pkg/server/webhook_bridge_test.go index 717b46931..51606a935 100644 --- a/pkg/server/webhook_bridge_test.go +++ b/pkg/server/webhook_bridge_test.go @@ -18,7 +18,7 @@ type mockHandler struct { func (m *mockHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { w.WriteHeader(m.statusCode) - w.Write(m.response) + _, _ = w.Write(m.response) } func TestWebhookBridgeHandler_HTTPMethods(t *testing.T) { @@ -158,7 +158,7 @@ func TestWebhookBridgeHandler_SuccessfulRequest(t *testing.T) { // Return success w.Header().Set("Content-Type", "application/json") w.WriteHeader(http.StatusOK) - w.Write([]byte(`{}`)) + _, _ = w.Write([]byte(`{}`)) }) req := httptest.NewRequest("POST", "/billing/webhooks/callback/stripe", bytes.NewReader([]byte(`{"event":"test"}`))) diff --git a/test/e2e/regression/authentication_test.go b/test/e2e/regression/authentication_test.go index 4b0661810..227700e98 100644 --- a/test/e2e/regression/authentication_test.go +++ b/test/e2e/regression/authentication_test.go @@ -171,7 +171,7 @@ func (s *AuthenticationRegressionTestSuite) TestUserSession() { Handler: callbackMux, } // clean up callback server - defer srv.Shutdown(ctx) + defer srv.Shutdown(ctx) // nolint go func() { if err := srv.ListenAndServe(); err != http.ErrServerClosed { s.Assert().NoError(err)