fix failing unit test

Signed-off-by: Rashmi Gottipati <chowdary.grashmi@gmail.com>
operator-framework · Jun 8, 2024 · 82308c6 · 82308c6
1 parent 5047394
commit 82308c6
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 20 deletions.
diff --git a/pkg/operators/v1alpha1/catalogsource_types.go b/pkg/operators/v1alpha1/catalogsource_types.go
@@ -317,24 +317,26 @@ func (c *CatalogSource) Update() bool {
 		return false
 	}
 
-	if c.Spec.UpdateStrategy != nil && c.Spec.UpdateStrategy.RegistryPoll != nil && c.Spec.UpdateStrategy.Interval != nil {
-		interval := c.Spec.UpdateStrategy.Interval.Duration
-		latest := c.Status.LatestImageRegistryPoll
-		if latest == nil {
-			logrus.WithField("CatalogSource", c.Name).Debugf("latest poll %v", latest)
-		} else {
-			logrus.WithField("CatalogSource", c.Name).Debugf("latest poll %v", *c.Status.LatestImageRegistryPoll)
-		}
-
-		if c.Status.LatestImageRegistryPoll.IsZero() {
-			logrus.WithField("CatalogSource", c.Name).Debugf("creation timestamp plus interval before now %t", c.CreationTimestamp.Add(interval).Before(time.Now()))
-			if c.CreationTimestamp.Add(interval).Before(time.Now()) {
-				return true
+	if c.Spec.UpdateStrategy != nil && c.Spec.UpdateStrategy.RegistryPoll != nil {
+		if c.Spec.UpdateStrategy.Interval != nil {
+			interval := c.Spec.UpdateStrategy.Interval.Duration
+			latest := c.Status.LatestImageRegistryPoll
+			if latest == nil {
+				logrus.WithField("CatalogSource", c.Name).Debugf("latest poll %v", latest)
+			} else {
+				logrus.WithField("CatalogSource", c.Name).Debugf("latest poll %v", *c.Status.LatestImageRegistryPoll)
 			}
-		} else {
-			logrus.WithField("CatalogSource", c.Name).Debugf("latest poll plus interval before now %t", c.Status.LatestImageRegistryPoll.Add(interval).Before(time.Now()))
-			if c.Status.LatestImageRegistryPoll.Add(interval).Before(time.Now()) {
-				return true
+
+			if c.Status.LatestImageRegistryPoll.IsZero() {
+				logrus.WithField("CatalogSource", c.Name).Debugf("creation timestamp plus interval before now %t", c.CreationTimestamp.Add(interval).Before(time.Now()))
+				if c.CreationTimestamp.Add(interval).Before(time.Now()) {
+					return true
+				}
+			} else {
+				logrus.WithField("CatalogSource", c.Name).Debugf("latest poll plus interval before now %t", c.Status.LatestImageRegistryPoll.Add(interval).Before(time.Now()))
+				if c.Status.LatestImageRegistryPoll.Add(interval).Before(time.Now()) {
+					return true
+				}
 			}
 		}
 	}

diff --git a/pkg/operators/v1alpha1/types_test.go b/pkg/operators/v1alpha1/types_test.go
@@ -272,9 +272,16 @@ func TestUpdateStrategyUnmarshal(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			s := TestStruct{}
 			err := json.Unmarshal(tt.in, &s)
-			require.Equal(t, tt.out.UpdateStrategy.RawInterval, s.UpdateStrategy.RawInterval)
-			require.Equal(t, tt.out.UpdateStrategy.Interval, s.UpdateStrategy.Interval)
-			require.Equal(t, tt.out.UpdateStrategy.ParsingError, s.UpdateStrategy.ParsingError)
+			if s.UpdateStrategy.RegistryPoll != nil {
+				require.Equal(t, tt.out.UpdateStrategy.RawInterval, s.UpdateStrategy.RawInterval)
+			}
+			if s.UpdateStrategy.RegistryPoll != nil && s.UpdateStrategy.Interval != nil {
+				require.Equal(t, tt.out.UpdateStrategy.Interval, s.UpdateStrategy.Interval)
+			}
+
+			if s.UpdateStrategy.RegistryPoll != nil {
+				require.Equal(t, tt.out.UpdateStrategy.ParsingError, s.UpdateStrategy.ParsingError)
+			}
 			require.Equal(t, tt.err, err)
 		})
 	}