From ad826ec8e6dcbf5069e62513d16f16db2031af1d Mon Sep 17 00:00:00 2001
From: Lyuben Penkovski <lyuben.penkovski@vereign.com>
Date: Wed, 5 Jun 2024 11:29:27 +0300
Subject: [PATCH] chore: fix linters configuration in ci/cd pipelines
---
.gitlab-ci.yml | 10 +++++-----
.golangci.yml | 13 ++++++-------
cmd/task/main.go | 1 +
internal/service/error_response.go | 1 +
internal/service/task/service_test.go | 1 +
internal/service/tasklist/service_test.go | 1 +
6 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9a7d07..0c7e087 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 a31b66b..deac9cf 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 59e4409..3cc4ead 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 9234f30..5933b14 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 c7b90ed..55d65ce 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 a22d900..88d73d0 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 (
--
GitLab