Skip to content

Commit 8a2d56f

Browse files
ermyarermyar
committed
lint: enabled errcheck
Tests and methods are updated with enabling `errcheck` for `golangci-lint` check. Fixes #334
1 parent aff7842 commit 8a2d56f

33 files changed

+243
-125
lines changed

‎.golangci.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ run:
22
timeout: 3m
33

44
linters:
5-
disable:
6-
- errcheck
75
enable:
6+
- errcheck
87
- forbidigo
98
- gocritic
109
- goimports

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Versioning](http://semver.org/spec/v2.0.0.html) except to the first release.
1212

1313
* New types for MessagePack extensions compatible with go-option (#459).
1414
* Added `box.MustNew` wrapper for `box.New` without an error (#448).
15+
* Enabled `errcheck` in linter.
1516

1617
### Changed
1718

‎arrow/request_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ func TestResponseDecode(t *testing.T) {
4242
buf := bytes.NewBuffer([]byte{})
4343
enc := msgpack.NewEncoder(buf)
4444

45-
enc.EncodeMapLen(1)
46-
enc.EncodeUint8(uint8(iproto.IPROTO_DATA))
47-
enc.Encode([]interface{}{'v', '2'})
45+
require.NoError(t, enc.EncodeMapLen(1))
46+
require.NoError(t, enc.EncodeUint8(uint8(iproto.IPROTO_DATA)))
47+
require.NoError(t, enc.Encode([]interface{}{'v', '2'}))
4848

4949
request := arrow.NewInsertRequest(validSpace, arrow.Arrow{})
5050
resp, err := request.Response(header, bytes.NewBuffer(buf.Bytes()))
@@ -61,9 +61,9 @@ func TestResponseDecodeTyped(t *testing.T) {
6161
buf := bytes.NewBuffer([]byte{})
6262
enc := msgpack.NewEncoder(buf)
6363

64-
enc.EncodeMapLen(1)
65-
enc.EncodeUint8(uint8(iproto.IPROTO_DATA))
66-
enc.EncodeBytes([]byte{'v', '2'})
64+
require.NoError(t, enc.EncodeMapLen(1))
65+
require.NoError(t, enc.EncodeUint8(uint8(iproto.IPROTO_DATA)))
66+
require.NoError(t, enc.EncodeBytes([]byte{'v', '2'}))
6767

6868
request := arrow.NewInsertRequest(validSpace, arrow.Arrow{})
6969
resp, err := request.Response(header, bytes.NewBuffer(buf.Bytes()))

‎box/box_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestMocked_BoxNew(t *testing.T) {
3838
require.NotNil(t, b)
3939

4040
assert.Len(t, mock.Requests, 0)
41-
b.Schema().User().Exists(box.NewInfoRequest().Ctx(), "")
41+
_, _ = b.Schema().User().Exists(box.NewInfoRequest().Ctx(), "")
4242
require.Len(t, mock.Requests, 1)
4343
}
4444

‎boxerror_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ func TestMessagePackDecode(t *testing.T) {
204204
func TestMessagePackUnmarshalToNil(t *testing.T) {
205205
var val *BoxError = nil
206206
require.PanicsWithValue(t, "cannot unmarshal to a nil pointer",
207-
func() { val.UnmarshalMsgpack(mpDecodeSamples["InnerMapExtraKey"].b) })
207+
func() { _ = val.UnmarshalMsgpack(mpDecodeSamples["InnerMapExtraKey"].b) })
208208
}
209209

210210
func TestMessagePackEncodeNil(t *testing.T) {

‎client_tools.go‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@ type IntKey struct {
1111
}
1212

1313
func (k IntKey) EncodeMsgpack(enc *msgpack.Encoder) error {
14-
enc.EncodeArrayLen(1)
15-
enc.EncodeInt(int64(k.I))
14+
if err := enc.EncodeArrayLen(1); err != nil {
15+
return err
16+
}
17+
if err := enc.EncodeInt(int64(k.I)); err != nil {
18+
return err
19+
}
1620
return nil
1721
}
1822

@@ -24,8 +28,12 @@ type UintKey struct {
2428
}
2529

2630
func (k UintKey) EncodeMsgpack(enc *msgpack.Encoder) error {
27-
enc.EncodeArrayLen(1)
28-
enc.EncodeUint(uint64(k.I))
31+
if err := enc.EncodeArrayLen(1); err != nil {
32+
return err
33+
}
34+
if err := enc.EncodeUint(uint64(k.I)); err != nil {
35+
return err
36+
}
2937
return nil
3038
}
3139

@@ -36,8 +44,12 @@ type StringKey struct {
3644
}
3745

3846
func (k StringKey) EncodeMsgpack(enc *msgpack.Encoder) error {
39-
enc.EncodeArrayLen(1)
40-
enc.EncodeString(k.S)
47+
if err := enc.EncodeArrayLen(1); err != nil {
48+
return err
49+
}
50+
if err := enc.EncodeString(k.S); err != nil {
51+
return err
52+
}
4153
return nil
4254
}
4355

@@ -48,9 +60,15 @@ type IntIntKey struct {
4860
}
4961

5062
func (k IntIntKey) EncodeMsgpack(enc *msgpack.Encoder) error {
51-
enc.EncodeArrayLen(2)
52-
enc.EncodeInt(int64(k.I1))
53-
enc.EncodeInt(int64(k.I2))
63+
if err := enc.EncodeArrayLen(2); err != nil {
64+
return err
65+
}
66+
if err := enc.EncodeInt(int64(k.I1)); err != nil {
67+
return err
68+
}
69+
if err := enc.EncodeInt(int64(k.I2)); err != nil {
70+
return err
71+
}
5472
return nil
5573
}
5674

‎connection.go‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ func Connect(ctx context.Context, dialer Dialer, opts Opts) (conn *Connection, e
401401
if err != nil {
402402
conn.mutex.Lock()
403403
defer conn.mutex.Unlock()
404-
conn.closeConnection(err, true)
404+
_ = conn.closeConnection(err, true)
405405
return nil, err
406406
}
407407
conn.SetSchema(schema)
@@ -562,7 +562,9 @@ func pack(h *smallWBuf, enc *msgpack.Encoder, reqid uint32,
562562
byte(reqid >> 8), byte(reqid),
563563
}, streamBytes[:streamBytesLen]...)
564564

565-
h.Write(hBytes)
565+
if _, err = h.Write(hBytes); err != nil {
566+
return
567+
}
566568

567569
if err = req.Body(res, enc); err != nil {
568570
return
@@ -695,13 +697,13 @@ func (conn *Connection) runReconnects(ctx context.Context) error {
695697
func (conn *Connection) reconnectImpl(neterr error, c Conn) {
696698
if conn.opts.Reconnect > 0 {
697699
if c == conn.c {
698-
conn.closeConnection(neterr, false)
700+
_ = conn.closeConnection(neterr, false)
699701
if err := conn.runReconnects(context.Background()); err != nil {
700-
conn.closeConnection(err, true)
702+
_ = conn.closeConnection(err, true)
701703
}
702704
}
703705
} else {
704-
conn.closeConnection(neterr, true)
706+
_ = conn.closeConnection(neterr, true)
705707
}
706708
}
707709

@@ -1106,7 +1108,7 @@ func (conn *Connection) putFuture(fut *Future, req Request, streamId uint64) {
11061108
RequestId: reqid,
11071109
Error: ErrorNo,
11081110
}
1109-
fut.SetResponse(header, nil)
1111+
_ = fut.SetResponse(header, nil)
11101112
conn.markDone(fut)
11111113
}
11121114
}
@@ -1482,7 +1484,9 @@ func (conn *Connection) newWatcherImpl(key string, callback WatchCallback) (Watc
14821484
// request will not be finished by a small per-request
14831485
// timeout.
14841486
req := newWatchRequest(key).Context(context.Background())
1485-
conn.Do(req).Get()
1487+
if _, err = conn.Do(req).Get(); err != nil {
1488+
return
1489+
}
14861490
}
14871491
}
14881492

@@ -1505,7 +1509,9 @@ func (conn *Connection) newWatcherImpl(key string, callback WatchCallback) (Watc
15051509
// not be finished by a small per-request timeout to
15061510
// avoid lost of the request.
15071511
req := newUnwatchRequest(key).Context(context.Background())
1508-
conn.Do(req).Get()
1512+
if _, err = conn.Do(req).Get(); err != nil {
1513+
return
1514+
}
15091515
}
15101516
conn.watchMap.Delete(key)
15111517
close(state.unready)
@@ -1538,7 +1544,9 @@ func shutdownEventCallback(event WatchEvent) {
15381544
// step 2.
15391545
val, ok := event.Value.(bool)
15401546
if ok && val {
1541-
go event.Conn.shutdown(false)
1547+
go func() {
1548+
_ = event.Conn.shutdown(false)
1549+
}()
15421550
}
15431551
}
15441552

‎crud/object.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ type Objects = interface{}
2020
type MapObject map[string]interface{}
2121

2222
func (o MapObject) EncodeMsgpack(enc *msgpack.Encoder) {
23-
enc.Encode(o)
23+
_ = enc.Encode(o)
2424
}

‎crud/options.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,12 @@ func encodeOptions(enc *msgpack.Encoder,
398398
if mapLen > 0 {
399399
for i, name := range names {
400400
if exists[i] {
401-
enc.EncodeString(name)
402-
enc.Encode(values[i])
401+
if err := enc.EncodeString(name); err != nil {
402+
return err
403+
}
404+
if err := enc.Encode(values[i]); err != nil {
405+
return err
406+
}
403407
}
404408
}
405409
}

‎crud/tarantool_test.go‎

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,8 @@ func TestCrudGenerateData(t *testing.T) {
559559
for i := 1010; i < 1020; i++ {
560560
req := tarantool.NewDeleteRequest(spaceName).
561561
Key([]interface{}{uint(i)})
562-
conn.Do(req).Get()
562+
_, err := conn.Do(req).Get()
563+
require.NoError(t, err)
563564
}
564565

565566
data, err := conn.Do(testCase.req).Get()
@@ -571,7 +572,8 @@ func TestCrudGenerateData(t *testing.T) {
571572
for i := 1010; i < 1020; i++ {
572573
req := tarantool.NewDeleteRequest(spaceName).
573574
Key([]interface{}{uint(i)})
574-
conn.Do(req).Get()
575+
_, err := conn.Do(req).Get()
576+
require.NoError(t, err)
575577
}
576578
})
577579
}
@@ -590,7 +592,8 @@ func TestCrudProcessData(t *testing.T) {
590592
for i := 1010; i < 1020; i++ {
591593
req := tarantool.NewDeleteRequest(spaceName).
592594
Key([]interface{}{uint(i)})
593-
conn.Do(req).Get()
595+
_, err := conn.Do(req).Get()
596+
require.NoError(t, err)
594597
}
595598
})
596599
}
@@ -799,7 +802,8 @@ func TestBoolResult(t *testing.T) {
799802
for i := 1010; i < 1020; i++ {
800803
req := tarantool.NewDeleteRequest(spaceName).
801804
Key([]interface{}{uint(i)})
802-
conn.Do(req).Get()
805+
_, err := conn.Do(req).Get()
806+
require.NoError(t, err)
803807
}
804808
}
805809

@@ -824,7 +828,8 @@ func TestNumberResult(t *testing.T) {
824828
for i := 1010; i < 1020; i++ {
825829
req := tarantool.NewDeleteRequest(spaceName).
826830
Key([]interface{}{uint(i)})
827-
conn.Do(req).Get()
831+
_, err = conn.Do(req).Get()
832+
require.NoError(t, err)
828833
}
829834
}
830835

@@ -869,7 +874,8 @@ func TestBaseResult(t *testing.T) {
869874
for i := 1010; i < 1020; i++ {
870875
req := tarantool.NewDeleteRequest(spaceName).
871876
Key([]interface{}{uint(i)})
872-
conn.Do(req).Get()
877+
_, err = conn.Do(req).Get()
878+
require.NoError(t, err)
873879
}
874880
}
875881

@@ -914,7 +920,8 @@ func TestManyResult(t *testing.T) {
914920
for i := 1010; i < 1020; i++ {
915921
req := tarantool.NewDeleteRequest(spaceName).
916922
Key([]interface{}{uint(i)})
917-
conn.Do(req).Get()
923+
_, err := conn.Do(req).Get()
924+
require.NoError(t, err)
918925
}
919926
}
920927

@@ -1130,7 +1137,8 @@ func TestFetchLatestMetadataOption(t *testing.T) {
11301137
for i := 1010; i < 1020; i++ {
11311138
req := tarantool.NewDeleteRequest(spaceName).
11321139
Key([]interface{}{uint(i)})
1133-
conn.Do(req).Get()
1140+
_, err := conn.Do(req).Get()
1141+
require.NoError(t, err)
11341142
}
11351143

11361144
resp := crud.Result{}
@@ -1147,7 +1155,8 @@ func TestFetchLatestMetadataOption(t *testing.T) {
11471155
for i := 1010; i < 1020; i++ {
11481156
req := tarantool.NewDeleteRequest(spaceName).
11491157
Key([]interface{}{uint(i)})
1150-
conn.Do(req).Get()
1158+
_, err = conn.Do(req).Get()
1159+
require.NoError(t, err)
11511160
}
11521161
})
11531162
}
@@ -1283,7 +1292,8 @@ func TestNoreturnOption(t *testing.T) {
12831292
for i := 1010; i < 1020; i++ {
12841293
req := tarantool.NewDeleteRequest(spaceName).
12851294
Key([]interface{}{uint(i)})
1286-
conn.Do(req).Get()
1295+
_, err := conn.Do(req).Get()
1296+
require.NoError(t, err)
12871297
}
12881298

12891299
data, err := conn.Do(testCase.req).Get()
@@ -1306,7 +1316,8 @@ func TestNoreturnOption(t *testing.T) {
13061316
for i := 1010; i < 1020; i++ {
13071317
req := tarantool.NewDeleteRequest(spaceName).
13081318
Key([]interface{}{uint(i)})
1309-
conn.Do(req).Get()
1319+
_, err = conn.Do(req).Get()
1320+
require.NoError(t, err)
13101321
}
13111322
})
13121323
}
@@ -1321,7 +1332,8 @@ func TestNoreturnOptionTyped(t *testing.T) {
13211332
for i := 1010; i < 1020; i++ {
13221333
req := tarantool.NewDeleteRequest(spaceName).
13231334
Key([]interface{}{uint(i)})
1324-
conn.Do(req).Get()
1335+
_, err := conn.Do(req).Get()
1336+
require.NoError(t, err)
13251337
}
13261338

13271339
resp := crud.Result{}
@@ -1342,7 +1354,8 @@ func TestNoreturnOptionTyped(t *testing.T) {
13421354
for i := 1010; i < 1020; i++ {
13431355
req := tarantool.NewDeleteRequest(spaceName).
13441356
Key([]interface{}{uint(i)})
1345-
conn.Do(req).Get()
1357+
_, err = conn.Do(req).Get()
1358+
require.NoError(t, err)
13461359
}
13471360
})
13481361
}

0 commit comments

Comments
 (0)