From a2fe224d290dd2d0b776b7b29246eca1db8b3d78 Mon Sep 17 00:00:00 2001 From: Alvaro Aleman Date: Sun, 19 Jan 2025 16:35:19 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=B1Bump=20golangci-lint=20to=20v1.63.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gets us to the latest release of it --- .github/workflows/golangci-lint.yml | 2 +- .golangci.yml | 1 + pkg/client/fake/client.go | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index c68240ca45..b00ea8b196 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -34,6 +34,6 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # tag=v6.1.1 with: - version: v1.61.0 + version: v1.63.4 args: --out-format=colored-line-number working-directory: ${{matrix.working-directory}} diff --git a/.golangci.yml b/.golangci.yml index 7cb910fb85..0f2e50c915 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -171,6 +171,7 @@ issues: - unused # Seems to incorrectly trigger on the two implementations that are only # used through an interface and not directly..? + # Likely same issue as https://github.com/dominikh/go-tools/issues/1616 path: pkg/controller/priorityqueue/metrics\.go run: diff --git a/pkg/client/fake/client.go b/pkg/client/fake/client.go index 0c4300d548..69bc3d66db 100644 --- a/pkg/client/fake/client.go +++ b/pkg/client/fake/client.go @@ -1050,19 +1050,19 @@ func dryPatch(action testing.PatchActionImpl, tracker testing.ObjectTracker) (ru } // copyStatusFrom copies the status from old into new -func copyStatusFrom(old, new runtime.Object) error { +func copyStatusFrom(old, n runtime.Object) error { oldMapStringAny, err := toMapStringAny(old) if err != nil { return fmt.Errorf("failed to convert old to *unstructured.Unstructured: %w", err) } - newMapStringAny, err := toMapStringAny(new) + newMapStringAny, err := toMapStringAny(n) if err != nil { return fmt.Errorf("failed to convert new to *unststructured.Unstructured: %w", err) } newMapStringAny["status"] = oldMapStringAny["status"] - if err := fromMapStringAny(newMapStringAny, new); err != nil { + if err := fromMapStringAny(newMapStringAny, n); err != nil { return fmt.Errorf("failed to convert back from map[string]any: %w", err) } @@ -1070,12 +1070,12 @@ func copyStatusFrom(old, new runtime.Object) error { } // copyFrom copies from old into new -func copyFrom(old, new runtime.Object) error { +func copyFrom(old, n runtime.Object) error { oldMapStringAny, err := toMapStringAny(old) if err != nil { return fmt.Errorf("failed to convert old to *unstructured.Unstructured: %w", err) } - if err := fromMapStringAny(oldMapStringAny, new); err != nil { + if err := fromMapStringAny(oldMapStringAny, n); err != nil { return fmt.Errorf("failed to convert back from map[string]any: %w", err) }