From 9f7473873d287f6df1ad9f5ad62a58221fdd47b9 Mon Sep 17 00:00:00 2001
From: Lyuben Penkovski <lyuben.penkovski@vereign.com>
Date: Wed, 5 Jun 2024 14:33:20 +0300
Subject: [PATCH] chore: fix linters configuration in ci/cd pipelines
---
.gitlab-ci.yml | 10 +++++-----
.golangci.yml | 13 ++++++-------
cmd/cache/main.go | 1 +
deployment/ci/Dockerfile | 4 ++--
deployment/compose/Dockerfile | 2 +-
internal/service/cache/service_test.go | 1 +
internal/service/error_response.go | 1 +
7 files changed, 17 insertions(+), 15 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/cache/main.go b/cmd/cache/main.go
index d7dc8cb..9cf5218 100644
--- a/cmd/cache/main.go
+++ b/cmd/cache/main.go
@@ -163,6 +163,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/deployment/ci/Dockerfile b/deployment/ci/Dockerfile
index cd8f238..bdcf857 100644
--- a/deployment/ci/Dockerfile
+++ b/deployment/ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.5-alpine3.17 as builder
+FROM golang:1.22.4-alpine3.19 as builder
RUN apk add git
@@ -11,7 +11,7 @@ ADD . .
RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-X main.Version=$APP_VER" -mod=vendor -o /tmp/cache ./cmd/cache/...
-FROM alpine:3.17 as runner
+FROM alpine:3.19 as runner
COPY --from=builder /tmp/cache /opt/cache
diff --git a/deployment/compose/Dockerfile b/deployment/compose/Dockerfile
index b57e8bd..4c0d47e 100644
--- a/deployment/compose/Dockerfile
+++ b/deployment/compose/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.5
+FROM golang:1.22.4
RUN go install github.com/ysmood/kit/cmd/guard@v0.25.11
diff --git a/internal/service/cache/service_test.go b/internal/service/cache/service_test.go
index 1d87d4d..d2762f2 100644
--- a/internal/service/cache/service_test.go
+++ b/internal/service/cache/service_test.go
@@ -1,3 +1,4 @@
+//nolint:revive
package cache_test
import (
diff --git a/internal/service/error_response.go b/internal/service/error_response.go
index 9234f30..38fca67 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
--
GitLab