Merge pull request openstack-k8s-operators#188 from gibizer/full-golangci-lint

openshift-merge-bot[bot] · web-flow · commit 99face71256b · 2024-02-19T15:35:39.000Z
Ensure golangci-lint runs on all files
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -51,5 +51,5 @@ repos:
 - repo: https://github.com/golangci/golangci-lint
   rev: v1.55.2
   hooks:
-    - id: golangci-lint
+    - id: golangci-lint-full
       args: ["-v"]
diff --git a/apis/memcached/v1beta1/webhook_suite_test.go b/apis/memcached/v1beta1/webhook_suite_test.go
@@ -25,8 +25,8 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports
+	. "github.com/onsi/gomega"    //revive:disable:dot-imports
 
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 	//+kubebuilder:scaffold:imports
diff --git a/apis/redis/v1beta1/webhook_suite_test.go b/apis/redis/v1beta1/webhook_suite_test.go
@@ -25,8 +25,8 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports
+	. "github.com/onsi/gomega"    //revive:disable:dot-imports
 
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 	//+kubebuilder:scaffold:imports
diff --git a/controllers/memcached/suite_test.go b/controllers/memcached/suite_test.go
@@ -20,8 +20,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports
+	. "github.com/onsi/gomega"    //revive:disable:dot-imports
 
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
diff --git a/controllers/network/ipset_controller.go b/controllers/network/ipset_controller.go
@@ -148,7 +148,7 @@ func (r *IPSetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (resu
 }
 
 // SetupWithManager sets up the controller with the Manager.
-func (r *IPSetReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
+func (r *IPSetReconciler) SetupWithManager(_ context.Context, mgr ctrl.Manager) error {
 	ipsetFN := handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, o client.Object) []reconcile.Request {
 		Log := r.GetLogger(ctx)
 		result := []reconcile.Request{}
@@ -316,7 +316,6 @@ func (r *IPSetReconciler) getReservation(ctx context.Context, instance *networkv
 func (r *IPSetReconciler) patchReservation(
 	ctx context.Context,
 	helper *helper.Helper,
-	ipset *networkv1.IPSet,
 	name types.NamespacedName,
 	labels map[string]string,
 	spec networkv1.ReservationSpec,
@@ -381,7 +380,6 @@ func (r *IPSetReconciler) ensureReservation(
 		reservation, _err = r.patchReservation(
 			ctx,
 			helper,
-			ipset,
 			reservationName,
 			reservationLabels,
 			reservationSpec,
diff --git a/controllers/rabbitmq/suite_test.go b/controllers/rabbitmq/suite_test.go
@@ -20,8 +20,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports
+	. "github.com/onsi/gomega"    //revive:disable:dot-imports
 
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
diff --git a/controllers/rabbitmq/transporturl_controller.go b/controllers/rabbitmq/transporturl_controller.go
@@ -362,7 +362,7 @@ func (r *TransportURLReconciler) findObjectsForSrc(ctx context.Context, src clie
 			FieldSelector: fields.OneTermEqualSelector(field, src.GetName()),
 			Namespace:     src.GetNamespace(),
 		}
-		err := r.List(context.TODO(), crList, listOps)
+		err := r.List(ctx, crList, listOps)
 		if err != nil {
 			return []reconcile.Request{}
 		}
diff --git a/controllers/redis/redis_controller.go b/controllers/redis/redis_controller.go
@@ -27,8 +27,11 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	"github.com/go-logr/logr"
@@ -407,11 +410,16 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&corev1.ServiceAccount{}).
 		Owns(&rbacv1.Role{}).
 		Owns(&rbacv1.RoleBinding{}).
+		Watches(
+			&corev1.Secret{},
+			handler.EnqueueRequestsFromMapFunc(r.findObjectsForSrc),
+			builder.WithPredicates(predicate.ResourceVersionChangedPredicate{}),
+		).
 		Complete(r)
 }
 
 // findObjectsForSrc - returns a reconcile request if the object is referenced by a Redis CR
-func (r *Reconciler) findObjectsForSrc(src client.Object) []reconcile.Request {
+func (r *Reconciler) findObjectsForSrc(ctx context.Context, src client.Object) []reconcile.Request {
 	requests := []reconcile.Request{}
 
 	for _, field := range allWatchFields {
@@ -420,7 +428,7 @@ func (r *Reconciler) findObjectsForSrc(src client.Object) []reconcile.Request {
 			FieldSelector: fields.OneTermEqualSelector(field, src.GetName()),
 			Namespace:     src.GetNamespace(),
 		}
-		err := r.List(context.TODO(), crList, listOps)
+		err := r.List(ctx, crList, listOps)
 		if err != nil {
 			return []reconcile.Request{}
 		}
diff --git a/controllers/redis/suite_test.go b/controllers/redis/suite_test.go
@@ -20,8 +20,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports
+	. "github.com/onsi/gomega"    //revive:disable:dot-imports
 
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
diff --git a/tests/functional/base_test.go b/tests/functional/base_test.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"time"
 
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //revive:disable:dot-imports
 
 	"github.com/google/uuid"
 	corev1 "k8s.io/api/core/v1"
@@ -397,11 +397,11 @@ func IPSetConditionGetter(name types.NamespacedName) condition.Conditions {
 }
 
 func TransportURLConditionGetter(name types.NamespacedName) condition.Conditions {
-	instance := infra.GetTransportURL(name)
+	instance := th.GetTransportURL(name)
 	return instance.Status.Conditions
 }
 
-func CreateLoadBalancerService(name types.NamespacedName, addDnsAnno bool) *corev1.Service {
+func CreateLoadBalancerService(name types.NamespacedName, addDNSAnno bool) *corev1.Service {
 	svc := &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:        name.Name,
@@ -430,7 +430,7 @@ func CreateLoadBalancerService(name types.NamespacedName, addDnsAnno bool) *core
 		},
 	}
 
-	if addDnsAnno {
+	if addDNSAnno {
 		svc.Annotations[networkv1.AnnotationHostnameKey] = fmt.Sprintf("%s.%s.svc", name.Name, name.Namespace)
 	}
 
@@ -486,8 +486,8 @@ func GetDefaultNetConfigSpec() map[string]interface{} {
 }
 
 func GetSubnet1(name string) networkv1.Subnet {
-	var gw string = "172.17.0.1"
-	var vlan int = 20
+	var gw = "172.17.0.1"
+	var vlan = 20
 	return networkv1.Subnet{
 		Name:    networkv1.NetNameStr(name),
 		Cidr:    "172.17.0.0/24",
@@ -506,8 +506,8 @@ func GetSubnet1(name string) networkv1.Subnet {
 }
 
 func GetSubnet2(name string) networkv1.Subnet {
-	var gw string = "172.18.0.1"
-	var vlan int = 21
+	var gw = "172.18.0.1"
+	var vlan = 21
 	return networkv1.Subnet{
 		Name:    networkv1.NetNameStr(name),
 		Cidr:    "172.18.0.0/24",
@@ -523,7 +523,7 @@ func GetSubnet2(name string) networkv1.Subnet {
 }
 
 func GetSubnetWithWrongExcludeAddress() networkv1.Subnet {
-	var vlan int = 20
+	var vlan = 20
 	return networkv1.Subnet{
 		Name: subnet1,
 		Cidr: "172.17.0.0/24",
diff --git a/tests/functional/dnsdata_controller_test.go b/tests/functional/dnsdata_controller_test.go
@@ -17,14 +17,15 @@ limitations under the License.
 package functional_test
 
 import (
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports
+	. "github.com/onsi/gomega"    //revive:disable:dot-imports
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 
+	//revive:disable-next-line:dot-imports
 	. "github.com/openstack-k8s-operators/lib-common/modules/common/test/helpers"
 )
 
diff --git a/tests/functional/dnsmasq_controller_test.go b/tests/functional/dnsmasq_controller_test.go
@@ -19,15 +19,16 @@ package functional_test
 import (
 	"fmt"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports
+	. "github.com/onsi/gomega"    //revive:disable:dot-imports
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
 
+	//revive:disable-next-line:dot-imports
 	. "github.com/openstack-k8s-operators/lib-common/modules/common/test/helpers"
 )
 
@@ -71,7 +72,7 @@ var _ = Describe("DNSMasq controller", func() {
 			cm.Labels = util.MergeStringMaps(cm.Labels, map[string]string{
 				"dnsmasqhosts": "dnsdata",
 			})
-			th.K8sClient.Update(ctx, cm)
+			Expect(th.K8sClient.Update(ctx, cm)).Should(Succeed())
 
 			DeferCleanup(th.DeleteConfigMap, dnsDataCM)
 			DeferCleanup(th.DeleteInstance, instance)
@@ -211,7 +212,7 @@ var _ = Describe("DNSMasq controller", func() {
 
 				// Update the cm providing dnsdata
 				cm.Data[dnsDataCM.Name] = "172.20.0.80 keystone-internal.openstack.svc some-other-node"
-				th.K8sClient.Update(ctx, cm)
+				Expect(th.K8sClient.Update(ctx, cm)).Should(Succeed())
 
 				Eventually(func(g Gomega) {
 					depl := th.GetDeployment(deploymentName)
diff --git a/tests/functional/ipset_controller_test.go b/tests/functional/ipset_controller_test.go
@@ -17,8 +17,10 @@ limitations under the License.
 package functional_test
 
 import (
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports
+	. "github.com/onsi/gomega"    //revive:disable:dot-imports
+
+	//revive:disable-next-line:dot-imports
 	. "github.com/openstack-k8s-operators/lib-common/modules/common/test/helpers"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
diff --git a/tests/functional/netconfig_webhook_test.go b/tests/functional/netconfig_webhook_test.go
@@ -17,8 +17,8 @@ limitations under the License.
 package functional_test
 
 import (
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports
+	. "github.com/onsi/gomega"    //revive:disable:dot-imports
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/tests/functional/service_controller_test.go b/tests/functional/service_controller_test.go
@@ -19,8 +19,8 @@ package functional_test
 import (
 	"fmt"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports
+	. "github.com/onsi/gomega"    //revive:disable:dot-imports
 
 	"k8s.io/apimachinery/pkg/types"
 )
diff --git a/tests/functional/suite_test.go b/tests/functional/suite_test.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/google/uuid"
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports
+	. "github.com/onsi/gomega"    //revive:disable:dot-imports
 	"go.uber.org/zap/zapcore"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
@@ -48,8 +48,6 @@ import (
 
 	infra_test "github.com/openstack-k8s-operators/infra-operator/apis/test/helpers"
 	test "github.com/openstack-k8s-operators/lib-common/modules/test"
-
-	. "github.com/openstack-k8s-operators/lib-common/modules/common/test/helpers"
 	//+kubebuilder:scaffold:imports
 )
 
@@ -64,9 +62,8 @@ var (
 	ctx       context.Context
 	cancel    context.CancelFunc
 	logger    logr.Logger
-	th        *TestHelper
 	namespace string
-	infra     *infra_test.TestHelper
+	th        *infra_test.TestHelper
 )
 
 func TestAPIs(t *testing.T) {
@@ -124,10 +121,8 @@ var _ = BeforeSuite(func() {
 	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
 	Expect(err).NotTo(HaveOccurred())
 	Expect(k8sClient).NotTo(BeNil())
-	th = NewTestHelper(ctx, k8sClient, timeout, interval, logger)
+	th = infra_test.NewTestHelper(ctx, k8sClient, timeout, interval, logger)
 	Expect(th).NotTo(BeNil())
-	infra = infra_test.NewTestHelper(ctx, k8sClient, timeout, interval, logger)
-	Expect(infra).NotTo(BeNil())
 
 	// Start the controller-manager if goroutine
 	webhookInstallOptions := &testEnv.WebhookInstallOptions
diff --git a/tests/functional/transporturl_controller_test.go b/tests/functional/transporturl_controller_test.go
@@ -19,9 +19,11 @@ package functional_test
 import (
 	"fmt"
 
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/ginkgo/v2" //revive:disable:dot-imports
+	. "github.com/onsi/gomega"    //revive:disable:dot-imports
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
+
+	//revive:disable-next-line:dot-imports
 	. "github.com/openstack-k8s-operators/lib-common/modules/common/test/helpers"
 	corev1 "k8s.io/api/core/v1"
 
@@ -62,7 +64,7 @@ var _ = Describe("TransportURL controller", func() {
 		})
 
 		It("should have the Spec fields set", func() {
-			tr := infra.GetTransportURL(transportURLName)
+			tr := th.GetTransportURL(transportURLName)
 			Expect(tr.Spec.RabbitmqClusterName).Should(Equal("rabbitmq"))
 		})
 
@@ -98,7 +100,7 @@ var _ = Describe("TransportURL controller", func() {
 				corev1.ConditionTrue,
 			)
 
-			tr := infra.GetTransportURL(transportURLName)
+			tr := th.GetTransportURL(transportURLName)
 			Expect(tr).ToNot(BeNil())
 			Expect(tr.Status.SecretName).To(Equal(transportURLSecretName.Name))
 		})
@@ -132,7 +134,7 @@ var _ = Describe("TransportURL controller", func() {
 				corev1.ConditionTrue,
 			)
 
-			tr := infra.GetTransportURL(transportURLName)
+			tr := th.GetTransportURL(transportURLName)
 			Expect(tr).ToNot(BeNil())
 			Expect(tr.Status.SecretName).To(Equal(transportURLSecretName.Name))
 		})

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ func (r *TransportURLReconciler) findObjectsForSrc(ctx context.Context, src clie`
`362`	`362`	`FieldSelector: fields.OneTermEqualSelector(field, src.GetName()),`
`363`	`363`	`Namespace: src.GetNamespace(),`
`364`	`364`	`}`
`365`		`- err := r.List(context.TODO(), crList, listOps)`
	`365`	`+ err := r.List(ctx, crList, listOps)`
`366`	`366`	`if err != nil {`
`367`	`367`	`return []reconcile.Request{}`
`368`	`368`	`}`