apply methods to funcs handler

Signed-off-by: Troy Connor <[email protected]>

Author: troy0820

pkg/handler/eventhandler.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"time"
 
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/util/workqueue"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/priorityqueue"
@@ -82,15 +83,87 @@ type TypedEventHandler[object any, request comparable] interface {
 	Generic(context.Context, event.TypedGenericEvent[object], workqueue.TypedRateLimitingInterface[request])
 }
 
-var _ EventHandler = Funcs{}
+var _ EventHandler = &Funcs{}
 
 // Funcs implements eventhandler.
-type Funcs = TypedFuncs[client.Object, reconcile.Request]
+type Funcs = funcs[client.Object]
 
-// NewFuncsWithLowPriority creates a Funcs Handler wrapped in
-// WithLowPriorityWhenUnchanged
-func NewFuncsWithLowPriority(u Funcs) EventHandler {
-	return WithLowPriorityWhenUnchanged(u)
+// funcs implements eventhandler
+type funcs[object client.Object] struct{}
+
+func (f *funcs[T]) Create(ctx context.Context, evt event.TypedCreateEvent[T], q workqueue.TypedRateLimitingInterface[reconcile.Request]) {
+	if isNil(evt.Object) {
+		enqueueLog.Error(nil, "CreateEvent received with no metadata", "event", evt)
+		return
+	}
+
+	item := reconcile.Request{NamespacedName: types.NamespacedName{
+		Name:      evt.Object.GetName(),
+		Namespace: evt.Object.GetNamespace(),
+	}}
+
+	priorityQueue, isPriorityQueue := q.(priorityqueue.PriorityQueue[reconcile.Request])
+	if !isPriorityQueue {
+		q.Add(item)
+		return
+	}
+	addToPriorityQueueCreate(priorityQueue, evt, item)
+}
+
+// Update implements EventHandler.
+func (f *funcs[T]) Update(ctx context.Context, evt event.TypedUpdateEvent[T], q workqueue.TypedRateLimitingInterface[reconcile.Request]) {
+	switch {
+	case !isNil(evt.ObjectNew):
+		item := reconcile.Request{NamespacedName: types.NamespacedName{
+			Name:      evt.ObjectNew.GetName(),
+			Namespace: evt.ObjectNew.GetNamespace(),
+		}}
+
+		priorityQueue, isPriorityQueue := q.(priorityqueue.PriorityQueue[reconcile.Request])
+		if !isPriorityQueue {
+			q.Add(item)
+			return
+		}
+		addToPriorityQueueUpdate(priorityQueue, evt, item)
+	case !isNil(evt.ObjectOld):
+		item := reconcile.Request{NamespacedName: types.NamespacedName{
+			Name:      evt.ObjectOld.GetName(),
+			Namespace: evt.ObjectOld.GetNamespace(),
+		}}
+
+		priorityQueue, isPriorityQueue := q.(priorityqueue.PriorityQueue[reconcile.Request])
+		if !isPriorityQueue {
+			q.Add(item)
+			return
+		}
+		addToPriorityQueueUpdate(priorityQueue, evt, item)
+	default:
+		enqueueLog.Error(nil, "UpdateEvent received with no metadata", "event", evt)
+	}
+}
+
+// Delete implements EventHandler.
+func (f *funcs[T]) Delete(ctx context.Context, evt event.TypedDeleteEvent[T], q workqueue.TypedRateLimitingInterface[reconcile.Request]) {
+	if isNil(evt.Object) {
+		enqueueLog.Error(nil, "DeleteEvent received with no metadata", "event", evt)
+		return
+	}
+	q.Add(reconcile.Request{NamespacedName: types.NamespacedName{
+		Name:      evt.Object.GetName(),
+		Namespace: evt.Object.GetNamespace(),
+	}})
+}
+
+// Generic implements EventHandler.
+func (f *funcs[T]) Generic(ctx context.Context, evt event.TypedGenericEvent[T], q workqueue.TypedRateLimitingInterface[reconcile.Request]) {
+	if isNil(evt.Object) {
+		enqueueLog.Error(nil, "GenericEvent received with no metadata", "event", evt)
+		return
+	}
+	q.Add(reconcile.Request{NamespacedName: types.NamespacedName{
+		Name:      evt.Object.GetName(),
+		Namespace: evt.Object.GetNamespace(),
+	}})
 }
 
 // TypedFuncs implements eventhandler.
@@ -160,11 +233,7 @@ func WithLowPriorityWhenUnchanged[object client.Object, request comparable](u Ty
 						q.Add(item)
 						return
 					}
-					var priority int
-					if isObjectUnchanged(tce) {
-						priority = LowPriority
-					}
-					priorityQueue.AddWithOpts(priorityqueue.AddOpts{Priority: priority}, item)
+					addToPriorityQueueCreate(priorityQueue, tce, item)
 				},
 			})
 		},
@@ -177,11 +246,7 @@ func WithLowPriorityWhenUnchanged[object client.Object, request comparable](u Ty
 						q.Add(item)
 						return
 					}
-					var priority int
-					if tue.ObjectOld.GetResourceVersion() == tue.ObjectNew.GetResourceVersion() {
-						priority = LowPriority
-					}
-					priorityQueue.AddWithOpts(priorityqueue.AddOpts{Priority: priority}, item)
+					addToPriorityQueueUpdate(priorityQueue, tue, item)
 				},
 			})
 		},
@@ -208,7 +273,7 @@ func isObjectUnchanged[object client.Object](e event.TypedCreateEvent[object]) b
 
 // addToPriorityQueueCreate adds the reconcile.Request to the priorityqueue in the handler
 // for Create requests if and only if the workqueue being used is of type priorityqueue.PriorityQueue[reconcile.Request]
-func addToPriorityQueueCreate[T client.Object](q priorityqueue.PriorityQueue[reconcile.Request], evt event.TypedCreateEvent[T], item reconcile.Request) {
+func addToPriorityQueueCreate[T client.Object, request comparable](q priorityqueue.PriorityQueue[request], evt event.TypedCreateEvent[T], item request) {
 	var priority int
 	if isObjectUnchanged(evt) {
 		priority = LowPriority
@@ -218,7 +283,7 @@ func addToPriorityQueueCreate[T client.Object](q priorityqueue.PriorityQueue[rec
 
 // addToPriorityQueueUpdate adds the reconcile.Request to the priorityqueue in the handler
 // for Update requests if and only if the workqueue being used is of type priorityqueue.PriorityQueue[reconcile.Request]
-func addToPriorityQueueUpdate[T client.Object](q priorityqueue.PriorityQueue[reconcile.Request], evt event.TypedUpdateEvent[T], item reconcile.Request) {
+func addToPriorityQueueUpdate[T client.Object, request comparable](q priorityqueue.PriorityQueue[request], evt event.TypedUpdateEvent[T], item request) {
 	var priority int
 	if evt.ObjectOld.GetResourceVersion() == evt.ObjectNew.GetResourceVersion() {
 		priority = LowPriority