Update linter version and fix linting errors:

Signed-off-by: Jacob Weinstock <[email protected]>
tinkerbell · Nov 8, 2024 · 4600371 · 4600371
1 parent 4210608
commit 4600371
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -16,6 +16,7 @@ linters:
     - asciicheck
     - bidichk
     - bodyclose
+    - copyloopvar
     - contextcheck
     - cyclop
     - dogsled
@@ -26,7 +27,6 @@ linters:
     - errname
     - errorlint
     - exhaustive
-    - exportloopref
     - forcetypeassert
     - gci
     - gocognit
@@ -112,9 +112,6 @@ linters-settings:
       - name: unconditional-recursion
       - name: waitgroup-by-value
 
-  unused:
-    go: "1.21"
-
 issues:
   # Excluding configuration per-path, per-linter, per-text and per-source
   exclude-rules:

diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@ help:
 
 # -- Tooling
 
-GOLANGCI_LINT_VERSION 	?= v1.55.2
+GOLANGCI_LINT_VERSION 	?= v1.61.0
 GOLANGCI_LINT 			:= $(TOOLS_DIR)/golangci-lint
 $(GOLANGCI_LINT):
 	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | \

diff --git a/internal/backend/flatfile/backend_test.go b/internal/backend/flatfile/backend_test.go
@@ -73,7 +73,7 @@ func TestGetEC2Instance(t *testing.T) {
 				}
 
 				if !cmp.Equal(&ec2Instance, tc.ExpectedInstance) {
-					t.Errorf(cmp.Diff(ec2Instance, tc.ExpectedInstance))
+					t.Error(cmp.Diff(ec2Instance, tc.ExpectedInstance))
 				}
 			}
 		})