Skip to content

Commit 46c2b75

Browse files
committed
chore: update linter and dependencies
1 parent d4b8f50 commit 46c2b75

File tree

5 files changed

+58
-57
lines changed

5 files changed

+58
-57
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build and test
33
on: [push, pull_request]
44

55
env:
6-
GOLANGCI_LINT_VERSION: v1.59.1
6+
GOLANGCI_LINT_VERSION: v1.63.4
77

88
jobs:
99
build:

.golangci.yml

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,3 @@
1-
run:
2-
timeout: 5m
3-
4-
linters-settings:
5-
govet:
6-
enable-all: true
7-
disable:
8-
- fieldalignment
9-
gocyclo:
10-
min-complexity: 15
11-
goconst:
12-
min-len: 5
13-
min-occurrences: 3
14-
misspell:
15-
locale: US
16-
funlen:
17-
lines: -1
18-
statements: 40
19-
godox:
20-
keywords:
21-
- FIXME
22-
gofumpt:
23-
extra-rules: false
24-
depguard:
25-
rules:
26-
main:
27-
deny:
28-
- pkg: "github.com/instana/testify"
29-
desc: not allowed
30-
- pkg: "github.com/sirupsen/logrus"
31-
desc: not allowed
32-
- pkg: "github.com/pkg/errors"
33-
desc: Should be replaced by standard lib errors package
34-
gocritic:
35-
enabled-tags:
36-
- diagnostic
37-
- style
38-
- performance
39-
disabled-checks:
40-
- unnamedResult
41-
- sloppyReassign
42-
- rangeValCopy
43-
- octalLiteral
44-
- paramTypeCombine # already handle by gofumpt.extra-rules
45-
settings:
46-
hugeParam:
47-
sizeThreshold: 100
48-
491
linters:
502
disable-all: true
513
enable:
@@ -59,8 +11,7 @@ linters:
5911
- durationcheck
6012
- errcheck
6113
- errname
62-
# - errorlint # TODO can be used in future. Required to check the current reported issues.
63-
- exportloopref
14+
# - errorlint # TODO can be used in future. Required to check the current reported issues.
6415
- forbidigo
6516
- forcetypeassert
6617
- funlen
@@ -85,7 +36,7 @@ linters:
8536
- govet
8637
- importas
8738
- ineffassign
88-
# - makezero # TODO can be used in future. Required to check the current reported issues.
39+
# - makezero # TODO can be used in future. Required to check the current reported issues.
8940
- misspell
9041
- nakedret
9142
- nestif
@@ -100,14 +51,61 @@ linters:
10051
- tagliatelle
10152
- tenv
10253
- thelper
103-
- typecheck
10454
- unconvert
10555
- unparam
10656
- unused
10757
- usestdlibvars
10858
- wastedassign
10959
- whitespace
11060

61+
linters-settings:
62+
govet:
63+
enable-all: true
64+
disable:
65+
- fieldalignment
66+
gocyclo:
67+
min-complexity: 15
68+
goconst:
69+
min-len: 5
70+
min-occurrences: 3
71+
misspell:
72+
locale: US
73+
funlen:
74+
lines: -1
75+
statements: 40
76+
godox:
77+
keywords:
78+
- FIXME
79+
gofumpt:
80+
extra-rules: false
81+
depguard:
82+
rules:
83+
main:
84+
deny:
85+
- pkg: "github.com/instana/testify"
86+
desc: not allowed
87+
- pkg: "github.com/sirupsen/logrus"
88+
desc: not allowed
89+
- pkg: "github.com/pkg/errors"
90+
desc: Should be replaced by standard lib errors package
91+
gocritic:
92+
enabled-tags:
93+
- diagnostic
94+
- style
95+
- performance
96+
disabled-checks:
97+
- unnamedResult
98+
- sloppyReassign
99+
- rangeValCopy
100+
- octalLiteral
101+
- paramTypeCombine # already handle by gofumpt.extra-rules
102+
settings:
103+
hugeParam:
104+
sizeThreshold: 100
105+
gosec:
106+
excludes:
107+
- G115
108+
111109
issues:
112110
exclude-use-default: false
113111
max-issues-per-linter: 0
@@ -118,3 +116,6 @@ issues:
118116
linters:
119117
- goconst
120118
- funlen
119+
120+
run:
121+
timeout: 5m

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ test-start-stack:
2020
## Clean local data
2121
.PHONY: clean
2222
clean:
23-
docker-compose -f script/docker-compose.yml down
23+
docker-compose -f script/docker-compose.yml down --remove-orphans
2424
$(RM) goverage.report $(shell find . -type f -name *.out)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.19
55
require (
66
github.com/aws/aws-sdk-go v1.44.91
77
github.com/kvtools/valkeyrie v1.0.0
8-
github.com/stretchr/testify v1.9.0
8+
github.com/stretchr/testify v1.10.0
99
)
1010

1111
require (

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
1717
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1818
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1919
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
20-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
21-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
20+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
21+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
2222
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
2323
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2424
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

0 commit comments

Comments
 (0)