Simplify logic around suspension state change

nick-jones · nick-jones · commit 8cddb623d8e3 · 2024-07-15T09:28:02.000+01:00
diff --git a/internal/watch/watcher.go b/internal/watch/watcher.go
@@ -103,7 +103,6 @@ func (w *Watcher) checkSuspensionStatus(ctx context.Context, resource k8s.Resour
 	}
 	suspended, _ := spec["suspend"].(bool)
 
-	var updated bool
 	entry, err := w.store.GetEntry(resource)
 	if err != nil {
 		if errors.Is(err, datastore.ErrNotFound) {
@@ -120,11 +119,9 @@ func (w *Watcher) checkSuspensionStatus(ctx context.Context, resource k8s.Resour
 			return nil
 		}
 		return fmt.Errorf("failed to fetch entry: %w", err)
-	} else {
-		updated = suspended != entry.Suspended
 	}
 
-	if !updated {
+	if suspended == entry.Suspended {
 		return nil // Probably something else about the resource modified
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,6 @@ func (w *Watcher) checkSuspensionStatus(ctx context.Context, resource k8s.Resour`
`103`	`103`	`}`
`104`	`104`	`suspended, _ := spec["suspend"].(bool)`
`105`	`105`
`106`		`- var updated bool`
`107`	`106`	`entry, err := w.store.GetEntry(resource)`
`108`	`107`	`if err != nil {`
`109`	`108`	`if errors.Is(err, datastore.ErrNotFound) {`
`@@ -120,11 +119,9 @@ func (w *Watcher) checkSuspensionStatus(ctx context.Context, resource k8s.Resour`
`120`	`119`	`return nil`
`121`	`120`	`}`
`122`	`121`	`return fmt.Errorf("failed to fetch entry: %w", err)`
`123`		`- } else {`
`124`		`- updated = suspended != entry.Suspended`
`125`	`122`	`}`
`126`	`123`
`127`		`- if !updated {`
	`124`	`+ if suspended == entry.Suspended {`
`128`	`125`	`return nil // Probably something else about the resource modified`
`129`	`126`	`}`
`130`	`127`