Allow the interceptor to be discovered from the fake ClientBuilder

Author: ludydoo

pkg/client/fake/client.go

@@ -28,6 +28,8 @@ import (
 	"strings"
 	"sync"
 
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -107,6 +109,7 @@ type ClientBuilder struct {
 	initRuntimeObjects    []runtime.Object
 	withStatusSubresource []client.Object
 	objectTracker         testing.ObjectTracker
+	interceptorFns        *interceptor.Fns
 
 	// indexes maps each GroupVersionKind (GVK) to the indexes registered for that GVK.
 	// The inner map maps from index name to IndexerFunc.
@@ -198,6 +201,12 @@ func (f *ClientBuilder) WithStatusSubresource(o ...client.Object) *ClientBuilder
 	return f
 }
 
+// WithInterceptorFns configures the client methods to be intercepted using the provided interceptor.Fns.
+func (f *ClientBuilder) WithInterceptorFns(interceptorFns interceptor.Fns) *ClientBuilder {
+	f.interceptorFns = &interceptorFns
+	return f
+}
+
 // Build builds and returns a new fake client.
 func (f *ClientBuilder) Build() client.WithWatch {
 	if f.scheme == nil {
@@ -240,13 +249,19 @@ func (f *ClientBuilder) Build() client.WithWatch {
 		}
 	}
 
-	return &fakeClient{
+	var result client.WithWatch = &fakeClient{
 		tracker:               tracker,
 		scheme:                f.scheme,
 		restMapper:            f.restMapper,
 		indexes:               f.indexes,
 		withStatusSubresource: withStatusSubResource,
 	}
+
+	if f.interceptorFns != nil {
+		result = interceptor.NewClient(result, *f.interceptorFns)
+	}
+
+	return result
 }
 
 const trackerAddResourceVersion = "999"

pkg/client/fake/client_test.go

@@ -23,6 +23,8 @@ import (
 	"strconv"
 	"time"
 
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+
 	"github.com/google/go-cmp/cmp"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -1449,4 +1451,17 @@ var _ = Describe("Fake client builder", func() {
 				func(client.Object) []string { return []string{"foo"} })
 		}).To(Panic())
 	})
+
+	It("should wrap the fake client with an interceptor when WithInterceptorFns is called", func() {
+		var called bool
+		cli := NewClientBuilder().WithInterceptorFns(interceptor.Fns{
+			Get: func(ctx context.Context, client client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
+				called = true
+				return nil
+			},
+		}).Build()
+		err := cli.Get(context.Background(), client.ObjectKey{}, &corev1.Pod{})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(called).To(BeTrue())
+	})
 })