diff --git a/.golangci.yml b/.golangci.yml index e733e60fc..60222bc18 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,8 +3,6 @@ run: deadline: 1m issues-exit-code: 1 tests: true - # build-tags: - # - mytag skip-dirs: - static skip-files: @@ -35,19 +33,13 @@ linters-settings: goconst: min-len: 3 min-occurrences: 2 - # depguard: - # list-type: blacklist - # include-go-root: false - # packages: - # - github.com/davecgh/go-spew/spew linters: disable-all: true enable: - deadcode - #- depguard - errcheck - - gas + - gosec - goconst - gocyclo - gofmt @@ -66,9 +58,5 @@ linters: issues: exclude: - "composite literal uses unkeyed fields" # govet -# exclude-use-default: true -# max-per-linter: 0 -# max-same: 0 -# new: false -# new-from-rev: "" -# new-from-patch: "" + - "G304: Potential file inclusion via variable" # gosec + - "G104: Errors unhandled." #gosec diff --git a/Makefile b/Makefile index 896f02355..50e39831f 100644 --- a/Makefile +++ b/Makefile @@ -255,7 +255,7 @@ test-e2e-race: test-e2e ##@tests Run e2e tests with -race flag lint-install: @# The following installs a specific version of golangci-lint, which is appropriate for a CI server to avoid different results from build to build - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $(GOPATH)/bin v1.9.1 + curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $(GOPATH)/bin v1.10.2 lint: @echo "lint"