Fix lint errors

Used ginkgolinter.

Author: Zerpet

controllers/rabbitmqcluster_controller_test.go

@@ -65,7 +65,7 @@ var _ = Describe("RabbitmqClusterController", func() {
 			Eventually(func() bool {
 				err := client.Get(ctx, types.NamespacedName{Name: cluster.Name, Namespace: cluster.Namespace}, cluster)
 				return apierrors.IsNotFound(err)
-			}, 5).Should(BeTrue())
+			}, 5).Should(BeTrue(), "expected to delete cluster '%s' but it still exists", cluster.Name)
 		})
 
 		It("works", func() {
@@ -81,7 +81,7 @@ var _ = Describe("RabbitmqClusterController", func() {
 
 				Expect(sts.Name).To(Equal(cluster.ChildResourceName("server")))
 
-				Expect(len(sts.Spec.VolumeClaimTemplates)).To(Equal(1))
+				Expect(sts.Spec.VolumeClaimTemplates).To(HaveLen(1))
 				Expect(sts.Spec.VolumeClaimTemplates[0].Spec.StorageClassName).To(BeNil())
 			})
 
@@ -419,7 +419,7 @@ var _ = Describe("RabbitmqClusterController", func() {
 
 			sts := statefulSet(ctx, cluster)
 
-			Expect(len(sts.Spec.VolumeClaimTemplates)).To(Equal(1))
+			Expect(sts.Spec.VolumeClaimTemplates).To(HaveLen(1))
 			Expect(*sts.Spec.VolumeClaimTemplates[0].Spec.StorageClassName).To(Equal("my-storage-class"))
 			actualStorageCapacity := sts.Spec.VolumeClaimTemplates[0].Spec.Resources.Requests[corev1.ResourceStorage]
 			Expect(actualStorageCapacity).To(Equal(k8sresource.MustParse("100Gi")))
@@ -889,7 +889,7 @@ var _ = Describe("RabbitmqClusterController", func() {
 				"app.kubernetes.io/name": "rabbitmq-sts-override" + suffix,
 			}))
 
-			Expect(len(sts.Spec.VolumeClaimTemplates)).To(Equal(2))
+			Expect(sts.Spec.VolumeClaimTemplates).To(HaveLen(2))
 
 			Expect(sts.Spec.VolumeClaimTemplates[0].ObjectMeta.Name).To(Equal("persistence"))
 			Expect(sts.Spec.VolumeClaimTemplates[0].ObjectMeta.Namespace).To(Equal("default"))
@@ -1366,7 +1366,7 @@ func waitForClusterDeletion(ctx context.Context, rabbitmqCluster *rabbitmqv1beta
 			&rabbitmqClusterCreated,
 		)
 		return apierrors.IsNotFound(err)
-	}, ClusterDeletionTimeout, 1*time.Second).Should(BeTrue())
+	}, ClusterDeletionTimeout, 1*time.Second).Should(BeTrue(), "expected to delete cluster '%s' but it still exists", rabbitmqCluster.Name)
 
 }
 

controllers/reconcile_cli_test.go

@@ -1,9 +1,10 @@
 package controllers_test
 
 import (
-	"sigs.k8s.io/controller-runtime/pkg/envtest/komega"
 	"time"
 
+	"sigs.k8s.io/controller-runtime/pkg/envtest/komega"
+
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"
 
@@ -238,7 +239,7 @@ var _ = Describe("Reconcile CLI", func() {
 					Consistently(func() map[string]string {
 						rmq := &rabbitmqv1beta1.RabbitmqCluster{}
 						err := client.Get(ctx, types.NamespacedName{Name: cluster.Name, Namespace: cluster.Namespace}, rmq)
-						Expect(err).To(BeNil())
+						Expect(err).ToNot(HaveOccurred())
 						return rmq.ObjectMeta.Annotations
 					}, 5).ShouldNot(HaveKey("rabbitmq.com/queueRebalanceNeededAt"))
 				})
@@ -253,7 +254,7 @@ var _ = Describe("Reconcile CLI", func() {
 					Consistently(func() map[string]string {
 						rmq := &rabbitmqv1beta1.RabbitmqCluster{}
 						err := client.Get(ctx, types.NamespacedName{Name: cluster.Name, Namespace: cluster.Namespace}, rmq)
-						Expect(err).To(BeNil())
+						Expect(err).ToNot(HaveOccurred())
 						return rmq.ObjectMeta.Annotations
 					}, 5).ShouldNot(HaveKey("rabbitmq.com/queueRebalanceNeededAt"))
 					Expect(fakeExecutor.ExecutedCommands()).NotTo(ContainElement(command{"sh", "-c", "rabbitmq-queues rebalance all"}))
@@ -297,7 +298,7 @@ var _ = Describe("Reconcile CLI", func() {
 					Consistently(func() map[string]string {
 						rmq := &rabbitmqv1beta1.RabbitmqCluster{}
 						err := client.Get(ctx, types.NamespacedName{Name: cluster.Name, Namespace: cluster.Namespace}, rmq)
-						Expect(err).To(BeNil())
+						Expect(err).ToNot(HaveOccurred())
 						return rmq.ObjectMeta.Annotations
 					}, 5).ShouldNot(HaveKey("rabbitmq.com/queueRebalanceNeededAt"))
 				})
@@ -312,7 +313,7 @@ var _ = Describe("Reconcile CLI", func() {
 					Consistently(func() map[string]string {
 						rmq := &rabbitmqv1beta1.RabbitmqCluster{}
 						err := client.Get(ctx, types.NamespacedName{Name: cluster.Name, Namespace: cluster.Namespace}, rmq)
-						Expect(err).To(BeNil())
+						Expect(err).ToNot(HaveOccurred())
 						return rmq.ObjectMeta.Annotations
 					}, 5).ShouldNot(HaveKey("rabbitmq.com/queueRebalanceNeededAt"))
 					Expect(fakeExecutor.ExecutedCommands()).NotTo(ContainElement(command{"sh", "-c", "rabbitmq-queues rebalance all"}))

internal/resource/erlang_cookie_test.go

@@ -67,7 +67,7 @@ var _ = Describe("ErlangCookie", func() {
 
 		It("creates an erlang cookie that is base64 encoded and 24 characters", func() {
 			cookie, ok := secret.Data[".erlang.cookie"]
-			Expect(ok).NotTo(BeFalse())
+			Expect(ok).To(BeTrue())
 			decodedCookie, err := b64.URLEncoding.DecodeString(string(cookie))
 			Expect(err).NotTo(HaveOccurred())
 			Expect(decodedCookie).To(HaveLen(24))

internal/resource/statefulset_test.go

@@ -266,7 +266,7 @@ var _ = Describe("StatefulSet", func() {
 			stsBuilder := builder.StatefulSet()
 			Expect(stsBuilder.Update(statefulSet)).To(Succeed())
 
-			Expect(len(statefulSet.OwnerReferences)).To(Equal(1))
+			Expect(statefulSet.OwnerReferences).To(HaveLen(1))
 			Expect(statefulSet.OwnerReferences[0].Name).To(Equal(builder.Instance.Name))
 		})
 
@@ -1496,8 +1496,8 @@ default_pass = {{ .Data.data.password }}
 				Expect(stsBuilder.Update(statefulSet)).To(Succeed())
 
 				container := extractContainer(statefulSet.Spec.Template.Spec.Containers, "rabbitmq")
-				Expect(len(container.Resources.Requests)).To(Equal(0))
-				Expect(len(container.Resources.Limits)).To(Equal(0))
+				Expect(container.Resources.Requests).To(BeEmpty())
+				Expect(container.Resources.Limits).To(BeEmpty())
 			})
 		})
 

system_tests/utils_test.go

@@ -502,7 +502,7 @@ func kubernetesNodeIp(ctx context.Context, clientSet *kubernetes.Clientset) stri
 	nodes, err := clientSet.CoreV1().Nodes().List(ctx, metav1.ListOptions{})
 	ExpectWithOffset(1, err).NotTo(HaveOccurred())
 	ExpectWithOffset(1, nodes).ToNot(BeNil())
-	ExpectWithOffset(1, len(nodes.Items)).To(BeNumerically(">", 0))
+	ExpectWithOffset(1, nodes.Items).ToNot(BeEmpty())
 
 	var nodeIp string
 	for _, address := range nodes.Items[0].Status.Addresses {