Skip to content

Commit 224409d

Browse files
committed
lint: update linter settings to eliminate false positives
1 parent c5db815 commit 224409d

File tree

5 files changed

+100
-47
lines changed

5 files changed

+100
-47
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ jobs:
66
runs-on: ubuntu-latest
77

88
steps:
9-
- name: Set up Go 1.17
9+
- name: Set up Go 1.23
1010
uses: actions/setup-go@v2
1111
with:
12-
go-version: 1.17
12+
go-version: "1.23"
1313
id: go
1414

1515
- name: Check out code into the Go module directory
@@ -25,13 +25,13 @@ jobs:
2525
GO111MODULE: "on"
2626
TZ: "America/Chicago"
2727

28-
- name: install golangci-lint and goveralls
29-
run: |
30-
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $GITHUB_WORKSPACE v1.46.2
31-
GO111MODULE=off go get -u -v github.com/mattn/goveralls
28+
- name: golangci-lint
29+
uses: golangci/golangci-lint-action@v3
30+
with:
31+
version: latest
3232

33-
- name: run linters
34-
run: $GITHUB_WORKSPACE/golangci-lint run --out-format=github-actions
33+
- name: install goveralls
34+
run: GO111MODULE=off go get -u -v github.com/mattn/goveralls
3535

3636
- name: submit coverage
3737
run: $(go env GOPATH)/bin/goveralls -service="github" -coverprofile=$GITHUB_WORKSPACE/profile.cov

.golangci.yml

Lines changed: 55 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
linters-settings:
22
govet:
3-
check-shadowing: true
3+
shadow: true
44
golint:
5-
min-confidence: 0
5+
min-confidence: 0.6
66
gocyclo:
77
min-complexity: 15
88
maligned:
@@ -23,44 +23,81 @@ linters-settings:
2323
- experimental
2424
disabled-checks:
2525
- wrapperFunc
26+
- hugeParam
27+
- rangeValCopy
2628

2729
linters:
30+
disable-all: true
2831
enable:
29-
- megacheck
3032
- revive
3133
- govet
3234
- unconvert
33-
- megacheck
34-
- structcheck
35-
- gas
36-
- gocyclo
37-
- dupl
38-
- misspell
35+
- gosec
3936
- unparam
40-
- varcheck
41-
- deadcode
37+
- unused
4238
- typecheck
4339
- ineffassign
44-
- varcheck
4540
- stylecheck
4641
- gochecknoinits
47-
- exportloopref
4842
- gocritic
4943
- nakedret
5044
- gosimple
5145
- prealloc
46+
5247
fast: false
53-
disable-all: true
48+
5449

5550
run:
56-
output:
57-
format: tab
58-
skip-dirs:
59-
- vendor
51+
concurrency: 4
6052

6153
issues:
54+
exclude-dirs:
55+
- vendor
6256
exclude-rules:
6357
- text: "should have a package comment, unless it's in another file for this package"
6458
linters:
6559
- golint
60+
- text: "exitAfterDefer:"
61+
linters:
62+
- gocritic
63+
- text: "whyNoLint: include an explanation for nolint directive"
64+
linters:
65+
- gocritic
66+
- text: "go.mongodb.org/mongo-driver/bson/primitive.E"
67+
linters:
68+
- govet
69+
- text: "weak cryptographic primitive"
70+
linters:
71+
- gosec
72+
- text: "integer overflow conversion"
73+
linters:
74+
- gosec
75+
- text: "should have a package comment"
76+
linters:
77+
- revive
78+
- text: "at least one file in a package should have a package comment"
79+
linters:
80+
- stylecheck
81+
- text: "commentedOutCode: may want to remove commented-out code"
82+
linters:
83+
- gocritic
84+
- text: "unnamedResult: consider giving a name to these results"
85+
linters:
86+
- gocritic
87+
- text: "var-naming: don't use an underscore in package name"
88+
linters:
89+
- revive
90+
- text: "should not use underscores in package names"
91+
linters:
92+
- stylecheck
93+
- text: "struct literal uses unkeyed fields"
94+
linters:
95+
- govet
96+
- linters:
97+
- unparam
98+
- unused
99+
- revive
100+
path: _test\.go$
101+
text: "unused-parameter"
66102
exclude-use-default: false
103+

go.mod

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
11
module github.com/go-pkgz/jrpc
22

3-
go 1.16
3+
go 1.23
44

55
require (
6-
github.com/didip/tollbooth/v7 v7.0.0
6+
github.com/didip/tollbooth/v7 v7.0.2
77
github.com/didip/tollbooth_chi v0.0.0-20220719025231-d662a7f6928f
8-
github.com/go-chi/chi/v5 v5.0.7
9-
github.com/go-chi/render v1.0.1
10-
github.com/go-pkgz/rest v1.15.6
8+
github.com/go-chi/chi/v5 v5.2.0
9+
github.com/go-chi/render v1.0.3
10+
github.com/go-pkgz/rest v1.20.1
11+
github.com/stretchr/testify v1.10.0
12+
)
13+
14+
require (
15+
github.com/ajg/form v1.5.1 // indirect
16+
github.com/davecgh/go-spew v1.1.1 // indirect
17+
github.com/go-pkgz/expirable-cache/v3 v3.0.0 // indirect
1118
github.com/kr/pretty v0.1.0 // indirect
12-
github.com/stretchr/testify v1.8.0
19+
github.com/pmezard/go-difflib v1.0.0 // indirect
20+
golang.org/x/crypto v0.31.0 // indirect
21+
golang.org/x/sys v0.28.0 // indirect
1322
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
23+
gopkg.in/yaml.v3 v3.0.1 // indirect
1424
)

go.sum

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,39 @@
1+
github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
2+
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
13
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
24
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
35
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4-
github.com/didip/tollbooth/v7 v7.0.0 h1:XmyyNwZpz9j61PwR4A894MmmYO5zBF9xjgVi2n1fiQI=
56
github.com/didip/tollbooth/v7 v7.0.0/go.mod h1:VZhDSGl5bDSPj4wPsih3PFa4Uh9Ghv8hgacaTm5PRT4=
7+
github.com/didip/tollbooth/v7 v7.0.2 h1:WYEfusYI6g64cN0qbZgekDrYfuYBZjUZd5+RlWi69p4=
8+
github.com/didip/tollbooth/v7 v7.0.2/go.mod h1:RtRYfEmFGX70+ike5kSndSvLtQ3+F2EAmTI4Un/VXNc=
69
github.com/didip/tollbooth_chi v0.0.0-20220719025231-d662a7f6928f h1:jtKwihcLmUC9BAhoJ9adCUqdSSZcOdH2KL7mPTUm2aw=
710
github.com/didip/tollbooth_chi v0.0.0-20220719025231-d662a7f6928f/go.mod h1:q9C80dnsuVRP2dAskjnXRNWdUJqtGgwG9wNrzt0019s=
8-
github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8=
9-
github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
10-
github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8=
11-
github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
12-
github.com/go-pkgz/expirable-cache v0.1.0 h1:3bw0m8vlTK8qlwz5KXuygNBTkiKRTPrAGXU0Ej2AC1g=
11+
github.com/go-chi/chi/v5 v5.2.0 h1:Aj1EtB0qR2Rdo2dG4O94RIU35w2lvQSj6BRA4+qwFL0=
12+
github.com/go-chi/chi/v5 v5.2.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
13+
github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4=
14+
github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
1315
github.com/go-pkgz/expirable-cache v0.1.0/go.mod h1:GTrEl0X+q0mPNqN6dtcQXksACnzCBQ5k/k1SwXJsZKs=
14-
github.com/go-pkgz/rest v1.15.6 h1:8RgOuY/c00CD0el8KdmscOCgDH+ML0ZsK2qa1Rcxal4=
15-
github.com/go-pkgz/rest v1.15.6/go.mod h1:KUWAqbDteYGS/CiXftomQsKjtEOifXsJ36Ka0skYbmk=
16+
github.com/go-pkgz/expirable-cache/v3 v3.0.0 h1:u3/gcu3sabLYiTCevoRKv+WzjIn5oo7P8XtiXBeRDLw=
17+
github.com/go-pkgz/expirable-cache/v3 v3.0.0/go.mod h1:2OQiDyEGQalYecLWmXprm3maPXeVb5/6/X7yRPYTzec=
18+
github.com/go-pkgz/rest v1.20.1 h1:ZS1HtcguZI90On+/BwMmfISVem7J/5fWEbuNRfswAdo=
19+
github.com/go-pkgz/rest v1.20.1/go.mod h1:kGjA9Zhdv93weeDjBPVMpUKgfzTsBKHjJc8SoQPGbks=
20+
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
21+
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
1622
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
1723
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
1824
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
1925
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
2026
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
21-
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
22-
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
2327
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2428
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
2529
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
26-
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
27-
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
2830
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
29-
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
30-
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
31+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
32+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
33+
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
34+
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
35+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
36+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
3137
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
3238
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
3339
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,4 +243,4 @@ type LoggerFunc func(format string, args ...interface{})
243243
func (f LoggerFunc) Logf(format string, args ...interface{}) { f(format, args...) }
244244

245245
// NoOpLogger logger does nothing
246-
var NoOpLogger = LoggerFunc(func(format string, args ...interface{}) {})
246+
var NoOpLogger = LoggerFunc(func(format string, args ...interface{}) {}) //nolint

0 commit comments

Comments
 (0)