diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63bd9d07be7a5962517b0fb2c33b24d714822c09..b2048c1984351b48488ecf0ae152a0e9b6558eaa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ include: - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml' lint: - image: golangci/golangci-lint:v1.44.2 + image: golangci/golangci-lint:v1.50.1 stage: test tags: - amd64-docker @@ -28,12 +28,27 @@ lint: - cd /go/src/gitlab.com/${CI_PROJECT_PATH} unit tests: - image: golang:1.17.7 + image: golang:1.19.3 extends: .gotest stage: test tags: - amd64-docker before_script: [] + coverage: '/total:\s+\(statements\)\s+(\d+.\d+\%)/' + +govulncheck: + image: golang:1.19.3 + stage: test + tags: + - amd64-docker + before_script: + - ln -s /builds /go/src/gitlab.com + - cd /go/src/gitlab.com/${CI_PROJECT_PATH} + script: + - go version + - go install golang.org/x/vuln/cmd/govulncheck@latest + - govulncheck ./... + amd64: extends: .docker-build diff --git a/.golangci.yml b/.golangci.yml index e6ba71d0fff71ba18fa18f4bd0f55fbaad679ab2..a31b66b24000f23ec82f765c828a26cf2bef07bd 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -12,7 +12,6 @@ linters: enable: - megacheck - govet - - deadcode - errcheck - goconst - gocyclo @@ -22,10 +21,9 @@ linters: - ineffassign - nakedret - staticcheck - - structcheck - unconvert - - varcheck - vet - vetshadow - misspell - staticcheck + - unused diff --git a/cmd/infohub/main.go b/cmd/infohub/main.go index 528254cf4f2f73c582ebd5a154cc74e66ba260b6..138bf4b4048dca2abf3a4e207b1f53deb9b3b27c 100644 --- a/cmd/infohub/main.go +++ b/cmd/infohub/main.go @@ -239,7 +239,7 @@ func exposeMetrics(addr string, logger *zap.Logger) { promMux := http.NewServeMux() promMux.Handle("/metrics", promhttp.Handler()) logger.Info(fmt.Sprintf("exposing prometheus metrics at %s/metrics", addr)) - if err := http.ListenAndServe(addr, promMux); err != nil { + if err := http.ListenAndServe(addr, promMux); err != nil { //nolint:gosec logger.Error("error exposing prometheus metrics", zap.Error(err)) } } diff --git a/deployment/ci/Dockerfile b/deployment/ci/Dockerfile index f216cd5e2b25e435f20d4dab62067745c42a64c4..0a90d092da2c9ed30a876e3a60458d037c0280ad 100644 --- a/deployment/ci/Dockerfile +++ b/deployment/ci/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine3.15 as builder +FROM golang:1.19.3-alpine3.15 as builder RUN apk add git diff --git a/deployment/compose/Dockerfile b/deployment/compose/Dockerfile index 2bc21f6f0019826613955241677f8c091c70d933..6e4ef22aac6a1bde7022d47c3fe69c67e96ca345 100644 --- a/deployment/compose/Dockerfile +++ b/deployment/compose/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19 +FROM golang:1.19.3 ENV GO111MODULE=on diff --git a/internal/clients/signer/client.go b/internal/clients/signer/client.go index c75c5064004f550d8db50b266481ce0b3a5bd25e..3224cfd34634301a28144ce1a614785cd111f2dd 100644 --- a/internal/clients/signer/client.go +++ b/internal/clients/signer/client.go @@ -6,7 +6,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "net/http" "github.com/hyperledger/aries-framework-go/pkg/doc/verifiable" @@ -105,7 +104,7 @@ func (c *Client) VerifyPresentation(ctx context.Context, vp []byte) error { } func getErrorBody(resp *http.Response) string { - body, err := ioutil.ReadAll(io.LimitReader(resp.Body, 2<<20)) + body, err := io.ReadAll(io.LimitReader(resp.Body, 2<<20)) if err != nil { return "" }