appease the linter

Author: cyclingwithelephants

api/v1alpha1/zz_generated.deepcopy.go

@@ -159,6 +159,9 @@ func (r *ClusterTunnelReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 				},
 				tunnelFinalizer,
 			)
+			if err != nil {
+				return ctrl.Result{}, err
+			}
 			return ctrl.Result{}, nil
 		}
 		r.log.Error(err, "unable to fetch Tunnel")

internal/controller/clustertunnel_controller.go

@@ -18,6 +18,7 @@ package controller
 
 import (
 	"context"
+
 	"github.com/adyanth/cloudflare-operator/internal/k8s"
 
 	corev1 "k8s.io/api/core/v1"

internal/controller/tunnel_controller.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+
 	"github.com/go-logr/logr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -42,8 +43,13 @@ func (s *ObjectClient) EnsureFinalizer(ctx context.Context, key client.ObjectKey
 		return nil
 	}
 
-	base := obj.DeepCopyObject().(client.Object)
 	controllerutil.AddFinalizer(obj, finalizer)
+
+	base, err := s.deepCopyObject(obj)
+	if err != nil {
+		return err
+	}
+
 	s.log.
 		WithValues("finalizer", finalizer).
 		WithValues("object", fmt.Sprintf("%s/%s", obj.GetNamespace(), obj.GetName())).
@@ -69,8 +75,13 @@ func (s *ObjectClient) RemoveFinalizer(ctx context.Context, key client.ObjectKey
 		return nil
 	}
 
-	base := obj.DeepCopyObject().(client.Object)
 	controllerutil.RemoveFinalizer(obj, finalizer)
+
+	base, err := s.deepCopyObject(obj)
+	if err != nil {
+		return err
+	}
+
 	s.log.
 		WithValues("finalizer", finalizer).
 		WithValues("object", fmt.Sprintf("%s/%s", obj.GetNamespace(), obj.GetName())).
@@ -80,3 +91,15 @@ func (s *ObjectClient) RemoveFinalizer(ctx context.Context, key client.ObjectKey
 	}
 	return nil
 }
+
+func (s *ObjectClient) deepCopyObject(obj client.Object) (client.Object, error) {
+	objDeepCopy := obj.DeepCopyObject()
+	if objDeepCopy == nil {
+		return nil, errors.New("received nil object from DeepCopyObject")
+	}
+	base, ok := objDeepCopy.(client.Object)
+	if !ok {
+		return nil, errors.New("failed to convert object to client.Object")
+	}
+	return base, nil
+}