*: switch to golangci-lint

Signed-off-by: Vincent Batts <[email protected]>

Author: vbatts

.github/workflows/docs-and-linting.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ['1.15', '1.16', '1.17']
+        go: ['1.16', '1.17']
 
     name: Documentation and Linting
     steps:
@@ -30,8 +30,6 @@ jobs:
           export PATH=$GOPATH/bin:$PATH
           cd go/src/github.com/opencontainers/image-spec
           make install.tools
-          go get -u github.com/alecthomas/gometalinter
-          gometalinter --install
           go get -t -d ./...
           ls ../
           make

.golangci.yml

@@ -0,0 +1,26 @@
+run:
+  timeout: 10m
+
+linters:
+  disable-all: true
+  enable:
+    - deadcode
+    - dupl
+    - gofmt
+    - goimports
+    - gosimple
+    - govet
+    - ineffassign
+    - misspell
+    - nakedret
+    - revive
+    - structcheck
+    - unused
+    - varcheck
+    - staticcheck
+
+linters-settings:
+  gofmt:
+    simplify: true
+  dupl:
+    threshold: 400

.tool/lint

@@ -4,21 +4,4 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-if [ ! $(command -v gometalinter) ]; then
-	go get -u github.com/alecthomas/gometalinter
-	gometalinter --install
-fi
-
-for d in $(find . -type d -not -iwholename '*.git*' -a -not -iname '.tool' -a -not -iwholename '*vendor*'); do
-	gometalinter \
-		--exclude='error return value not checked.*(Close|Log|Print).*\(errcheck\)$' \
-		--exclude='.*_test\.go:.*error return value not checked.*\(errcheck\)$' \
-		--exclude='duplicate of.*_test.go.*\(dupl\)$' \
-		--exclude='schema/fs.go' \
-		--disable=aligncheck \
-		--disable=gotype \
-		--disable=gas \
-		--cyclo-over=35 \
-		--tests \
-		--deadline=60s "${d}"
-done
+GO111MODULE=on golangci-lint run

Makefile

@@ -92,7 +92,7 @@ check-license:
 	@echo "checking license headers"
 	@./.tool/check-license
 
-lint:
+lint: .install.lint
 	@echo "checking lint"
 	@./.tool/lint
 
@@ -114,6 +114,9 @@ endif
 
 install.tools: $(TOOLS:%=.install.%)
 
+.install.lint:
+	go get github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+
 .install.esc:
 	go get -u github.com/mjibson/esc
 

go.mod

@@ -3,9 +3,16 @@ module github.com/opencontainers/image-spec
 go 1.11
 
 require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/golangci/golangci-lint v1.43.0 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/pkg/errors v0.9.1
 	github.com/russross/blackfriday v1.6.0
+	github.com/stretchr/testify v1.7.0 // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415
 	github.com/xeipuuv/gojsonschema v1.2.0
+	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )