From 5c37022cd1f21496ef3e7f9e2cbeef7bbf47c2ba 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 ++++++-------
 2 files changed, 11 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
-- 
GitLab