diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9a7d07f612348924e2fba2388c641a027f15625..0c7e0872d48dd17b0337193ffca005a266ad57f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ stages: - build - trigger-deploy lint: - image: golangci/golangci-lint:v1.50.1 + image: golangci/golangci-lint:latest stage: test tags: - amd64-docker @@ -20,8 +20,8 @@ lint: - golangci-lint --version - golangci-lint run before_script: - - ln -s /builds /go/src/gitlab.com - - cd /go/src/gitlab.com/${CI_PROJECT_PATH} + - ln -s /builds /go/src/code.vereign.com + - cd /go/src/code.vereign.com/${CI_PROJECT_PATH} unit tests: image: golang:${GO_VERSION} @@ -38,8 +38,8 @@ govulncheck: tags: - amd64-docker before_script: - - ln -s /builds /go/src/gitlab.com - - cd /go/src/gitlab.com/${CI_PROJECT_PATH} + - ln -s /builds /go/src/code.vereign.com + - cd /go/src/code.vereign.com/${CI_PROJECT_PATH} script: - go version - go install golang.org/x/vuln/cmd/govulncheck@latest diff --git a/.golangci.yml b/.golangci.yml index a31b66b24000f23ec82f765c828a26cf2bef07bd..deac9cf0c47bf49648d2bd828f6fe2b1b749e554 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,16 +1,17 @@ run: - deadline: 5m - skip-dirs: + timeout: 5m + +issues: + exclude-dirs: - vendor/ - .*fakes/ - .*generated/ - skip-files: + exclude-files: - .*generated.go linters: disable-all: true enable: - - megacheck - govet - errcheck - goconst @@ -20,10 +21,8 @@ linters: - gosec - ineffassign - nakedret - - staticcheck - unconvert - - vet - - vetshadow - misspell - staticcheck - unused + - gosimple diff --git a/cmd/task/main.go b/cmd/task/main.go index 59e440941c170e440336bbf0de2eeb444b87e9cb..3cc4eadf4f67147eb69b63dddee3577856114100 100644 --- a/cmd/task/main.go +++ b/cmd/task/main.go @@ -255,6 +255,7 @@ func createLogger(logLevel string, opts ...zap.Option) (*zap.Logger, error) { return config.Build(opts...) } +// nolint:misspell func errFormatter(ctx context.Context, e error) goahttp.Statuser { return service.NewErrorResponse(ctx, e) } diff --git a/internal/service/error_response.go b/internal/service/error_response.go index 9234f3041e4f396e936b553b74492589d15728e0..5933b14c4c08f85658b40c6bc69526640810e373 100644 --- a/internal/service/error_response.go +++ b/internal/service/error_response.go @@ -9,6 +9,7 @@ import ( "gitlab.eclipse.org/eclipse/xfsc/tsa/golib/errors" ) +// nolint:misspell func NewErrorResponse(ctx context.Context, err error) goahttp.Statuser { if err == nil { return nil diff --git a/internal/service/task/service_test.go b/internal/service/task/service_test.go index c7b90ed0156d116f74ce3622f04a85a545245c75..55d65ce43bc15ca06549bbe5617ba2b45eea4c4b 100644 --- a/internal/service/task/service_test.go +++ b/internal/service/task/service_test.go @@ -1,3 +1,4 @@ +//nolint:revive package task_test import ( diff --git a/internal/service/tasklist/service_test.go b/internal/service/tasklist/service_test.go index a22d9000d65065e7bd30656504d1d5d117d35de6..88d73d08c34cac3d9646a566f379e33365815f8a 100644 --- a/internal/service/tasklist/service_test.go +++ b/internal/service/tasklist/service_test.go @@ -1,3 +1,4 @@ +//nolint:revive package tasklist_test import (