diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 03c638a6..d4b53a58 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -59,7 +59,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: v1.55.2 + version: v1.59.1 skip-go-installation: true args: --timeout 5m - name: Install cockroach DB diff --git a/.golangci.yml b/.golangci.yml index 4e080075..3a21d53c 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,10 +1,9 @@ linters: enable: - gosec - - vet + - govet disable-all: true run: skip-files: - - "migrate_files.go" # go-bindata - ".+_test.go" diff --git a/Makefile b/Makefile index f36eb156..972644bc 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ licenses: .bin/licenses node_modules # checks open-source licenses GOBIN=$(shell pwd)/.bin go install golang.org/x/tools/cmd/goimports@latest .bin/golangci-lint: Makefile - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b .bin v1.55.2 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b .bin v1.59.1 .bin/licenses: Makefile curl https://raw.githubusercontent.com/ory/ci/master/licenses/install | sh diff --git a/cmdx/http.go b/cmdx/http.go index 428e8df6..890884c5 100644 --- a/cmdx/http.go +++ b/cmdx/http.go @@ -109,9 +109,8 @@ func NewClient(cmd *cobra.Command) (*http.Client, *url.URL, error) { rt := httpx.NewTransportWithHeader(header) rt.RoundTripper = &http.Transport{ - //#nosec G402 -- This is a false positive TLSClientConfig: &tls.Config{ - InsecureSkipVerify: skipVerify, + InsecureSkipVerify: skipVerify, //nolint:gosec // This is a false positive }, } hc.Transport = rt diff --git a/httpx/gzip_server.go b/httpx/gzip_server.go index 492bd29a..ebdade66 100644 --- a/httpx/gzip_server.go +++ b/httpx/gzip_server.go @@ -41,8 +41,7 @@ func (c *CompressionRequestReader) ServeHTTP(w http.ResponseWriter, r *http.Requ return } - /* #nosec G110 - FIXME */ - if _, err := io.Copy(&b, reader); err != nil { + if _, err := io.Copy(&b, reader); err != nil { //nolint:gosec // FIXME c.ErrHandler(w, r, err) return }