From 8168fe74b00d03e4c87986c6f020454d2447fbaf Mon Sep 17 00:00:00 2001
From: Lyuben Penkovski <lyuben.penkovski@vereign.com>
Date: Wed, 5 Jun 2024 11:50:02 +0300
Subject: [PATCH] chore: fix linters configuration in ci/cd pipelines

---
 .gitlab-ci.yml                          | 19 ++++++++++++-------
 .golangci.yml                           | 12 +++++-------
 cmd/signer/main.go                      |  1 +
 internal/clients/vault/client_test.go   |  1 +
 internal/service/error_response.go      |  1 +
 internal/service/signer/service_test.go |  2 +-
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9a7d07..1b3e9fe 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,16 +20,21 @@ 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}
-  extends: .gotest
   stage: test
   tags:
     - amd64-docker
-  before_script: []
+  before_script:
+    - ln -s /builds /go/src/code.vereign.com
+    - cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
+  script:
+    - go version
+    - go test $(go list ./... | grep -v /integration) -race -coverprofile=coverage.out
+    - go tool cover -func=coverage.out
   coverage: '/total:\s+\(statements\)\s+(\d+.\d+\%)/'
 
 govulncheck:
@@ -38,8 +43,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 bbcffe7..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,7 @@ linters:
     - gosec
     - ineffassign
     - nakedret
-    - staticcheck
     - unconvert
-    - vet
-    - vetshadow
     - misspell
     - staticcheck
     - unused
diff --git a/cmd/signer/main.go b/cmd/signer/main.go
index c3369de..e421aa2 100644
--- a/cmd/signer/main.go
+++ b/cmd/signer/main.go
@@ -193,6 +193,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/clients/vault/client_test.go b/internal/clients/vault/client_test.go
index 4e5f715..96e5c70 100644
--- a/internal/clients/vault/client_test.go
+++ b/internal/clients/vault/client_test.go
@@ -1,3 +1,4 @@
+//nolint:revive
 package vault_test
 
 import (
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/signer/service_test.go b/internal/service/signer/service_test.go
index 75f4bfe..67bb459 100644
--- a/internal/service/signer/service_test.go
+++ b/internal/service/signer/service_test.go
@@ -1,4 +1,4 @@
-// nolint:gosec
+// nolint:gosec,revive
 package signer_test
 
 import (
-- 
GitLab