add a nil check for Watch Selector field (#164)

* add a nil check for Watch Selector field Signed-off-by: Bryce Palmer <bpalmer@redhat.com> * update watches_test Signed-off-by: Bryce Palmer <bpalmer@redhat.com>
operator-framework · May 17, 2022 · d1e2f41 · d1e2f41
1 parent 7a3e61f
commit d1e2f41
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pkg/watches/watches.go b/pkg/watches/watches.go
@@ -98,6 +98,10 @@ func LoadReader(reader io.Reader) ([]Watch, error) {
 			w.WatchDependentResources = &trueVal
 		}
 
+		if w.Selector == nil {
+			w.Selector = &metav1.LabelSelector{}
+		}
+
 		w.OverrideValues, err = expandOverrideValues(w.OverrideValues)
 		if err != nil {
 			return nil, fmt.Errorf("failed to expand override values")

diff --git a/pkg/watches/watches_test.go b/pkg/watches/watches_test.go
@@ -340,7 +340,11 @@ func verifyEqualWatches(expectedWatch, obtainedWatch []Watch) {
 		Expect(expectedWatch[i].OverrideValues).To(BeEquivalentTo(obtainedWatch[i].OverrideValues))
 		Expect(expectedWatch[i].MaxConcurrentReconciles).To(BeEquivalentTo(obtainedWatch[i].MaxConcurrentReconciles))
 		Expect(expectedWatch[i].ReconcilePeriod).To(BeEquivalentTo(obtainedWatch[i].ReconcilePeriod))
-		Expect(expectedWatch[i].Selector).To(BeEquivalentTo(obtainedWatch[i].Selector))
+		if expectedWatch[i].Selector == nil {
+			Expect(&v1.LabelSelector{}).To(BeEquivalentTo(obtainedWatch[i].Selector))
+		} else {
+			Expect(expectedWatch[i].Selector).To(BeEquivalentTo(obtainedWatch[i].Selector))
+		}
 	}
 }