polishing

Signed-off-by: Scott Andrews <andrewssc@vmware.com>

internal/util.go

@@ -7,23 +7,30 @@ package internal
 
 import "reflect"
 
-// IsNil returns true if the value is nilable and nil
+// IsNil returns true if the value is nil, false if the value is not nilable or not nil
 func IsNil(val interface{}) bool {
-	// return val == nil
+	if !IsNilable(val) {
+		return false
+	}
+	return reflect.ValueOf(val).IsNil()
+}
+
+// IsNilable returns true if the value can be nil
+func IsNilable(val interface{}) bool {
 	v := reflect.ValueOf(val)
 	switch v.Kind() {
 	case reflect.Chan:
-		return v.IsNil()
+		return true
 	case reflect.Func:
-		return v.IsNil()
+		return true
 	case reflect.Interface:
-		return v.IsNil()
+		return true
 	case reflect.Map:
-		return v.IsNil()
+		return true
 	case reflect.Ptr:
-		return v.IsNil()
+		return true
 	case reflect.Slice:
-		return v.IsNil()
+		return true
 	default:
 		return false
 	}

testing/subreconciler.go

@@ -202,8 +202,8 @@ func (tc *SubReconcilerTestCase[T]) Run(t *testing.T, scheme *runtime.Scheme, fa
 	ctx = reconcilers.StashRequest(ctx, reconcilers.Request{
 		NamespacedName: types.NamespacedName{Namespace: resource.GetNamespace(), Name: resource.GetName()},
 	})
-	ctx = reconcilers.StashOriginalResourceType(ctx, resource.DeepCopyObject().(client.Object))
-	ctx = reconcilers.StashResourceType(ctx, resource.DeepCopyObject().(client.Object))
+	ctx = reconcilers.StashOriginalResourceType(ctx, resource.DeepCopyObject().(T))
+	ctx = reconcilers.StashResourceType(ctx, resource.DeepCopyObject().(T))
 
 	configs := make(map[string]reconcilers.Config, len(tc.AdditionalConfigs))
 	for k, v := range tc.AdditionalConfigs {
@@ -240,9 +240,9 @@ func (tc *SubReconcilerTestCase[T]) Run(t *testing.T, scheme *runtime.Scheme, fa
 	}
 
 	// compare resource
-	expectedResource := tc.Resource.DeepCopyObject().(client.Object)
-	if !internal.IsNil(tc.ExpectResource) {
-		expectedResource = tc.ExpectResource.DeepCopyObject().(client.Object)
+	expectedResource := tc.Resource.DeepCopyObject().(T)
+	if internal.IsNilable(tc.ExpectResource) && !internal.IsNil(tc.ExpectResource) {
+		expectedResource = tc.ExpectResource.DeepCopyObject().(T)
 	}
 	if expectedResource.GetResourceVersion() == "" {
 		// mirror defaulting of the resource