bug: don't assume kind/apiversion are set on object

acorn-io · Oct 25, 2024 · 9ff4a5c · 9ff4a5c
1 parent 096ce85
commit 9ff4a5c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/pkg/router/finalizer.go b/pkg/router/finalizer.go
@@ -50,7 +50,9 @@ func (f FinalizerHandler) Handle(req Request, resp Response) error {
 	}
 
 	for _, respObj := range newResp.Objs {
-		if isObjectForRequest(req, respObj) {
+		if ok, err := isObjectForRequest(req, respObj); err != nil {
+			return err
+		} else if ok {
 			newObj = respObj
 		}
 		resp.Objects(respObj)

diff --git a/pkg/router/handler.go b/pkg/router/handler.go
@@ -274,7 +274,7 @@ func (m *HandlerSet) onChange(gvk schema.GroupVersionKind, key string, runtimeOb
 	err = m.backend.Get(m.ctx, kclient.ObjectKey{Name: name, Namespace: ns}, obj.(kclient.Object))
 	if err == nil {
 		runtimeObject = obj
-	} else if err != nil && !apierror.IsNotFound(err) {
+	} else if !apierror.IsNotFound(err) {
 		return nil, err
 	}
 

diff --git a/pkg/router/handlers.go b/pkg/router/handlers.go
@@ -8,10 +8,14 @@ import (
 	kclient "sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-func isObjectForRequest(req Request, obj kclient.Object) bool {
+func isObjectForRequest(req Request, obj kclient.Object) (bool, error) {
+	gvk, err := req.Client.GroupVersionKindFor(obj)
+	if err != nil {
+		return false, err
+	}
 	return obj.GetName() == req.Name &&
 		obj.GetNamespace() == req.Namespace &&
-		obj.GetObjectKind().GroupVersionKind() == req.GVK
+		gvk == req.GVK, nil
 }
 
 type handlers struct {
@@ -53,7 +57,7 @@ func (h *handlers) Handle(req Request, resp *response) error {
 		}
 		newObjects := make([]kclient.Object, 0, len(resp.objects))
 		for _, obj := range resp.objects {
-			if isObjectForRequest(req, obj) {
+			if ok, err := isObjectForRequest(req, obj); err != nil {
 				req.Object = obj
 			} else {
 				newObjects = append(newObjects, obj)