providers/namespace: Implement AddEventHandlerWithOptions on ScopedInformer

On-behalf-of: SAP <[email protected]>
Signed-off-by: Marvin Beckers <[email protected]>

Author: embik

examples/namespace/main.go

@@ -136,7 +136,7 @@ func run(ctx context.Context, log logr.Logger, kubeconfig string) error {
 				}
 
 				cm := &corev1.ConfigMap{}
-				if err := cl.GetClient().Get(ctx, req.Request.NamespacedName, cm); err != nil {
+				if err := cl.GetClient().Get(ctx, req.NamespacedName, cm); err != nil {
 					if apierrors.IsNotFound(err) {
 						return reconcile.Result{}, nil
 					}

providers/namespace/cache.go

@@ -146,7 +146,12 @@ func (i *ScopedInformer) AddEventHandler(handler toolscache.ResourceEventHandler
 
 // AddEventHandlerWithResyncPeriod adds an event handler to the informer with a resync period.
 func (i *ScopedInformer) AddEventHandlerWithResyncPeriod(handler toolscache.ResourceEventHandler, resyncPeriod time.Duration) (toolscache.ResourceEventHandlerRegistration, error) {
-	return i.Informer.AddEventHandlerWithResyncPeriod(toolscache.ResourceEventHandlerDetailedFuncs{
+	return i.AddEventHandlerWithOptions(handler, toolscache.HandlerOptions{ResyncPeriod: &resyncPeriod})
+}
+
+// AddEventHandlerWithOptions adds an event handler to the informer, passing along options to configure its behaviour.
+func (i *ScopedInformer) AddEventHandlerWithOptions(handler toolscache.ResourceEventHandler, options toolscache.HandlerOptions) (toolscache.ResourceEventHandlerRegistration, error) {
+	return i.Informer.AddEventHandlerWithOptions(toolscache.ResourceEventHandlerDetailedFuncs{
 		AddFunc: func(obj interface{}, isInInitialList bool) {
 			cobj := obj.(client.Object)
 			if cobj.GetNamespace() == i.clusterName {
@@ -176,7 +181,7 @@ func (i *ScopedInformer) AddEventHandlerWithResyncPeriod(handler toolscache.Reso
 				handler.OnDelete(cobj)
 			}
 		},
-	}, resyncPeriod)
+	}, options)
 }
 
 // AddIndexers adds indexers to the informer.

providers/namespace/provider_test.go

@@ -19,6 +19,7 @@ package namespace
 import (
 	"context"
 	"errors"
+	"fmt"
 	"strconv"
 
 	"golang.org/x/sync/errgroup"
@@ -83,7 +84,7 @@ var _ = Describe("Provider Namespace", Ordered, func() {
 
 						cl, err := mgr.GetCluster(ctx, req.ClusterName)
 						if err != nil {
-							return reconcile.Result{}, err
+							return reconcile.Result{}, fmt.Errorf("failed to get cluster: %w", err)
 						}
 
 						// Feed the animal.
@@ -92,15 +93,15 @@ var _ = Describe("Provider Namespace", Ordered, func() {
 							if apierrors.IsNotFound(err) {
 								return reconcile.Result{}, nil
 							}
-							return reconcile.Result{}, err
+							return reconcile.Result{}, fmt.Errorf("failed to get configmap: %w", err)
 						}
 						if cm.GetLabels()["type"] != "animal" {
 							return reconcile.Result{}, nil
 						}
 
 						cm.Data = map[string]string{"stomach": "food"}
 						if err := cl.GetClient().Update(ctx, cm); err != nil {
-							return reconcile.Result{}, err
+							return reconcile.Result{}, fmt.Errorf("failed to update configmap: %w", err)
 						}
 
 						return ctrl.Result{}, nil