Skip to content

Commit 2cf81ff

Browse files
committed
Use golangci-lint instead of golint
We have been using golint as a linter, but golint was officially deprecated. golang/go#38968 The revive is a drop-in replacement of golint. https://github.com/mgechev/revive It's possible to use revive as it is, but I'd like to use revive via golangci-lint so that we can add more linters easily. https://github.com/golangci/golangci-lint The golangci-lint is a meta linter. I'll take this opportunity to introduce some additional checks.
1 parent b8667e0 commit 2cf81ff

File tree

7 files changed

+40
-32
lines changed

7 files changed

+40
-32
lines changed

.github/workflows/lint.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: lint
2+
permissions:
3+
contents: read
4+
on:
5+
push:
6+
branches:
7+
- master
8+
pull_request:
9+
branches:
10+
- master
11+
12+
jobs:
13+
golangci:
14+
name: lint
15+
runs-on: ubuntu-latest
16+
timeout-minutes: 5
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: golangci-lint
20+
uses: golangci/golangci-lint-action@v2
21+
with:
22+
version: v1.43.0

.github/workflows/test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
restore-keys: |
3434
${{ runner.os }}-go-
3535
- name: test
36-
run: make check
36+
run: make test
3737
testacc:
3838
runs-on: ubuntu-latest
3939
strategy:

.golangci.yml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# https://golangci-lint.run/usage/configuration/
2+
linters:
3+
disable-all: true
4+
enable:
5+
- errcheck
6+
- goimports
7+
- gosec
8+
- gosimple
9+
- govet
10+
- ineffassign
11+
- revive
12+
- staticcheck

Makefile

+5-13
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ ifndef GOBIN
44
GOBIN := $(shell echo "$${GOPATH%%:*}/bin")
55
endif
66

7-
GOLINT := $(GOBIN)/golint
8-
9-
$(GOLINT): ; @go install golang.org/x/lint/golint
10-
117
.DEFAULT_GOAL := build
128

139
.PHONY: deps
@@ -23,20 +19,16 @@ install: deps
2319
go install
2420

2521
.PHONY: lint
26-
lint: $(GOLINT)
27-
golint $$(go list ./... | grep -v /vendor/)
28-
29-
.PHONY: vet
30-
vet:
31-
go vet ./...
22+
lint:
23+
golangci-lint run ./...
3224

3325
.PHONY: test
34-
test: deps
26+
test: build
3527
go test ./...
3628

3729
.PHONY: testacc
38-
testacc: deps
30+
testacc: build
3931
TEST_ACC=1 go test -count=1 -failfast ./...
4032

4133
.PHONY: check
42-
check: lint vet test build
34+
check: lint test

go.mod

-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ require (
1313
github.com/mattn/go-shellwords v1.0.10
1414
github.com/mitchellh/cli v1.1.1
1515
github.com/spf13/pflag v1.0.2
16-
golang.org/x/lint v0.0.0-20200302205851-738671d3881b
1716
)
1817

1918
require (
@@ -35,6 +34,5 @@ require (
3534
github.com/zclconf/go-cty v1.2.0 // indirect
3635
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f // indirect
3736
golang.org/x/text v0.3.3 // indirect
38-
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7 // indirect
3937
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
4038
)

go.sum

-9
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,13 @@ github.com/zclconf/go-cty v1.2.0 h1:sPHsy7ADcIZQP3vILvTjrh74ZA175TFP5vqiNK1UmlI=
7979
github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8=
8080
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
8181
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
82-
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
8382
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
84-
golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
85-
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
86-
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
8783
golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
8884
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
89-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
9085
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
9186
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME=
9287
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
9388
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
94-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
9589
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
9690
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
9791
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -103,9 +97,6 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
10397
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
10498
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
10599
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
106-
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7 h1:EBZoQjiKKPaLbPrbpssUfuHtwM6KV/vb4U85g/cigFY=
107-
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
108-
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
109100
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
110101
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
111102
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=

tools.go

-7
This file was deleted.

0 commit comments

Comments
 (0)