Add golangci-lint as a dependency (#1419)

nginxinc · Mar 31, 2021 · fa3e268 · fa3e268
1 parent 2d63b7c
commit fa3e268
Show file tree

Hide file tree

Showing 1,469 changed files with 239,550 additions and 340 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -20,7 +20,6 @@ defaults:
     shell: bash
 
 env:
-  GOLANGCI_VERSION: 1.32
   GOLANGCI_TIMEOUT: 10m0s
 
 jobs:
@@ -34,5 +33,4 @@ jobs:
       - name: Lint Code
         uses: golangci/golangci-lint-action@v2.5.1
         with:
-          version: 'v${{ env.GOLANGCI_VERSION }}'
           args: --timeout ${{ env.GOLANGCI_TIMEOUT }}
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ all: test lint verify-codegen update-crds debian-image
 
 .PHONY: lint
 lint: ## Run linter
-	golangci-lint run
+	go run github.com/golangci/golangci-lint/cmd/golangci-lint run
 
 .PHONY: test
 test: ## Run tests

diff --git a/go.mod b/go.mod
@@ -7,16 +7,15 @@ require (
 	github.com/go-logr/logr v0.3.0 // indirect
 	github.com/go-openapi/spec v0.20.0 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
+	github.com/golangci/golangci-lint v1.38.0
 	github.com/google/go-cmp v0.5.5
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/imdario/mergo v0.3.11 // indirect
 	github.com/nginxinc/nginx-plus-go-client v0.8.0
 	github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201130150826-7c45b2334b3c
 	github.com/prometheus/client_golang v1.10.0
 	github.com/spiffe/go-spiffe v1.1.0
-	golang.org/x/mod v0.4.0 // indirect
 	golang.org/x/net v0.0.0-20201216054612-986b41b23924 // indirect
-	golang.org/x/tools v0.0.0-20201218024724-ae774e9781d2 // indirect
 	k8s.io/api v0.20.5
 	k8s.io/apimachinery v0.20.5
 	k8s.io/client-go v0.20.5

diff --git a/go.sum b/go.sum
diff --git a/tools.go b/tools.go
@@ -6,6 +6,7 @@
 package tools
 
 import (
+	_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
 	_ "k8s.io/code-generator"
 	_ "sigs.k8s.io/controller-tools/cmd/controller-gen"
 )
diff --git a/vendor/4d63.com/gochecknoglobals/LICENSE b/vendor/4d63.com/gochecknoglobals/LICENSE
diff --git a/vendor/4d63.com/gochecknoglobals/checknoglobals/check_no_globals.go b/vendor/4d63.com/gochecknoglobals/checknoglobals/check_no_globals.go
diff --git a/vendor/github.com/BurntSushi/toml/.gitignore b/vendor/github.com/BurntSushi/toml/.gitignore
diff --git a/vendor/github.com/BurntSushi/toml/.travis.yml b/vendor/github.com/BurntSushi/toml/.travis.yml
diff --git a/vendor/github.com/BurntSushi/toml/COMPATIBLE b/vendor/github.com/BurntSushi/toml/COMPATIBLE
diff --git a/vendor/github.com/BurntSushi/toml/COPYING b/vendor/github.com/BurntSushi/toml/COPYING
diff --git a/vendor/github.com/BurntSushi/toml/Makefile b/vendor/github.com/BurntSushi/toml/Makefile