chore(deps): bump golangci-lint from v1.51.2 to v1.53.3 (backport of #…

…7334) (#7847) chore(deps): bump golangci-lint from v1.51.2 to v1.53.3 (#7334) Signed-off-by: Mike Beaumont <mjboamail@gmail.com> Co-authored-by: Mike Beaumont <mjboamail@gmail.com>
kumahq · Sep 25, 2023 · 83fda8a · 83fda8a
1 parent b50dcdc
commit 83fda8a
Show file tree

Hide file tree

Showing 22 changed files with 38 additions and 65 deletions.
diff --git a/app/kumactl/cmd/get/get_test.go b/app/kumactl/cmd/get/get_test.go
@@ -73,7 +73,7 @@ var _ = Describe("kumactl get ", func() {
 		It("should have get commands for all defined types", func() {
 			// when
 			all := registry.Global().ObjectDescriptors(model.HasKumactlEnabled())
-			Expect(len(getCmd.Commands()) > len(all)).To(BeTrue())
+			Expect(len(getCmd.Commands())).To(BeNumerically(">", len(all)))
 
 			// then
 			for _, sub := range all {

diff --git a/mk/dependencies/deps.lock b/mk/dependencies/deps.lock
@@ -1 +1 @@
-7845b9a40ddd58573a26d21df57fc4973febe633
+174c47b656d937f3c8e42bdee90866ad6415afff
diff --git a/mk/dependencies/go-deps.sh b/mk/dependencies/go-deps.sh
@@ -13,7 +13,7 @@ for i in \
     ${PGV} \
     ${PGKUMADOC} \
     github.com/onsi/ginkgo/v2/ginkgo@$(go list -m github.com/onsi/ginkgo/v2 | cut -d ' ' -f2) \
-    github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.2 \
+    github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.3 \
     github.com/mikefarah/yq/v4@v4.27.2 \
     github.com/norwoodj/helm-docs/cmd/helm-docs@v1.11.0 \
     golang.stackrox.io/kube-linter/cmd/kube-linter@v0.0.0-20220513142942-846f273ed465; do

diff --git a/pkg/core/logs/matcher_test.go b/pkg/core/logs/matcher_test.go
@@ -17,7 +17,6 @@ import (
 )
 
 var _ = Describe("Matcher", func() {
-
 	var manager core_manager.ResourceManager
 	var matcher logs.TrafficLogsMatcher
 	var dpRes core_mesh.DataplaneResource
@@ -194,7 +193,7 @@ var _ = Describe("Matcher", func() {
 
 		// then
 		Expect(err).ToNot(HaveOccurred())
-		Expect(log).To(HaveLen(0))
+		Expect(log).To(BeEmpty())
 	})
 
 	It("should skip unknown backends", func() {

diff --git a/pkg/core/managers/apis/dataplaneinsight/dataplane_insight_manager_test.go b/pkg/core/managers/apis/dataplaneinsight/dataplane_insight_manager_test.go
@@ -16,7 +16,6 @@ import (
 )
 
 var _ = Describe("DataplaneInsight Manager", func() {
-
 	It("should limit the number of subscription", func() {
 		// setup
 		s := memory.NewStore()
@@ -77,7 +76,7 @@ var _ = Describe("DataplaneInsight Manager", func() {
 		Expect(err).ToNot(HaveOccurred())
 
 		// then
-		Expect(actual.Spec.Subscriptions).To(HaveLen(0))
+		Expect(actual.Spec.Subscriptions).To(BeEmpty())
 		Expect(actual.Spec.Subscriptions).To(BeNil())
 	})
 })
diff --git a/pkg/core/managers/apis/zoneegressinsight/zoneegressinsight_manager_test.go b/pkg/core/managers/apis/zoneegressinsight/zoneegressinsight_manager_test.go
@@ -17,7 +17,6 @@ import (
 )
 
 var _ = Describe("ZoneEgressInsight Manager", func() {
-
 	It("should limit the number of subscription", func() {
 		// setup
 		s := memory.NewStore()
@@ -78,7 +77,7 @@ var _ = Describe("ZoneEgressInsight Manager", func() {
 		Expect(err).ToNot(HaveOccurred())
 
 		// then
-		Expect(actual.Spec.Subscriptions).To(HaveLen(0))
+		Expect(actual.Spec.Subscriptions).To(BeEmpty())
 		Expect(actual.Spec.Subscriptions).To(BeNil())
 	})
 })
diff --git a/pkg/core/managers/apis/zoneingressinsight/zone_ingress_insight_manager_test.go b/pkg/core/managers/apis/zoneingressinsight/zone_ingress_insight_manager_test.go
@@ -17,7 +17,6 @@ import (
 )
 
 var _ = Describe("ZoneIngressInsight Manager", func() {
-
 	It("should limit the number of subscription", func() {
 		// setup
 		s := memory.NewStore()
@@ -78,7 +77,7 @@ var _ = Describe("ZoneIngressInsight Manager", func() {
 		Expect(err).ToNot(HaveOccurred())
 
 		// then
-		Expect(actual.Spec.Subscriptions).To(HaveLen(0))
+		Expect(actual.Spec.Subscriptions).To(BeEmpty())
 		Expect(actual.Spec.Subscriptions).To(BeNil())
 	})
 })
diff --git a/pkg/core/managers/apis/zoneinsight/zone_insight_manager_test.go b/pkg/core/managers/apis/zoneinsight/zone_insight_manager_test.go
@@ -17,7 +17,6 @@ import (
 )
 
 var _ = Describe("ZoneInsight Manager", func() {
-
 	It("should limit the number of subscription", func() {
 		// setup
 		s := memory.NewStore()
@@ -78,7 +77,7 @@ var _ = Describe("ZoneInsight Manager", func() {
 		Expect(err).ToNot(HaveOccurred())
 
 		// then
-		Expect(actual.Spec.Subscriptions).To(HaveLen(0))
+		Expect(actual.Spec.Subscriptions).To(BeEmpty())
 		Expect(actual.Spec.Subscriptions).To(BeNil())
 	})
 })
diff --git a/pkg/kds/server/components.go b/pkg/kds/server/components.go
@@ -21,14 +21,14 @@ import (
 )
 
 func New(log logr.Logger, rt core_runtime.Runtime, providedTypes []model.ResourceType, serverID string, refresh time.Duration, filter reconcile.ResourceFilter, mapper reconcile.ResourceMapper, insight bool) (Server, error) {
-	hasher, cache := newKDSContext(log)
+	hashFn, cache := newKDSContext(log)
 	generator := reconcile.NewSnapshotGenerator(rt.ReadOnlyResourceManager(), providedTypes, filter, mapper)
 	versioner := util_xds_v3.SnapshotAutoVersioner{UUID: core.NewUUID}
 	statsCallbacks, err := util_xds.NewStatsCallbacks(rt.Metrics(), "kds")
 	if err != nil {
 		return nil, err
 	}
-	reconciler := reconcile.NewReconciler(hasher, cache, generator, versioner, rt.Config().Mode, statsCallbacks)
+	reconciler := reconcile.NewReconciler(hashFn, cache, generator, versioner, rt.Config().Mode, statsCallbacks)
 	syncTracker, err := newSyncTracker(log, reconciler, refresh, rt.Metrics())
 	if err != nil {
 		return nil, err
@@ -103,15 +103,8 @@ func newSyncTracker(log logr.Logger, reconciler reconcile.Reconciler, refresh ti
 	}), nil
 }
 
-func newKDSContext(log logr.Logger) (envoy_cache.NodeHash, util_xds_v3.SnapshotCache) {
-	hasher := hasher{}
+func newKDSContext(log logr.Logger) (envoy_cache.NodeHash, util_xds_v3.SnapshotCache) { //nolint:unparam
+	hashFn := util_xds_v3.IDHash{}
 	logger := util_xds.NewLogger(log)
-	return hasher, util_xds_v3.NewSnapshotCache(false, hasher, logger)
-}
-
-type hasher struct {
-}
-
-func (_ hasher) ID(node *envoy_core.Node) string {
-	return node.Id
+	return hashFn, util_xds_v3.NewSnapshotCache(false, hashFn, logger)
 }
diff --git a/pkg/mads/server/server_test.go b/pkg/mads/server/server_test.go
@@ -50,7 +50,6 @@ func (t *testRuntime) Metrics() metrics.Metrics {
 }
 
 var _ = Describe("MADS Server", func() {
-
 	var rt *testRuntime
 	var stopCh chan struct{}
 	var errCh chan error
@@ -105,7 +104,7 @@ var _ = Describe("MADS Server", func() {
 
 		assignments, err := stream.WaitForAssignments()
 		Expect(err).ToNot(HaveOccurred())
-		Expect(assignments).To(HaveLen(0))
+		Expect(assignments).To(BeEmpty())
 	})
 
 	It("should serve HTTP/1.1 requests", func() {

diff --git a/pkg/plugins/resources/k8s/store_test.go b/pkg/plugins/resources/k8s/store_test.go
@@ -21,13 +21,12 @@ import (
 )
 
 var _ = Describe("KubernetesStore", func() {
-
 	var ks *k8s.KubernetesStore
 	var s store.ResourceStore
 	const name = "demo"
 	const mesh = "default"
 
-	var backend = struct {
+	backend := struct {
 		ParseYAML       func(yaml string) client.Object
 		Create          func(obj client.Object)
 		Get             func(obj client.Object, ns, name string)
@@ -580,7 +579,7 @@ var _ = Describe("KubernetesStore", func() {
 			// then
 			Expect(err).ToNot(HaveOccurred())
 			// and
-			Expect(trl.Items).To(HaveLen(0))
+			Expect(trl.Items).To(BeEmpty())
 		})
 
 		It("should return a list of matching resource", func() {
@@ -702,7 +701,6 @@ var _ = Describe("KubernetesStore", func() {
 			Expect(err).ToNot(HaveOccurred())
 			// and
 			backend.AssertNotExists(&mesh_k8s.Mesh{}, "", "demo")
-
 		})
 
 		It("should return a list of matching Meshes", func() {

diff --git a/pkg/plugins/runtime/k8s/controllers/namespace_controller_test.go b/pkg/plugins/runtime/k8s/controllers/namespace_controller_test.go
@@ -21,7 +21,6 @@ import (
 )
 
 var _ = Describe("NamespaceReconciler", func() {
-
 	var kubeClient kube_client.Client
 	var reconciler kube_reconcile.Reconciler
 
@@ -167,7 +166,7 @@ var _ = Describe("NamespaceReconciler", func() {
 		nads := &v1.NetworkAttachmentDefinitionList{}
 		err = kubeClient.List(context.Background(), nads)
 		Expect(err).ToNot(HaveOccurred())
-		Expect(nads.Items).To(HaveLen(0))
+		Expect(nads.Items).To(BeEmpty())
 	})
 
 	It("should ignore namespace namespaces without label", func() {
@@ -190,7 +189,7 @@ var _ = Describe("NamespaceReconciler", func() {
 		nads := &v1.NetworkAttachmentDefinitionList{}
 		err = kubeClient.List(context.Background(), nads)
 		Expect(err).ToNot(HaveOccurred())
-		Expect(nads.Items).To(HaveLen(0))
+		Expect(nads.Items).To(BeEmpty())
 	})
 
 	It("should skip creating NetworkAttachmentDefinition when CRD is absent in the cluster", func() {
@@ -213,7 +212,6 @@ var _ = Describe("NamespaceReconciler", func() {
 		nads := &v1.NetworkAttachmentDefinitionList{}
 		err = kubeClient.List(context.Background(), nads)
 		Expect(err).ToNot(HaveOccurred())
-		Expect(nads.Items).To(HaveLen(0))
+		Expect(nads.Items).To(BeEmpty())
 	})
-
 })
diff --git a/pkg/plugins/runtime/k8s/controllers/pod_controller_test.go b/pkg/plugins/runtime/k8s/controllers/pod_controller_test.go
@@ -31,7 +31,6 @@ import (
 )
 
 var _ = Describe("PodReconciler", func() {
-
 	var kubeClient kube_client.Client
 	var reconciler kube_reconcile.Reconciler
 
@@ -308,7 +307,7 @@ var _ = Describe("PodReconciler", func() {
 		// then
 		Expect(err).ToNot(HaveOccurred())
 		// and
-		Expect(dataplanes.Items).To(HaveLen(0))
+		Expect(dataplanes.Items).To(BeEmpty())
 	})
 
 	It("should ignore Pods without Kuma sidecar", func() {
@@ -331,7 +330,7 @@ var _ = Describe("PodReconciler", func() {
 		// then
 		Expect(err).ToNot(HaveOccurred())
 		// and
-		Expect(dataplanes.Items).To(HaveLen(0))
+		Expect(dataplanes.Items).To(BeEmpty())
 	})
 
 	It("should not reconcile Ingress with namespace other than system", func() {
@@ -408,7 +407,7 @@ var _ = Describe("PodReconciler", func() {
 		// then
 		Expect(err).ToNot(HaveOccurred())
 		// and
-		Expect(dataplanes.Items).To(HaveLen(0))
+		Expect(dataplanes.Items).To(BeEmpty())
 	})
 
 	It("should ignore Pods without IP address", func() {
@@ -431,7 +430,7 @@ var _ = Describe("PodReconciler", func() {
 		// then
 		Expect(err).ToNot(HaveOccurred())
 		// and
-		Expect(dataplanes.Items).To(HaveLen(0))
+		Expect(dataplanes.Items).To(BeEmpty())
 	})
 
 	It("should generate Dataplane resource for every Pod that has Kuma sidecar injected", func() {

diff --git a/pkg/plugins/secrets/k8s/store_test.go b/pkg/plugins/secrets/k8s/store_test.go
@@ -22,13 +22,12 @@ import (
 )
 
 var _ = Describe("KubernetesStore", func() {
-
 	var s secret_store.SecretStore
 	var ns string // each test should run in a dedicated k8s namespace
 	const name = "demo"
 	const noMesh = ""
 
-	var backend = struct {
+	backend := struct {
 		ParseYAML       func(yaml string) client.Object
 		Create          func(obj client.Object)
 		Get             func(obj client.Object, ns, name string)
@@ -646,7 +645,7 @@ var _ = Describe("KubernetesStore", func() {
 			// then
 			Expect(err).ToNot(HaveOccurred())
 			// and
-			Expect(secrets.Items).To(HaveLen(0))
+			Expect(secrets.Items).To(BeEmpty())
 		})
 
 		Describe("with resources loaded", func() {
@@ -756,6 +755,5 @@ var _ = Describe("KubernetesStore", func() {
 				Expect(string(secrets.Items[0].Spec.Data.Value)).To(Equal("four"))
 			})
 		})
-
 	})
 })
diff --git a/pkg/xds/sync/dataplane_watchdog_test.go b/pkg/xds/sync/dataplane_watchdog_test.go
@@ -111,7 +111,7 @@ var _ = Describe("Dataplane Watchdog", func() {
 		var ctx context.Context
 
 		BeforeEach(func() {
-			Expect(samples.MeshDefaultBuilder().Create(resManager))
+			Expect(samples.MeshDefaultBuilder().Create(resManager)).To(Succeed())
 			Expect(samples.DataplaneBackendBuilder().Create(resManager)).To(Succeed())
 			resKey = core_model.MetaToResourceKey(samples.DataplaneBackend().GetMeta())
 

diff --git a/test/e2e_env/kubernetes/gateway/resources.go b/test/e2e_env/kubernetes/gateway/resources.go
@@ -143,7 +143,7 @@ spec:
 
 			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(response.Instance).To(Equal("kubernetes"))
-		}, "20s", "1s")
+		}, "20s", "1s").Should(Succeed())
 
 		By("allowing more than 1 connection without a limit")
 

diff --git a/test/e2e_env/kubernetes/meshtrafficpermission/api.go b/test/e2e_env/kubernetes/meshtrafficpermission/api.go
@@ -35,7 +35,7 @@ func API() {
 		// given no MeshTrafficPermissions
 		mtps, err := env.Cluster.GetKumactlOptions().KumactlList("meshtrafficpermissions", meshName)
 		Expect(err).ToNot(HaveOccurred())
-		Expect(mtps).To(HaveLen(0))
+		Expect(mtps).To(BeEmpty())
 
 		// when
 		Expect(YamlK8s(fmt.Sprintf(`
@@ -80,7 +80,7 @@ spec:
 		// given no MeshTrafficPermissions
 		mtps, err := env.Cluster.GetKumactlOptions().KumactlList("meshtrafficpermissions", meshName)
 		Expect(err).ToNot(HaveOccurred())
-		Expect(mtps).To(HaveLen(0))
+		Expect(mtps).To(BeEmpty())
 
 		// when
 		err = k8s.KubectlApplyFromStringE(

diff --git a/test/e2e_env/kubernetes/observability/applications_metrics.go b/test/e2e_env/kubernetes/observability/applications_metrics.go
@@ -141,8 +141,8 @@ func ApplicationsMetrics() {
 	})
 	E2EAfterAll(func() {
 		Expect(env.Cluster.TriggerDeleteNamespace(namespace)).To(Succeed())
-		Expect(env.Cluster.DeleteMesh(mesh))
-		Expect(env.Cluster.DeleteMesh(meshNoAggregate))
+		Expect(env.Cluster.DeleteMesh(mesh)).To(Succeed())
+		Expect(env.Cluster.DeleteMesh(meshNoAggregate)).To(Succeed())
 	})
 
 	It("should scrape metrics defined in mesh and not fail when defined service doesn't exist", func() {

diff --git a/test/e2e_env/kubernetes/reachableservices/reachableservices.go b/test/e2e_env/kubernetes/reachableservices/reachableservices.go
@@ -44,7 +44,7 @@ func ReachableServices() {
 
 	E2EAfterAll(func() {
 		Expect(env.Cluster.TriggerDeleteNamespace(namespace)).To(Succeed())
-		Expect(env.Cluster.DeleteMesh(meshName))
+		Expect(env.Cluster.DeleteMesh(meshName)).To(Succeed())
 	})
 
 	It("should be able to connect to reachable services", func() {

diff --git a/test/e2e_env/kubernetes/virtualoutbound/virtualoutbound.go b/test/e2e_env/kubernetes/virtualoutbound/virtualoutbound.go
@@ -31,7 +31,7 @@ func VirtualOutbound() {
 
 	E2EAfterAll(func() {
 		Expect(env.Cluster.TriggerDeleteNamespace(namespace)).To(Succeed())
-		Expect(env.Cluster.DeleteMesh(meshName))
+		Expect(env.Cluster.DeleteMesh(meshName)).To(Succeed())
 	})
 
 	BeforeEach(func() {

diff --git a/test/e2e_env/universal/mtls/mtls.go b/test/e2e_env/universal/mtls/mtls.go
@@ -110,9 +110,9 @@ mtls:
 		// We must start client before server to test this properly. The client
 		// should get XDS refreshes first to trigger the race condition fixed by
 		// kumahq/kuma#3019
-		Expect(env.Cluster.Install(DemoClientUniversal("demo-client", meshName, WithTransparentProxy(true))))
+		Expect(env.Cluster.Install(DemoClientUniversal("demo-client", meshName, WithTransparentProxy(true)))).To(Succeed())
 
-		Expect(env.Cluster.Install(TestServerUniversal("test-server", meshName, WithArgs([]string{"echo", "--instance", "echo-v1"}))))
+		Expect(env.Cluster.Install(TestServerUniversal("test-server", meshName, WithArgs([]string{"echo", "--instance", "echo-v1"})))).To(Succeed())
 
 		By("Check inside-mesh communication")
 		trafficAllowed("test-server.mesh")
@@ -128,7 +128,7 @@ mtls:
   - name: ca-1
     type: builtin
     mode: PERMISSIVE`, meshName)
-		Expect(env.Cluster.Install(YamlUniversal(meshYaml)))
+		Expect(env.Cluster.Install(YamlUniversal(meshYaml))).To(Succeed())
 
 		By("inside-mesh communication never fails")
 		Consistently(func(g Gomega) {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		7845b9a40ddd58573a26d21df57fc4973febe633
		174c47b656d937f3c8e42bdee90866ad6415afff