WIP: refactor haveacm fn

Pass only the runtime client instead of the whole reconciler object.
This makes the testing also cleaner a bit.

Author: darkdoc

internal/controller/acm.go

@@ -35,7 +35,7 @@ var mchGVK = schema.GroupVersionKind{
 	Version: "v1",
 }
 
-func haveACMHub(r *PatternReconciler) bool {
+func haveACMHub(cl client.Client) bool {
 	labelSelector, err := labels.Parse(fmt.Sprintf("%v = %v", "ocm-configmap-type", "image-manifest"))
 
 	if err != nil {
@@ -44,7 +44,7 @@ func haveACMHub(r *PatternReconciler) bool {
 	}
 
 	cms := corev1.ConfigMapList{}
-	err = r.List(context.Background(), &cms, &client.ListOptions{
+	err = cl.List(context.Background(), &cms, &client.ListOptions{
 		LabelSelector: labelSelector,
 	})
 
@@ -61,7 +61,7 @@ func haveACMHub(r *PatternReconciler) bool {
 	umch := &unstructured.UnstructuredList{}
 	umch.SetGroupVersionKind(mchGVK)
 
-	err = r.List(context.Background(), umch, &client.ListOptions{Namespace: ns})
+	err = cl.List(context.Background(), umch, &client.ListOptions{Namespace: ns})
 
 	if err != nil {
 		log.Printf("Error obtaining hub: %s\n", err)

internal/controller/acm_test.go

@@ -19,10 +19,9 @@ import (
 var _ = Describe("HaveACMHub", func() {
 
 	var (
-		patternReconciler *PatternReconciler
-		fakeClient        client.Client
-		configMap         *v1.ConfigMap
-		hub               *unstructured.Unstructured
+		fakeClient client.Client
+		configMap  *v1.ConfigMap
+		hub        *unstructured.Unstructured
 	)
 	BeforeEach(func() {
 		configMap = &v1.ConfigMap{
@@ -51,11 +50,8 @@ var _ = Describe("HaveACMHub", func() {
 		It("should return true", func() {
 			fakeClient = fake.NewClientBuilder().WithScheme(testEnv.Scheme).
 				WithRuntimeObjects(configMap, hub).Build()
-			patternReconciler = &PatternReconciler{
-				Client: fakeClient,
-			}
 
-			result := haveACMHub(patternReconciler)
+			result := haveACMHub(fakeClient)
 			Expect(result).To(BeTrue())
 		})
 	})
@@ -66,11 +62,8 @@ var _ = Describe("HaveACMHub", func() {
 
 			fakeClient = fake.NewClientBuilder().WithScheme(testEnv.Scheme).
 				WithRuntimeObjects(configMap, hub).Build()
-			patternReconciler = &PatternReconciler{
-				Client: fakeClient,
-			}
 
-			result := haveACMHub(patternReconciler)
+			result := haveACMHub(fakeClient)
 			Expect(result).To(BeFalse())
 		})
 	})
@@ -79,11 +72,8 @@ var _ = Describe("HaveACMHub", func() {
 		It("should return false", func() {
 			fakeClient = fake.NewClientBuilder().WithScheme(testEnv.Scheme).
 				WithRuntimeObjects().Build()
-			patternReconciler = &PatternReconciler{
-				Client: fakeClient,
-			}
 
-			result := haveACMHub(patternReconciler)
+			result := haveACMHub(fakeClient)
 			Expect(result).To(BeFalse())
 		})
 	})
@@ -95,11 +85,7 @@ var _ = Describe("HaveACMHub", func() {
 					return fmt.Errorf("list error")
 				}}).WithScheme(testEnv.Scheme).Build()
 
-			patternReconciler = &PatternReconciler{
-				Client: fakeClient,
-			}
-
-			result := haveACMHub(patternReconciler)
+			result := haveACMHub(fakeClient)
 			Expect(result).To(BeFalse())
 		})
 	})
@@ -111,11 +97,7 @@ var _ = Describe("HaveACMHub", func() {
 					return fmt.Errorf("list error")
 				}}).WithScheme(testEnv.Scheme).WithRuntimeObjects(configMap).Build()
 
-			patternReconciler = &PatternReconciler{
-				Client: fakeClient,
-			}
-
-			result := haveACMHub(patternReconciler)
+			result := haveACMHub(fakeClient)
 			Expect(result).To(BeFalse())
 		})
 	})

internal/controller/pattern_controller.go

@@ -571,7 +571,7 @@ func (r *PatternReconciler) finalizeObject(instance *api.Pattern) error {
 			return fmt.Errorf("updated application %q for removal", app.Name)
 		}
 
-		if haveACMHub(r) {
+		if haveACMHub(r.Client) {
 			return fmt.Errorf("waiting for removal of that acm hub")
 		}