From 8e00fb9fe123c76b1799e3bdd0cd0667dc9b7fde Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 Nov 2023 11:16:17 +0100 Subject: [PATCH] deps: update golangci/golangci-lint to v1.55.1 (#2517) * deps: update golangci/golangci-lint to v1.55.1 * deps: tidy all modules * golangci-lint: exclude ginko/gomega imports from dot-imports rule Co-authored-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- bazel/toolchains/ci_deps.bzl | 32 +++++++++---------- ...autoscalingstrategy_controller_env_test.go | 4 +++ .../joiningnode_controller_env_test.go | 4 +++ .../nodeversion_controller_env_test.go | 4 +++ .../pendingnode_controller_env_test.go | 4 +++ .../scalinggroup_controller_env_test.go | 4 +++ .../controllers/suite_test.go | 9 ++++-- .../scalinggroup_controller_env_test.go | 6 +++- .../sgreconciler/suite_test.go | 4 +++ 9 files changed, 51 insertions(+), 20 deletions(-) diff --git a/bazel/toolchains/ci_deps.bzl b/bazel/toolchains/ci_deps.bzl index b0cd4737db..135b9b2285 100644 --- a/bazel/toolchains/ci_deps.bzl +++ b/bazel/toolchains/ci_deps.bzl @@ -223,45 +223,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/17c9ca05253efe833d47f38caf670aad2202b5e6515879a99873fabd4c7452b3", - "https://github.com/golangci/golangci-lint/releases/download/v1.54.2/golangci-lint-1.54.2-linux-amd64.tar.gz", + "https://cdn.confidential.cloud/constellation/cas/sha256/cef6f21add7326e159822b779d366bed15eb741e686b0429c3e5e04fe77998ef", + "https://github.com/golangci/golangci-lint/releases/download/v1.55.1/golangci-lint-1.55.1-linux-amd64.tar.gz", ], - strip_prefix = "golangci-lint-1.54.2-linux-amd64", + strip_prefix = "golangci-lint-1.55.1-linux-amd64", type = "tar.gz", - sha256 = "17c9ca05253efe833d47f38caf670aad2202b5e6515879a99873fabd4c7452b3", + sha256 = "cef6f21add7326e159822b779d366bed15eb741e686b0429c3e5e04fe77998ef", ) 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/a9f14b33473c65fcfbf411ec054b53a87dbb849f4e09ee438f1ee76dbf3f3d4e", - "https://github.com/golangci/golangci-lint/releases/download/v1.54.2/golangci-lint-1.54.2-linux-arm64.tar.gz", + "https://cdn.confidential.cloud/constellation/cas/sha256/e60932eaa35e5965dae3d70fd9a046027f181ee0914378db16bcfa7256f5e213", + "https://github.com/golangci/golangci-lint/releases/download/v1.55.1/golangci-lint-1.55.1-linux-arm64.tar.gz", ], - strip_prefix = "golangci-lint-1.54.2-linux-arm64", + strip_prefix = "golangci-lint-1.55.1-linux-arm64", type = "tar.gz", - sha256 = "a9f14b33473c65fcfbf411ec054b53a87dbb849f4e09ee438f1ee76dbf3f3d4e", + sha256 = "e60932eaa35e5965dae3d70fd9a046027f181ee0914378db16bcfa7256f5e213", ) 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/925c4097eae9e035b0b052a66d0a149f861e2ab611a4e677c7ffd2d4e05b9b89", - "https://github.com/golangci/golangci-lint/releases/download/v1.54.2/golangci-lint-1.54.2-darwin-amd64.tar.gz", + "https://cdn.confidential.cloud/constellation/cas/sha256/8ea613b9db9e2649e6221a4b2b6515ebb523a3908e408f0609622fecee1e194a", + "https://github.com/golangci/golangci-lint/releases/download/v1.55.1/golangci-lint-1.55.1-darwin-amd64.tar.gz", ], - strip_prefix = "golangci-lint-1.54.2-darwin-amd64", + strip_prefix = "golangci-lint-1.55.1-darwin-amd64", type = "tar.gz", - sha256 = "925c4097eae9e035b0b052a66d0a149f861e2ab611a4e677c7ffd2d4e05b9b89", + sha256 = "8ea613b9db9e2649e6221a4b2b6515ebb523a3908e408f0609622fecee1e194a", ) 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/7b33fb1be2f26b7e3d1f3c10ce9b2b5ce6d13bb1d8468a4b2ba794f05b4445e1", - "https://github.com/golangci/golangci-lint/releases/download/v1.54.2/golangci-lint-1.54.2-darwin-arm64.tar.gz", + "https://cdn.confidential.cloud/constellation/cas/sha256/d58886b9774b2a6cfc245767b101815709c8d35c21c17fbba8b5c4bca2869a56", + "https://github.com/golangci/golangci-lint/releases/download/v1.55.1/golangci-lint-1.55.1-darwin-arm64.tar.gz", ], - strip_prefix = "golangci-lint-1.54.2-darwin-arm64", + strip_prefix = "golangci-lint-1.55.1-darwin-arm64", type = "tar.gz", - sha256 = "7b33fb1be2f26b7e3d1f3c10ce9b2b5ce6d13bb1d8468a4b2ba794f05b4445e1", + sha256 = "d58886b9774b2a6cfc245767b101815709c8d35c21c17fbba8b5c4bca2869a56", ) def _buf_deps(): diff --git a/operators/constellation-node-operator/controllers/autoscalingstrategy_controller_env_test.go b/operators/constellation-node-operator/controllers/autoscalingstrategy_controller_env_test.go index 48720aebfe..cbc7ef53a1 100644 --- a/operators/constellation-node-operator/controllers/autoscalingstrategy_controller_env_test.go +++ b/operators/constellation-node-operator/controllers/autoscalingstrategy_controller_env_test.go @@ -12,8 +12,12 @@ import ( "context" "time" + //revive:disable:dot-imports . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + //revive:enable:dot-imports + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operators/constellation-node-operator/controllers/joiningnode_controller_env_test.go b/operators/constellation-node-operator/controllers/joiningnode_controller_env_test.go index 13f379d7a0..c447c446df 100644 --- a/operators/constellation-node-operator/controllers/joiningnode_controller_env_test.go +++ b/operators/constellation-node-operator/controllers/joiningnode_controller_env_test.go @@ -12,8 +12,12 @@ import ( "context" "time" + //revive:disable:dot-imports . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + //revive:enable:dot-imports + corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/operators/constellation-node-operator/controllers/nodeversion_controller_env_test.go b/operators/constellation-node-operator/controllers/nodeversion_controller_env_test.go index 12f05b37b2..e23609f478 100644 --- a/operators/constellation-node-operator/controllers/nodeversion_controller_env_test.go +++ b/operators/constellation-node-operator/controllers/nodeversion_controller_env_test.go @@ -13,8 +13,12 @@ import ( "fmt" "time" + //revive:disable:dot-imports . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + //revive:enable:dot-imports + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operators/constellation-node-operator/controllers/pendingnode_controller_env_test.go b/operators/constellation-node-operator/controllers/pendingnode_controller_env_test.go index e22eb1b3f2..d76af1bb99 100644 --- a/operators/constellation-node-operator/controllers/pendingnode_controller_env_test.go +++ b/operators/constellation-node-operator/controllers/pendingnode_controller_env_test.go @@ -13,8 +13,12 @@ import ( "net/http" "time" + //revive:disable:dot-imports . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + //revive:enable:dot-imports + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/operators/constellation-node-operator/controllers/scalinggroup_controller_env_test.go b/operators/constellation-node-operator/controllers/scalinggroup_controller_env_test.go index 003a3464b2..012ceed2b7 100644 --- a/operators/constellation-node-operator/controllers/scalinggroup_controller_env_test.go +++ b/operators/constellation-node-operator/controllers/scalinggroup_controller_env_test.go @@ -12,8 +12,12 @@ import ( "context" "time" + //revive:disable:dot-imports . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + //revive:enable:dot-imports + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/operators/constellation-node-operator/controllers/suite_test.go b/operators/constellation-node-operator/controllers/suite_test.go index a99a899e8a..2eec2840e1 100644 --- a/operators/constellation-node-operator/controllers/suite_test.go +++ b/operators/constellation-node-operator/controllers/suite_test.go @@ -14,16 +14,19 @@ import ( "testing" "time" - ctrl "sigs.k8s.io/controller-runtime" - - nodemaintenancev1beta1 "github.com/edgelesssys/constellation/v2/3rdparty/node-maintenance-operator/api/v1beta1" + //revive:disable:dot-imports . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + //revive:enable:dot-imports + + nodemaintenancev1beta1 "github.com/edgelesssys/constellation/v2/3rdparty/node-maintenance-operator/api/v1beta1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" testclock "k8s.io/utils/clock/testing" + ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" logf "sigs.k8s.io/controller-runtime/pkg/log" diff --git a/operators/constellation-node-operator/sgreconciler/scalinggroup_controller_env_test.go b/operators/constellation-node-operator/sgreconciler/scalinggroup_controller_env_test.go index b4dc2c68a8..d78c8eb853 100644 --- a/operators/constellation-node-operator/sgreconciler/scalinggroup_controller_env_test.go +++ b/operators/constellation-node-operator/sgreconciler/scalinggroup_controller_env_test.go @@ -12,9 +12,13 @@ import ( "context" "time" - cspapi "github.com/edgelesssys/constellation/v2/operators/constellation-node-operator/v2/internal/cloud/api" + //revive:disable:dot-imports . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + //revive:enable:dot-imports + + cspapi "github.com/edgelesssys/constellation/v2/operators/constellation-node-operator/v2/internal/cloud/api" "k8s.io/apimachinery/pkg/types" updatev1alpha1 "github.com/edgelesssys/constellation/v2/operators/constellation-node-operator/v2/api/v1alpha1" diff --git a/operators/constellation-node-operator/sgreconciler/suite_test.go b/operators/constellation-node-operator/sgreconciler/suite_test.go index 0c6a2eab6b..fc3dfe47f4 100644 --- a/operators/constellation-node-operator/sgreconciler/suite_test.go +++ b/operators/constellation-node-operator/sgreconciler/suite_test.go @@ -13,8 +13,12 @@ import ( "path/filepath" "testing" + //revive:disable:dot-imports . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" + + //revive:enable:dot-imports + appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes/scheme"