Merge pull request #1736 from rabbitmq/fix/linter

Fix linter errors

Author: Zerpet

Diff for: api/v1beta1/rabbitmqcluster_types.go

@@ -16,7 +16,6 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 
 	corev1 "k8s.io/api/core/v1"
-	v1 "k8s.io/api/core/v1"
 	k8sresource "k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -107,8 +106,8 @@ type RabbitmqClusterSpec struct {
 // Future secret backends could be Secrets Store CSI Driver.
 // If not configured, K8s Secrets will be used.
 type SecretBackend struct {
-	Vault          *VaultSpec              `json:"vault,omitempty"`
-	ExternalSecret v1.LocalObjectReference `json:"externalSecret,omitempty"`
+	Vault          *VaultSpec                  `json:"vault,omitempty"`
+	ExternalSecret corev1.LocalObjectReference `json:"externalSecret,omitempty"`
 }
 
 // VaultSpec will add Vault annotations (see https://www.vaultproject.io/docs/platform/k8s/injector/annotations)
@@ -500,15 +499,15 @@ type RabbitmqClusterList struct {
 	Items []RabbitmqCluster `json:"items"`
 }
 
-func (cluster RabbitmqCluster) ChildResourceName(name string) string {
+func (cluster *RabbitmqCluster) ChildResourceName(name string) string {
 	return strings.TrimSuffix(strings.Join([]string{cluster.Name, name}, "-"), "-")
 }
 
-func (cluster RabbitmqCluster) PVCName(i int) string {
+func (cluster *RabbitmqCluster) PVCName(i int) string {
 	return strings.Join([]string{"persistence", cluster.Name, "server", strconv.Itoa(i)}, "-")
 }
 
-func (cluster RabbitmqCluster) DisableDefaultTopologySpreadConstraints() bool {
+func (cluster *RabbitmqCluster) DisableDefaultTopologySpreadConstraints() bool {
 	value, ok := cluster.Annotations[DisableDefaultTopologySpreadAnnotation]
 	if ok && strings.TrimSpace(value) == "true" {
 		return true

Diff for: api/v1beta1/rabbitmqcluster_types_test.go

@@ -14,7 +14,6 @@ import (
 	"github.com/rabbitmq/cluster-operator/v2/internal/status"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
 	k8sresource "k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/utils/ptr"
@@ -26,7 +25,6 @@ import (
 )
 
 var _ = Describe("RabbitmqCluster", func() {
-
 	Context("RabbitmqClusterSpec", func() {
 		It("can be created with a single replica", func() {
 			created := generateRabbitmqClusterObject("rabbit1")
@@ -69,11 +67,11 @@ var _ = Describe("RabbitmqCluster", func() {
 		It("can be created with resource requests", func() {
 			created := generateRabbitmqClusterObject("rabbit-resource-request")
 			created.Spec.Resources = &corev1.ResourceRequirements{
-				Limits: map[corev1.ResourceName]resource.Quantity{
+				Limits: map[corev1.ResourceName]k8sresource.Quantity{
 					corev1.ResourceCPU:    k8sresource.MustParse("100m"),
 					corev1.ResourceMemory: k8sresource.MustParse("100Mi"),
 				},
-				Requests: map[corev1.ResourceName]resource.Quantity{
+				Requests: map[corev1.ResourceName]k8sresource.Quantity{
 					corev1.ResourceCPU:    k8sresource.MustParse("100m"),
 					corev1.ResourceMemory: k8sresource.MustParse("100Mi"),
 				},
@@ -116,7 +114,7 @@ var _ = Describe("RabbitmqCluster", func() {
 			Expect(created.MemoryLimited()).To(BeTrue())
 
 			created.Spec.Resources = &corev1.ResourceRequirements{
-				Limits: map[corev1.ResourceName]resource.Quantity{},
+				Limits: map[corev1.ResourceName]k8sresource.Quantity{},
 			}
 			Expect(created.MemoryLimited()).To(BeFalse())
 		})
@@ -464,11 +462,11 @@ var _ = Describe("RabbitmqCluster", func() {
 			statefulset.Spec.Template.Spec.Containers = []corev1.Container{
 				{
 					Resources: corev1.ResourceRequirements{
-						Limits: map[corev1.ResourceName]resource.Quantity{
-							"memory": resource.MustParse("100Mi"),
+						Limits: map[corev1.ResourceName]k8sresource.Quantity{
+							"memory": k8sresource.MustParse("100Mi"),
 						},
-						Requests: map[corev1.ResourceName]resource.Quantity{
-							"memory": resource.MustParse("100Mi"),
+						Requests: map[corev1.ResourceName]k8sresource.Quantity{
+							"memory": k8sresource.MustParse("100Mi"),
 						},
 					},
 				},

Diff for: controllers/rabbitmqcluster_controller.go

@@ -135,7 +135,7 @@ func (r *RabbitmqClusterReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	}
 
 	tlsErr := r.reconcileTLS(ctx, rabbitmqCluster)
-	if errors.Is(tlsErr, disableNonTLSConfigErr) {
+	if errors.Is(tlsErr, errDisableNonTLSConfig) {
 		return ctrl.Result{}, nil
 	} else if tlsErr != nil {
 		return ctrl.Result{}, tlsErr

Diff for: controllers/reconcile_tls.go

@@ -13,16 +13,16 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 )
 
-var disableNonTLSConfigErr = errors.New("TLS must be enabled if disableNonTLSListeners is set to true")
+var errDisableNonTLSConfig = errors.New("TLS must be enabled if disableNonTLSListeners is set to true")
 
 func (r *RabbitmqClusterReconciler) reconcileTLS(ctx context.Context, rabbitmqCluster *rabbitmqv1beta1.RabbitmqCluster) error {
 	// if tls.disableNonTLSListeners set to true and TLS is not enabled, it's a configuration error
 	// reconcileTLS() will return a special error so the operator won't requeue
 	if rabbitmqCluster.DisableNonTLSListeners() && !rabbitmqCluster.TLSEnabled() {
-		r.Recorder.Event(rabbitmqCluster, corev1.EventTypeWarning, "TLSError", disableNonTLSConfigErr.Error())
-		ctrl.LoggerFrom(ctx).Error(disableNonTLSConfigErr, "Error setting up TLS")
-		r.setReconcileSuccess(ctx, rabbitmqCluster, corev1.ConditionFalse, "TLSError", disableNonTLSConfigErr.Error())
-		return disableNonTLSConfigErr
+		r.Recorder.Event(rabbitmqCluster, corev1.EventTypeWarning, "TLSError", errDisableNonTLSConfig.Error())
+		ctrl.LoggerFrom(ctx).Error(errDisableNonTLSConfig, "Error setting up TLS")
+		r.setReconcileSuccess(ctx, rabbitmqCluster, corev1.ConditionFalse, "TLSError", errDisableNonTLSConfig.Error())
+		return errDisableNonTLSConfig
 	}
 
 	if rabbitmqCluster.SecretTLSEnabled() {

Diff for: internal/resource/default_user_secret_test.go

@@ -12,15 +12,13 @@ package resource_test
 import (
 	b64 "encoding/base64"
 	"fmt"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/v2/api/v1beta1"
 	"github.com/rabbitmq/cluster-operator/v2/internal/resource"
 	"gopkg.in/ini.v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	defaultscheme "k8s.io/client-go/kubernetes/scheme"
 )
@@ -39,7 +37,7 @@ var _ = Describe("DefaultUserSecret", func() {
 		Expect(rabbitmqv1beta1.AddToScheme(scheme)).To(Succeed())
 		Expect(defaultscheme.AddToScheme(scheme)).To(Succeed())
 		instance = rabbitmqv1beta1.RabbitmqCluster{
-			ObjectMeta: v1.ObjectMeta{
+			ObjectMeta: metav1.ObjectMeta{
 				Name:      "a name",
 				Namespace: "a namespace",
 			},

Diff for: internal/resource/erlang_cookie_test.go

@@ -11,12 +11,10 @@ package resource_test
 
 import (
 	b64 "encoding/base64"
-
 	"k8s.io/apimachinery/pkg/runtime"
 	defaultscheme "k8s.io/client-go/kubernetes/scheme"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -39,7 +37,7 @@ var _ = Describe("ErlangCookie", func() {
 		Expect(rabbitmqv1beta1.AddToScheme(scheme)).To(Succeed())
 		Expect(defaultscheme.AddToScheme(scheme)).To(Succeed())
 		instance = rabbitmqv1beta1.RabbitmqCluster{
-			ObjectMeta: v1.ObjectMeta{
+			ObjectMeta: metav1.ObjectMeta{
 				Name:      "a name",
 				Namespace: "a namespace",
 			},

Diff for: internal/resource/rabbitmq_plugins_test.go

@@ -13,11 +13,9 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/v2/api/v1beta1"
-	"github.com/rabbitmq/cluster-operator/v2/internal/resource"
-	. "github.com/rabbitmq/cluster-operator/v2/internal/resource"
+	rmqresource "github.com/rabbitmq/cluster-operator/v2/internal/resource"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	defaultscheme "k8s.io/client-go/kubernetes/scheme"
 )
@@ -27,15 +25,15 @@ var _ = Describe("RabbitMQPlugins", func() {
 	Context("DesiredPlugins", func() {
 		When("AdditionalPlugins is empty", func() {
 			It("returns list of required plugins", func() {
-				plugins := NewRabbitmqPlugins(nil)
+				plugins := rmqresource.NewRabbitmqPlugins(nil)
 				Expect(plugins.DesiredPlugins()).To(ConsistOf([]string{"rabbitmq_peer_discovery_k8s", "rabbitmq_prometheus", "rabbitmq_management"}))
 			})
 		})
 
 		When("AdditionalPlugins are provided", func() {
 			It("returns a concatenated list of plugins", func() {
 				morePlugins := []rabbitmqv1beta1.Plugin{"rabbitmq_shovel", "my_great_plugin"}
-				plugins := NewRabbitmqPlugins(morePlugins)
+				plugins := rmqresource.NewRabbitmqPlugins(morePlugins)
 
 				Expect(plugins.DesiredPlugins()).To(ConsistOf([]string{"rabbitmq_peer_discovery_k8s",
 					"rabbitmq_prometheus",
@@ -49,7 +47,7 @@ var _ = Describe("RabbitMQPlugins", func() {
 		When("AdditionalPlugins are provided with duplicates", func() {
 			It("returns a unique list of plugins", func() {
 				morePlugins := []rabbitmqv1beta1.Plugin{"rabbitmq_management", "rabbitmq_shovel", "my_great_plugin", "rabbitmq_shovel"}
-				plugins := NewRabbitmqPlugins(morePlugins)
+				plugins := rmqresource.NewRabbitmqPlugins(morePlugins)
 
 				Expect(plugins.DesiredPlugins()).To(ConsistOf([]string{"rabbitmq_peer_discovery_k8s",
 					"rabbitmq_prometheus",
@@ -64,8 +62,8 @@ var _ = Describe("RabbitMQPlugins", func() {
 	Context("PluginsConfigMap", func() {
 		var (
 			instance         rabbitmqv1beta1.RabbitmqCluster
-			configMapBuilder *resource.RabbitmqPluginsConfigMapBuilder
-			builder          *resource.RabbitmqResourceBuilder
+			configMapBuilder *rmqresource.RabbitmqPluginsConfigMapBuilder
+			builder          *rmqresource.RabbitmqResourceBuilder
 			scheme           *runtime.Scheme
 		)
 
@@ -74,12 +72,12 @@ var _ = Describe("RabbitMQPlugins", func() {
 			Expect(rabbitmqv1beta1.AddToScheme(scheme)).To(Succeed())
 			Expect(defaultscheme.AddToScheme(scheme)).To(Succeed())
 			instance = rabbitmqv1beta1.RabbitmqCluster{
-				ObjectMeta: v1.ObjectMeta{
+				ObjectMeta: metav1.ObjectMeta{
 					Name:      "a name",
 					Namespace: "a namespace",
 				},
 			}
-			builder = &resource.RabbitmqResourceBuilder{
+			builder = &rmqresource.RabbitmqResourceBuilder{
 				Instance: &instance,
 				Scheme:   scheme,
 			}

Diff for: internal/resource/rabbitmq_resource_builder_test.go

@@ -14,7 +14,6 @@ import (
 	. "github.com/onsi/gomega"
 	rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/v2/api/v1beta1"
 	"github.com/rabbitmq/cluster-operator/v2/internal/resource"
-	. "github.com/rabbitmq/cluster-operator/v2/internal/resource"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	defaultscheme "k8s.io/client-go/kubernetes/scheme"
@@ -49,17 +48,17 @@ var _ = Describe("RabbitmqResourceBuilder", func() {
 
 			Expect(resourceBuilders).To(HaveLen(10))
 
-			expectedBuildersInOrder := []ResourceBuilder{
-				&HeadlessServiceBuilder{},
-				&ServiceBuilder{},
-				&ErlangCookieBuilder{},
-				&DefaultUserSecretBuilder{},
-				&RabbitmqPluginsConfigMapBuilder{},
-				&ServerConfigMapBuilder{},
-				&ServiceAccountBuilder{},
-				&RoleBuilder{},
-				&RoleBindingBuilder{},
-				&StatefulSetBuilder{},
+			expectedBuildersInOrder := []resource.ResourceBuilder{
+				&resource.HeadlessServiceBuilder{},
+				&resource.ServiceBuilder{},
+				&resource.ErlangCookieBuilder{},
+				&resource.DefaultUserSecretBuilder{},
+				&resource.RabbitmqPluginsConfigMapBuilder{},
+				&resource.ServerConfigMapBuilder{},
+				&resource.ServiceAccountBuilder{},
+				&resource.RoleBuilder{},
+				&resource.RoleBindingBuilder{},
+				&resource.StatefulSetBuilder{},
 			}
 
 			for i, resourceBuilder := range resourceBuilders {
@@ -77,7 +76,7 @@ var _ = Describe("RabbitmqResourceBuilder", func() {
 			It("returns all resource builders except for defaultUser K8s Secret", func() {
 				resourceBuilders := builder.ResourceBuilders()
 				Expect(resourceBuilders).To(HaveLen(9))
-				Expect(resourceBuilders).NotTo(ContainElement(BeAssignableToTypeOf(&DefaultUserSecretBuilder{})))
+				Expect(resourceBuilders).NotTo(ContainElement(BeAssignableToTypeOf(&resource.DefaultUserSecretBuilder{})))
 			})
 		})
 	})

Diff for: internal/resource/role_binding_test.go

@@ -16,7 +16,6 @@ import (
 	"github.com/rabbitmq/cluster-operator/v2/internal/resource"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	defaultscheme "k8s.io/client-go/kubernetes/scheme"
 )
@@ -35,7 +34,7 @@ var _ = Describe("RoleBinding", func() {
 		Expect(rabbitmqv1beta1.AddToScheme(scheme)).To(Succeed())
 		Expect(defaultscheme.AddToScheme(scheme)).To(Succeed())
 		instance = rabbitmqv1beta1.RabbitmqCluster{
-			ObjectMeta: v1.ObjectMeta{
+			ObjectMeta: metav1.ObjectMeta{
 				Name:      "a name",
 				Namespace: "a namespace",
 			},

Diff for: internal/resource/role_test.go

@@ -16,7 +16,6 @@ import (
 	"github.com/rabbitmq/cluster-operator/v2/internal/resource"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	defaultscheme "k8s.io/client-go/kubernetes/scheme"
 )
@@ -35,7 +34,7 @@ var _ = Describe("Role", func() {
 		Expect(rabbitmqv1beta1.AddToScheme(scheme)).To(Succeed())
 		Expect(defaultscheme.AddToScheme(scheme)).To(Succeed())
 		instance = rabbitmqv1beta1.RabbitmqCluster{
-			ObjectMeta: v1.ObjectMeta{
+			ObjectMeta: metav1.ObjectMeta{
 				Name:      "a name",
 				Namespace: "a namespace",
 			},

Diff for: internal/resource/service_account_test.go

@@ -16,7 +16,6 @@ import (
 	"github.com/rabbitmq/cluster-operator/v2/internal/resource"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	defaultscheme "k8s.io/client-go/kubernetes/scheme"
 )
@@ -35,7 +34,7 @@ var _ = Describe("ServiceAccount", func() {
 		Expect(rabbitmqv1beta1.AddToScheme(scheme)).To(Succeed())
 		Expect(defaultscheme.AddToScheme(scheme)).To(Succeed())
 		instance = rabbitmqv1beta1.RabbitmqCluster{
-			ObjectMeta: v1.ObjectMeta{
+			ObjectMeta: metav1.ObjectMeta{
 				Name:      "a name",
 				Namespace: "a namespace",
 			},

Diff for: internal/resource/service_test.go

@@ -16,7 +16,6 @@ import (
 	"github.com/rabbitmq/cluster-operator/v2/internal/resource"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	defaultscheme "k8s.io/client-go/kubernetes/scheme"
@@ -875,7 +874,7 @@ var _ = Context("Services", func() {
 
 func updateServiceWithAnnotations(rmqBuilder resource.RabbitmqResourceBuilder, instanceAnnotations, serviceAnnotations map[string]string) *corev1.Service {
 	instance := &rabbitmqv1beta1.RabbitmqCluster{
-		ObjectMeta: v1.ObjectMeta{
+		ObjectMeta: metav1.ObjectMeta{
 			Name:        "foo",
 			Namespace:   "foo-namespace",
 			Annotations: instanceAnnotations,