diff --git a/.errcheck-exclude b/.errcheck-exclude deleted file mode 100644 index 4b2090a39..000000000 --- a/.errcheck-exclude +++ /dev/null @@ -1,5 +0,0 @@ -io/ioutil.WriteFile -io/ioutil.ReadFile -(github.com/go-kit/log.Logger).Log -io.Copy -(github.com/opentracing/opentracing-go.Tracer).Inject diff --git a/.golangci.yml b/.golangci.yml index 0374e61ae..6388f1284 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,6 @@ output: - format: line-number - + formats: + - format: line-number linters: enable: - goimports @@ -8,18 +8,20 @@ linters: - misspell - revive - loggercheck - linters-settings: errcheck: # path to a file containing a list of functions to exclude from checking # see https://github.com/kisielk/errcheck#excluding-functions for details - exclude: ./.errcheck-exclude + exclude-functions: + - io/ioutil.WriteFile + - io/ioutil.ReadFile + - (github.com/go-kit/log.Logger).Log + - io.Copy + - (github.com/opentracing/opentracing-go.Tracer).Inject goimports: local-prefixes: "github.com/grafana/dskit" - run: timeout: 5m - # List of build tags, all linters use it. build-tags: - netgo