Slight refactor & lint

Author: ludydoo

pkg/client/interceptor/intercept.go

@@ -16,19 +16,58 @@ func NewClient(client client.WithWatch, fns Fns) client.WithWatch {
 	return interceptor{client: client, fns: fns}
 }
 
-// Fns contains functions that are called instead of the underlying
-// client's methods.
-type Fns struct {
-	Get         func(ctx context.Context, client client.WithWatch, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error
-	List        func(ctx context.Context, client client.WithWatch, list client.ObjectList, opts ...client.ListOption) error
-	Create      func(ctx context.Context, client client.WithWatch, obj client.Object, opts ...client.CreateOption) error
-	Delete      func(ctx context.Context, client client.WithWatch, obj client.Object, opts ...client.DeleteOption) error
-	DeleteAllOf func(ctx context.Context, client client.WithWatch, obj client.Object, opts ...client.DeleteAllOfOption) error
-	Update      func(ctx context.Context, client client.WithWatch, obj client.Object, opts ...client.UpdateOption) error
-	Patch       func(ctx context.Context, client client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error
-	Watch       func(ctx context.Context, client client.WithWatch, obj client.ObjectList, opts ...client.ListOption) (watch.Interface, error)
-	SubResource func(client client.WithWatch, subResource string) client.SubResourceClient
-}
+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
+	// ListFn is a function that can be used to intercept LIST calls.
+	ListFn func(ctx context.Context, client client.WithWatch, list client.ObjectList, opts ...client.ListOption) error
+	// CreateFn is a function that can be used to intercept CREATE calls.
+	CreateFn func(ctx context.Context, client client.WithWatch, obj client.Object, opts ...client.CreateOption) error
+	// DeleteFn is a function that can be used to intercept DELETE calls.
+	DeleteFn func(ctx context.Context, client client.WithWatch, obj client.Object, opts ...client.DeleteOption) error
+	// DeleteAllOfFn is a function that can be used to intercept Collection DELETE calls.
+	DeleteAllOfFn func(ctx context.Context, client client.WithWatch, obj client.Object, opts ...client.DeleteAllOfOption) error
+	// UpdateFn is a function that can be used to intercept UPDATE calls.
+	UpdateFn func(ctx context.Context, client client.WithWatch, obj client.Object, opts ...client.UpdateOption) error
+	// PatchFn is a function that can be used to intercept PATCH calls.
+	PatchFn func(ctx context.Context, client client.WithWatch, obj client.Object, patch client.Patch, opts ...client.PatchOption) error
+	// WatchFn is a function that can be used to intercept WATCH calls.
+	WatchFn func(ctx context.Context, client client.WithWatch, obj client.ObjectList, opts ...client.ListOption) (watch.Interface, error)
+	// SubResourceFn is a function that can be used to intercept SubResource calls.
+	SubResourceFn func(client client.WithWatch, subResource string) client.SubResourceClient
+
+	// SubResourceGetFn is a function that can be used to intercept SubResource GET calls.
+	SubResourceGetFn func(ctx context.Context, client client.SubResourceClient, obj client.Object, subResource client.Object, opts ...client.SubResourceGetOption) error
+	// SubResourceCreateFn is a function that can be used to intercept SubResource CREATE calls.
+	SubResourceCreateFn func(ctx context.Context, client client.SubResourceClient, obj client.Object, subResource client.Object, opts ...client.SubResourceCreateOption) error
+	// SubResourceUpdateFn is a function that can be used to intercept SubResource UPDATE calls.
+	SubResourceUpdateFn func(ctx context.Context, client client.SubResourceClient, obj client.Object, opts ...client.SubResourceUpdateOption) error
+	// SubResourcePatchFn is a function that can be used to intercept SubResource PATCH calls.
+	SubResourcePatchFn func(ctx context.Context, client client.SubResourceClient, obj client.Object, patch client.Patch, opts ...client.SubResourcePatchOption) error
+
+	// Fns contains functions that are called instead of the underlying
+	// client's methods.
+	Fns struct {
+		Get         GetFn
+		List        ListFn
+		Create      CreateFn
+		Delete      DeleteFn
+		DeleteAllOf DeleteAllOfFn
+		Update      UpdateFn
+		Patch       PatchFn
+		Watch       WatchFn
+		SubResource SubResourceFn
+	}
+
+	// SubResourceInterceptorFns is a set of functions that can be used to intercept
+	// calls to a SubResourceClient.
+	SubResourceInterceptorFns struct {
+		Get    SubResourceGetFn
+		Create SubResourceCreateFn
+		Update SubResourceUpdateFn
+		Patch  SubResourcePatchFn
+	}
+)
 
 type interceptor struct {
 	client client.WithWatch
@@ -120,15 +159,6 @@ func (c interceptor) Watch(ctx context.Context, obj client.ObjectList, opts ...c
 	return c.client.Watch(ctx, obj, opts...)
 }
 
-// SubResourceInterceptorFns is a set of functions that can be used to intercept
-// calls to a SubResourceClient.
-type SubResourceInterceptorFns struct {
-	Get    func(ctx context.Context, client client.SubResourceClient, obj client.Object, subResource client.Object, opts ...client.SubResourceGetOption) error
-	Create func(ctx context.Context, client client.SubResourceClient, obj client.Object, subResource client.Object, opts ...client.SubResourceCreateOption) error
-	Update func(ctx context.Context, client client.SubResourceClient, obj client.Object, opts ...client.SubResourceUpdateOption) error
-	Patch  func(ctx context.Context, client client.SubResourceClient, obj client.Object, patch client.Patch, opts ...client.SubResourcePatchOption) error
-}
-
 type subResourceInterceptor struct {
 	client client.SubResourceClient
 	fns    SubResourceInterceptorFns

pkg/client/interceptor/intercept_test.go

@@ -2,6 +2,7 @@ package interceptor
 
 import (
 	"context"
+
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
 	. "github.com/onsi/ginkgo/v2"