From d95a764b654a9d0417a2529ee54870664c45d137 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 18:40:35 +0200 Subject: [PATCH] deps: update golangci/golangci-lint to v1.52.2 (#1598) * deps: update golangci/golangci-lint to v1.52.2 * deps: tidy all modules * fix linting issues --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: edgelessci Co-authored-by: Malte Poll --- bazel/toolchains/ci_deps.bzl | 32 +++++++++++++-------------- cli/internal/cmd/status.go | 2 +- cli/internal/cmd/upgradecheck_test.go | 14 ++++++------ hack/bazel-deps-mirror/check.go | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/bazel/toolchains/ci_deps.bzl b/bazel/toolchains/ci_deps.bzl index 3c12d4cd3..78af3209e 100644 --- a/bazel/toolchains/ci_deps.bzl +++ b/bazel/toolchains/ci_deps.bzl @@ -222,45 +222,45 @@ def _golangci_lint_deps(): name = "com_github_golangci_golangci_lint_linux_amd64", build_file = "//bazel/toolchains:BUILD.golangci.bazel", urls = [ - "https://cdn.confidential.cloud/constellation/cas/sha256/4de479eb9d9bc29da51aec1834e7c255b333723d38dbd56781c68e5dddc6a90b", - "https://github.com/golangci/golangci-lint/releases/download/v1.51.2/golangci-lint-1.51.2-linux-amd64.tar.gz", + "https://cdn.confidential.cloud/constellation/cas/sha256/c9cf72d12058a131746edd409ed94ccd578fbd178899d1ed41ceae3ce5f54501", + "https://github.com/golangci/golangci-lint/releases/download/v1.52.2/golangci-lint-1.52.2-linux-amd64.tar.gz", ], - strip_prefix = "golangci-lint-1.51.2-linux-amd64", - sha256 = "4de479eb9d9bc29da51aec1834e7c255b333723d38dbd56781c68e5dddc6a90b", + strip_prefix = "golangci-lint-1.52.2-linux-amd64", type = "tar.gz", + sha256 = "c9cf72d12058a131746edd409ed94ccd578fbd178899d1ed41ceae3ce5f54501", ) http_archive( name = "com_github_golangci_golangci_lint_linux_arm64", build_file = "//bazel/toolchains:BUILD.golangci.bazel", urls = [ - "https://cdn.confidential.cloud/constellation/cas/sha256/9e03c47b7628d49f950445d74881a0e3cb3a1e6b3c5ac3b67672d600124c1b08", - "https://github.com/golangci/golangci-lint/releases/download/v1.51.2/golangci-lint-1.51.2-linux-arm64.tar.gz", + "https://cdn.confidential.cloud/constellation/cas/sha256/fc09a97f8888809fab83a316f7da70c8ed74d4863b7eed7d872cec41911a55e8", + "https://github.com/golangci/golangci-lint/releases/download/v1.52.2/golangci-lint-1.52.2-linux-arm64.tar.gz", ], - strip_prefix = "golangci-lint-1.51.2-linux-arm64", - sha256 = "9e03c47b7628d49f950445d74881a0e3cb3a1e6b3c5ac3b67672d600124c1b08", + strip_prefix = "golangci-lint-1.52.2-linux-arm64", type = "tar.gz", + sha256 = "fc09a97f8888809fab83a316f7da70c8ed74d4863b7eed7d872cec41911a55e8", ) http_archive( name = "com_github_golangci_golangci_lint_darwin_amd64", build_file = "//bazel/toolchains:BUILD.golangci.bazel", urls = [ - "https://cdn.confidential.cloud/constellation/cas/sha256/0549cbaa2df451cf3a2011a9d73a9cb127784d26749d9cd14c9f4818af104d44", - "https://github.com/golangci/golangci-lint/releases/download/v1.51.2/golangci-lint-1.51.2-darwin-amd64.tar.gz", + "https://cdn.confidential.cloud/constellation/cas/sha256/e57f2599de73c4da1d36d5255b9baec63f448b3d7fb726ebd3cd64dabbd3ee4a", + "https://github.com/golangci/golangci-lint/releases/download/v1.52.2/golangci-lint-1.52.2-darwin-amd64.tar.gz", ], - strip_prefix = "golangci-lint-1.51.2-darwin-amd64", - sha256 = "0549cbaa2df451cf3a2011a9d73a9cb127784d26749d9cd14c9f4818af104d44", + strip_prefix = "golangci-lint-1.52.2-darwin-amd64", type = "tar.gz", + sha256 = "e57f2599de73c4da1d36d5255b9baec63f448b3d7fb726ebd3cd64dabbd3ee4a", ) http_archive( name = "com_github_golangci_golangci_lint_darwin_arm64", build_file = "//bazel/toolchains:BUILD.golangci.bazel", urls = [ - "https://cdn.confidential.cloud/constellation/cas/sha256/36e69882205a0e42a63ad57ec3015639c11051e03f0beb9cf7949c6451408960", - "https://github.com/golangci/golangci-lint/releases/download/v1.51.2/golangci-lint-1.51.2-darwin-arm64.tar.gz", + "https://cdn.confidential.cloud/constellation/cas/sha256/89e523d45883903cfc472ab65621073f850abd4ffbb7720bbdd7ba66ee490bc8", + "https://github.com/golangci/golangci-lint/releases/download/v1.52.2/golangci-lint-1.52.2-darwin-arm64.tar.gz", ], - strip_prefix = "golangci-lint-1.51.2-darwin-arm64", - sha256 = "36e69882205a0e42a63ad57ec3015639c11051e03f0beb9cf7949c6451408960", + strip_prefix = "golangci-lint-1.52.2-darwin-arm64", type = "tar.gz", + sha256 = "89e523d45883903cfc472ab65621073f850abd4ffbb7720bbdd7ba66ee490bc8", ) def _buf_deps(): diff --git a/cli/internal/cmd/status.go b/cli/internal/cmd/status.go index 8fc531271..8bf5046bf 100644 --- a/cli/internal/cmd/status.go +++ b/cli/internal/cmd/status.go @@ -38,7 +38,7 @@ func NewStatusCmd() *cobra.Command { } // runStatus runs the terminate command. -func runStatus(cmd *cobra.Command, args []string) error { +func runStatus(cmd *cobra.Command, _ []string) error { log, err := newCLILogger(cmd) if err != nil { return fmt.Errorf("creating logger: %w", err) diff --git a/cli/internal/cmd/upgradecheck_test.go b/cli/internal/cmd/upgradecheck_test.go index ce7b5a2e2..39bae2746 100644 --- a/cli/internal/cmd/upgradecheck_test.go +++ b/cli/internal/cmd/upgradecheck_test.go @@ -296,11 +296,11 @@ type stubVersionCollector struct { someErr error } -func (s *stubVersionCollector) newMeasurements(ctx context.Context, csp cloudprovider.Provider, images []versionsapi.Version) (map[string]measurements.M, error) { +func (s *stubVersionCollector) newMeasurements(_ context.Context, _ cloudprovider.Provider, _ []versionsapi.Version) (map[string]measurements.M, error) { return s.supportedImageVersions, nil } -func (s *stubVersionCollector) currentVersions(ctx context.Context) (currentVersionInfo, error) { +func (s *stubVersionCollector) currentVersions(_ context.Context) (currentVersionInfo, error) { return currentVersionInfo{ service: s.currentServicesVersions, image: s.currentImageVersion, @@ -309,7 +309,7 @@ func (s *stubVersionCollector) currentVersions(ctx context.Context) (currentVers }, s.someErr } -func (s *stubVersionCollector) supportedVersions(ctx context.Context, version, currentK8sVersion string) (supportedVersionInfo, error) { +func (s *stubVersionCollector) supportedVersions(_ context.Context, _, _ string) (supportedVersionInfo, error) { return supportedVersionInfo{ service: s.supportedServicesVersions, image: s.supportedImages, @@ -326,11 +326,11 @@ func (s *stubVersionCollector) newerVersions(_ context.Context, _ []string) ([]v return s.images, nil } -func (s *stubVersionCollector) newCLIVersions(ctx context.Context) ([]string, error) { +func (s *stubVersionCollector) newCLIVersions(_ context.Context) ([]string, error) { return s.newCLIVersionsList, nil } -func (s *stubVersionCollector) filterCompatibleCLIVersions(ctx context.Context, cliPatchVersions []string, currentK8sVersion string) ([]string, error) { +func (s *stubVersionCollector) filterCompatibleCLIVersions(_ context.Context, _ []string, _ string) ([]string, error) { return s.newCompatibleCLIVersionsList, nil } @@ -452,7 +452,7 @@ type stubVersionFetcher struct { cliInfoErr error } -func (f stubVersionFetcher) FetchVersionList(ctx context.Context, list versionsapi.List) (versionsapi.List, error) { +func (f stubVersionFetcher) FetchVersionList(_ context.Context, list versionsapi.List) (versionsapi.List, error) { switch list.Granularity { case versionsapi.GranularityMajor: return f.minorList, f.versionListErr @@ -462,6 +462,6 @@ func (f stubVersionFetcher) FetchVersionList(ctx context.Context, list versionsa return versionsapi.List{}, f.versionListErr } -func (f stubVersionFetcher) FetchCLIInfo(ctx context.Context, cliInfo versionsapi.CLIInfo) (versionsapi.CLIInfo, error) { +func (f stubVersionFetcher) FetchCLIInfo(_ context.Context, _ versionsapi.CLIInfo) (versionsapi.CLIInfo, error) { return versionsapi.CLIInfo{}, f.cliInfoErr } diff --git a/hack/bazel-deps-mirror/check.go b/hack/bazel-deps-mirror/check.go index ef0fc1e9c..c8089ff73 100644 --- a/hack/bazel-deps-mirror/check.go +++ b/hack/bazel-deps-mirror/check.go @@ -179,6 +179,6 @@ type mirrorChecker interface { type noOpMirrorChecker struct{} -func (m *noOpMirrorChecker) Check(ctx context.Context, expectedHash string) error { +func (m *noOpMirrorChecker) Check(_ context.Context, _ string) error { return nil }