Pull event-object handling into a separate file.

pkg/resources/virtual/common/common.go

@@ -24,10 +24,6 @@ type DefaultFields struct {
 	Cache SummaryCache
 }
 
-type EventFields struct {
-	DF *DefaultFields
-}
-
 // GetTransform produces the default transformation func
 func (d *DefaultFields) GetTransform() cache.TransformFunc {
 	return d.transform
@@ -42,28 +38,10 @@ func (d *DefaultFields) transform(obj any) (any, error) {
 	if err != nil {
 		return nil, err
 	}
-	return d.transformRest(raw)
-}
-
-// GetEventTransform produces the transformation func for events
-func (e *EventFields) GetEventTransform() cache.TransformFunc {
-	return e.transformEventObject
-}
-
-// transformEventObjects does special-case handling on event objects
-func (e *EventFields) transformEventObject(obj any) (any, error) {
-	raw, isSignal, err := getUnstructured(obj)
-	if isSignal {
-		return obj, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-	raw = fixTypeField(raw)
-	return e.DF.transformRest(raw)
+	return d.transformCommon(raw)
 }
 
-func (d *DefaultFields) transformRest(raw *unstructured.Unstructured) (any, error) {
+func (d *DefaultFields) transformCommon(raw *unstructured.Unstructured) (any, error) {
 	raw = addIDField(raw)
 	raw, err := addSummaryFields(raw, d.Cache)
 	if err != nil {
@@ -113,15 +91,6 @@ func addIDField(raw *unstructured.Unstructured) *unstructured.Unstructured {
 	return raw
 }
 
-// updateTypeField replaces the _type field with the contents of the field named "type", if it exists
-func fixTypeField(raw *unstructured.Unstructured) *unstructured.Unstructured {
-	currentTypeValue, ok := raw.Object["type"]
-	if ok {
-		raw.Object["_type"] = currentTypeValue
-	}
-	return raw
-}
-
 func normalizeConditions(raw *unstructured.Unstructured) {
 	var (
 		obj           data.Object

pkg/resources/virtual/common/event_fields.go

@@ -0,0 +1,38 @@
+// Package common provides cache.TransformFunc's for /v1 Event objects
+package common
+
+import (
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/client-go/tools/cache"
+)
+
+type EventFields struct {
+	DF *DefaultFields
+}
+
+// GetEventTransform produces the transformation func for events
+func (e *EventFields) GetEventTransform() cache.TransformFunc {
+	return e.transformEventObject
+}
+
+// transformEventObjects does special-case handling on event objects
+func (e *EventFields) transformEventObject(obj any) (any, error) {
+	raw, isSignal, err := getUnstructured(obj)
+	if isSignal {
+		return obj, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+	raw = fixTypeField(raw)
+	return e.DF.transformCommon(raw)
+}
+
+// updateTypeField replaces the _type field with the contents of the field named "type", if it exists
+func fixTypeField(raw *unstructured.Unstructured) *unstructured.Unstructured {
+	currentTypeValue, ok := raw.Object["type"]
+	if ok {
+		raw.Object["_type"] = currentTypeValue
+	}
+	return raw
+}

pkg/resources/virtual/virtual.go

@@ -25,7 +25,9 @@ func NewTransformBuilder(cache common.SummaryCache) *TransformBuilder {
 	return t
 }
 
-// GetTransformFunc retrieves a TransformFunc for a given GVK. Currently only returns a transformFunc for defaultFields
+// GetTransformFunc retrieves a TransformFunc for a given GVK.
+// Currently it returns an event-specific transform func for /v1 Event objects,
+// and the default transformFunc for all other objects.
 func (t *TransformBuilder) GetTransformFunc(gvk schema.GroupVersionKind) cache.TransformFunc {
 	if gvk.Kind == "Event" && gvk.Group == "" && gvk.Version == "v1" {
 		return t.eventFields.GetEventTransform()