From c2a9a7f5a1f0d8d94dd2719a8994d8c7e3fa1172 Mon Sep 17 00:00:00 2001 From: Tommaso Sardelli Date: Thu, 19 May 2022 15:27:01 +0200 Subject: [PATCH] chore: upgrade golangci-lint to v1.46.2 (#9448) * chore: upgrade golangci-lint to v1.46.2 Because: * Installation of golangci-lint v1.45.2 is currently broken and fails silently due to a redacted dependency (https://github.com/blizzy78/varnamelen/issues/13) This commit: * Upgrades golangci-lint to v1.46.2 Signed-off-by: Tommaso Sardelli * fix: lint Signed-off-by: Michael Crenshaw * fix: lint Signed-off-by: Tommaso Sardelli Co-authored-by: Michael Crenshaw --- .github/workflows/ci-build.yaml | 2 +- hack/installers/install-lint-tools.sh | 2 +- server/server.go | 1 + server/server_test.go | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index 58de56108dcd6..569acbbd103be 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -71,7 +71,7 @@ jobs: - name: Run golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: v1.45.2 + version: v1.46.2 args: --timeout 10m --exclude SA5011 --verbose test-go: diff --git a/hack/installers/install-lint-tools.sh b/hack/installers/install-lint-tools.sh index d57e93b5e186a..a77e67c6fb0cc 100755 --- a/hack/installers/install-lint-tools.sh +++ b/hack/installers/install-lint-tools.sh @@ -1,4 +1,4 @@ #!/bin/bash set -eux -o pipefail -GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.45.2 +GO111MODULE=on go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.2 diff --git a/server/server.go b/server/server.go index 1affa873702ef..bafa76c2f8c9e 100644 --- a/server/server.go +++ b/server/server.go @@ -1003,6 +1003,7 @@ func (a *ArgoCDServer) Authenticate(ctx context.Context) (context.Context, error if !argoCDSettings.AnonymousUserEnabled { return ctx, claimsErr } else { + // nolint:staticcheck ctx = context.WithValue(ctx, "claims", "") } } diff --git a/server/server_test.go b/server/server_test.go index f179a11a8c60d..5a869c93486ec 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -508,7 +508,7 @@ func getTestServer(t *testing.T, anonymousEnabled bool, withFakeSSO bool) (argoc cm.Data["users.anonymous.enabled"] = "true" } ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - return // Start with a placeholder. We need the server URL before setting up the real handler. + // Start with a placeholder. We need the server URL before setting up the real handler. })) ts.Config.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { dexMockHandler(t, ts.URL)(w, r)