Skip to content

Commit b2821e1

Browse files
authored
chore: enable several rules from govet (#773)
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent d1b8ef1 commit b2821e1

File tree

5 files changed

+15
-9
lines changed

5 files changed

+15
-9
lines changed

.golangci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ linters:
99
- errcheck
1010
- errorlint
1111
- gocritic
12+
- govet
1213
- misspell
1314
- testifylint
1415

@@ -28,6 +29,11 @@ linters:
2829
- unnamedResult
2930
enable-all: true
3031

32+
govet:
33+
disable:
34+
- fieldalignment
35+
enable-all: true
36+
3137
testifylint:
3238
disable:
3339
- go-require

interceptors/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func (s *ClientInterceptorTestSuite) TestListReporting() {
249249
// Do a read, just for kicks.
250250
count := 0
251251
for {
252-
_, err := ss.Recv()
252+
_, err = ss.Recv()
253253
if errors.Is(err, io.EOF) {
254254
break
255255
}

interceptors/protovalidate/protovalidate_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ func TestUnaryServerInterceptor(t *testing.T) {
3838
info := &grpc.UnaryServerInfo{FullMethod: "FakeMethod"}
3939

4040
t.Run("valid_email", func(t *testing.T) {
41-
resp, err := interceptor(context.TODO(), testvalidate.GoodUnaryRequest, info, handler)
42-
require.NoError(t, err)
41+
resp, interceptorError := interceptor(context.TODO(), testvalidate.GoodUnaryRequest, info, handler)
42+
require.NoError(t, interceptorError)
4343
assert.Equal(t, "good", resp)
4444
})
4545

interceptors/realip/realip.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ func getRemoteIP(ctx context.Context, trustedPeers, trustedProxies []netip.Prefi
111111
if len(trustedPeers) == 0 || !ipInNets(ip, trustedPeers) {
112112
return ip
113113
}
114-
if ip := ipFromHeaders(ctx, headers, trustedProxies, proxyCnt); ip != noIP {
115-
return ip
114+
if resolvedIP := ipFromHeaders(ctx, headers, trustedProxies, proxyCnt); resolvedIP != noIP {
115+
return resolvedIP
116116
}
117117
// No ip from the headers, return the peer ip.
118118
return ip

testing/testpb/pingservice_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ func TestPingServiceOnWire(t *testing.T) {
4242

4343
testClient := NewTestServiceClient(clientConn)
4444
select {
45-
case err := <-stopped:
46-
t.Fatal("gRPC server stopped prematurely", err)
45+
case clientConnErr := <-stopped:
46+
t.Fatal("gRPC server stopped prematurely", clientConnErr)
4747
default:
4848
}
4949

@@ -66,8 +66,8 @@ func TestPingServiceOnWire(t *testing.T) {
6666
l, err := testClient.PingList(context.Background(), &PingListRequest{Value: "24"})
6767
require.NoError(t, err)
6868
for i := 0; i < ListResponseCount; i++ {
69-
r, err := l.Recv()
70-
require.NoError(t, err)
69+
r, receiveError := l.Recv()
70+
require.NoError(t, receiveError)
7171
require.Equal(t, "24", r.Value)
7272
require.Equal(t, int32(i), r.Counter)
7373
}

0 commit comments

Comments
 (0)