From 030d669db056d7e72b328c1f1e31127184074760 Mon Sep 17 00:00:00 2001
From: renovate_bot
<group_8045_bot_c14af90fcc2e9e0c89e91dd630ad2f8d@noreply.code.fbi.h-da.de>
Date: Thu, 22 Aug 2024 10:06:04 +0000
Subject: [PATCH] [renovate] Update golangci/golangci-lint Docker tag to
v1.60.1
See merge request danet/gosdn!998
Co-authored-by: Neil Schark <neil.schark@h-da.de>
Co-authored-by: Renovate Bot <renovate@danet.fbi.h-da.de>
---
.gitlab/ci/.code-quality-ci.yml | 2 +-
.golangci.yml | 6 ++----
Makefile | 2 +-
cli/adapter/PndAdapter.go | 1 -
controller/version/version_test.go | 3 ---
5 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/.gitlab/ci/.code-quality-ci.yml b/.gitlab/ci/.code-quality-ci.yml
index 6a9c5d3e2..3d26d7b63 100644
--- a/.gitlab/ci/.code-quality-ci.yml
+++ b/.gitlab/ci/.code-quality-ci.yml
@@ -1,5 +1,5 @@
code-quality:
- image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/golangci/golangci-lint:v1.59.1-alpine
+ image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/golangci/golangci-lint:v1.60.2-alpine
stage: analyze
script:
# writes golangci-lint output to gl-code-quality-report.json
diff --git a/.golangci.yml b/.golangci.yml
index 67e271bd5..4785de7cf 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,7 +1,5 @@
-variables:
- GOLANG_VERSION: "1.22"
run:
- go: $GOLANG_VERSION
+ go: "1.22"
concurrency: 8
timeout: 20m
issues-exit-code: 1
@@ -60,7 +58,7 @@ linters:
- bidichk
- durationcheck
- errorlint
- - exportloopref
+ - copyloopvar
- grouper
- makezero
- misspell
diff --git a/Makefile b/Makefile
index 288f8dd94..6fb681e59 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ PLUGIN_NAME= bundled_plugin.zip
# Tool Versions
GOTESTSUM_VERSION=v1.8.1
-GOLANGCI_LINT_VERSION=v1.59.1
+GOLANGCI_LINT_VERSION=v1.60.2
MOCKERY_VERSION=v2.20.0
YGOT_GENERATOR_VERSION=v0.27.0
YGOT_GENERATOR_GENERATOR_VERSION=v0.0.4
diff --git a/cli/adapter/PndAdapter.go b/cli/adapter/PndAdapter.go
index 5797e250f..e1bd8936b 100644
--- a/cli/adapter/PndAdapter.go
+++ b/cli/adapter/PndAdapter.go
@@ -119,7 +119,6 @@ func (p *PndAdapter) RequestAll(ctx context.Context, path string) ([]proto.Messa
reqResult := make([]proto.Message, len(resp.Mne))
g := new(errgroup.Group)
for i, mne := range resp.Mne {
- i, mne := i, mne
// TODO: probably the controller should do this; this would result in a
// single request from CLI side.
g.Go(func() error {
diff --git a/controller/version/version_test.go b/controller/version/version_test.go
index 9ae0dbaa7..127151d3d 100644
--- a/controller/version/version_test.go
+++ b/controller/version/version_test.go
@@ -294,7 +294,6 @@ func Test_version_Compare(t *testing.T) {
}
for _, tt := range tests {
- tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
got := v.Compare(tt.args.inputVersion)
@@ -385,7 +384,6 @@ func Test_version_compareVersionSegment(t *testing.T) {
}
for _, tt := range tests {
- tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
got := compareVersionSegment(tt.args.left, tt.args.right)
@@ -451,7 +449,6 @@ func Test_version_parseVersionString(t *testing.T) {
}
for _, tt := range tests {
- tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()
got, err := parseVersionString(tt.args.input)
--
GitLab