Cleanup

Author: ludydoo

pkg/client/interceptor/intercept.go

@@ -10,11 +10,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-// NewClient returns a new interceptor client that calls the functions in fns instead of the underlying client's methods, if they are not nil.
-func NewClient(client client.WithWatch, fns Fns) client.WithWatch {
-	return interceptor{client: client, fns: fns}
-}
-
 type (
 	// GetFn is a function that can be used to intercept GET calls.
 	GetFn func(ctx context.Context, client client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error
@@ -66,6 +61,16 @@ type (
 	}
 )
 
+// NewClient returns a new interceptor client that calls the functions in fns instead of the underlying client's methods, if they are not nil.
+func NewClient(client client.WithWatch, fns Fns) client.WithWatch {
+	return interceptor{client: client, fns: fns}
+}
+
+// NewSubResourceClient returns a SubResourceClient that intercepts calls to the provided client with the provided functions.
+func NewSubResourceClient(client client.SubResourceClient, fns SubResourceFns) client.SubResourceClient {
+	return subResourceInterceptor{client: client, fns: fns}
+}
+
 type interceptor struct {
 	client client.WithWatch
 	fns    Fns
@@ -163,11 +168,6 @@ type subResourceInterceptor struct {
 
 var _ client.SubResourceClient = &subResourceInterceptor{}
 
-// NewSubResourceClient returns a SubResourceClient that intercepts calls to the provided client with the provided functions.
-func NewSubResourceClient(client client.SubResourceClient, fns SubResourceFns) client.SubResourceClient {
-	return subResourceInterceptor{client: client, fns: fns}
-}
-
 func (s subResourceInterceptor) Get(ctx context.Context, obj client.Object, subResource client.Object, opts ...client.SubResourceGetOption) error {
 	if s.fns.Get != nil {
 		return s.fns.Get(ctx, s.client, obj, subResource, opts...)