Merge pull request #1039 from fluxcd/missing-return-statement

Fix add missing return statement and a few style issues
fluxcd · Feb 12, 2025 · 5df5b78 · 5df5b78
2 parents 83ed0c5 + c4eed6b
commit 5df5b78
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/internal/server/receiver_handlers.go b/internal/server/receiver_handlers.go
@@ -118,18 +118,22 @@ func (s *ReceiverServer) handlePayload(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var evaluator func(context.Context, client.Object) (*bool, error)
+	resourceFilter := func(ctx context.Context, o client.Object) (*bool, error) {
+		accept := true
+		return &accept, nil
+	}
 	if receiver.Spec.ResourceFilter != "" {
-		evaluator, err = newResourceFilter(receiver.Spec.ResourceFilter, r)
+		resourceFilter, err = newResourceFilter(receiver.Spec.ResourceFilter, r)
 		if err != nil {
-			logger.Error(err, "unable to create CEL evaluator")
+			logger.Error(err, "unable to create resource filter")
 			w.WriteHeader(http.StatusInternalServerError)
+			return
 		}
 	}
 
 	var withErrors bool
 	for _, resource := range receiver.Spec.Resources {
-		if err := s.requestReconciliation(ctx, logger, resource, receiver.Namespace, evaluator); err != nil {
+		if err := s.requestReconciliation(ctx, logger, resource, receiver.Namespace, resourceFilter); err != nil {
 			logger.Error(err, "unable to request reconciliation", "resource", resource)
 			withErrors = true
 		}
@@ -152,18 +156,16 @@ func (s *ReceiverServer) notifySingleResource(ctx context.Context, logger logr.L
 }
 
 func (s *ReceiverServer) notifyResource(ctx context.Context, logger logr.Logger, resource *metav1.PartialObjectMetadata, resourceFilter resourceFilter) error {
-	if resourceFilter != nil {
-		accept, err := resourceFilter(ctx, resource)
-		if err != nil {
-			return err
-		}
-		if !*accept {
-			logger.V(1).Info(fmt.Sprintf("resource '%s/%s.%s' NOT annotated because CEL expression returned false", resource.Kind, resource.Name, resource.Namespace))
-			return nil
-		}
-	}
-	err := s.annotate(ctx, resource)
+	accept, err := resourceFilter(ctx, resource)
 	if err != nil {
+		return err
+	}
+	if !*accept {
+		logger.V(1).Info(fmt.Sprintf("resource '%s/%s.%s' NOT annotated because CEL expression returned false", resource.Kind, resource.Name, resource.Namespace))
+		return nil
+	}
+
+	if err := s.annotate(ctx, resource); err != nil {
 		return fmt.Errorf("failed to annotate resource: '%s/%s.%s': %w", resource.Kind, resource.Name, resource.Namespace, err)
 	} else {
 		logger.Info(fmt.Sprintf("resource '%s/%s.%s' annotated",

diff --git a/internal/server/receiver_resource_filter_test.go b/internal/server/receiver_resource_filter_test.go
@@ -132,10 +132,10 @@ func TestCELEvaluation(t *testing.T) {
 	for _, tt := range evaluationTests {
 		t.Run(tt.expression, func(t *testing.T) {
 			g := NewWithT(t)
-			evaluator, err := newResourceFilter(tt.expression, tt.request)
+			resourceFilter, err := newResourceFilter(tt.expression, tt.request)
 			g.Expect(err).To(Succeed())
 
-			result, err := evaluator(context.Background(), tt.resource)
+			result, err := resourceFilter(context.Background(), tt.resource)
 			g.Expect(err).To(Succeed())
 			g.Expect(result).To(Equal(&tt.wantResult))
 		})