Slight refactor

Author: ludydoo

pkg/client/interceptor/intercept.go

@@ -59,9 +59,9 @@ type (
 		SubResource SubResourceFn
 	}
 
-	// SubResourceInterceptorFns is a set of functions that can be used to intercept
+	// SubResourceFns is a set of functions that can be used to intercept
 	// calls to a SubResourceClient.
-	SubResourceInterceptorFns struct {
+	SubResourceFns struct {
 		Get    SubResourceGetFn
 		Create SubResourceCreateFn
 		Update SubResourceUpdateFn
@@ -161,14 +161,14 @@ func (c interceptor) Watch(ctx context.Context, obj client.ObjectList, opts ...c
 
 type subResourceInterceptor struct {
 	client client.SubResourceClient
-	fns    SubResourceInterceptorFns
+	fns    SubResourceFns
 }
 
 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 SubResourceInterceptorFns) client.SubResourceClient {
+func NewSubResourceClient(client client.SubResourceClient, fns SubResourceFns) client.SubResourceClient {
 	return subResourceInterceptor{client: client, fns: fns}
 }
 

pkg/client/interceptor/intercept_test.go

@@ -257,7 +257,7 @@ var _ = Describe("NewSubResourceClient", func() {
 	ctx := context.Background()
 	It("should call the provided Get function", func() {
 		var called bool
-		client := NewSubResourceClient(srClient, SubResourceInterceptorFns{
+		client := NewSubResourceClient(srClient, SubResourceFns{
 			Get: func(ctx context.Context, client client.SubResourceClient, obj client.Object, subResource client.Object, opts ...client.SubResourceGetOption) error {
 				called = true
 				return nil
@@ -268,19 +268,19 @@ var _ = Describe("NewSubResourceClient", func() {
 	})
 	It("should call the underlying client if the provided Get function is nil", func() {
 		var called bool
-		client1 := NewSubResourceClient(srClient, SubResourceInterceptorFns{
+		client1 := NewSubResourceClient(srClient, SubResourceFns{
 			Get: func(ctx context.Context, client client.SubResourceClient, obj client.Object, subResource client.Object, opts ...client.SubResourceGetOption) error {
 				called = true
 				return nil
 			},
 		})
-		client2 := NewSubResourceClient(client1, SubResourceInterceptorFns{})
+		client2 := NewSubResourceClient(client1, SubResourceFns{})
 		_ = client2.Get(ctx, nil, nil)
 		Expect(called).To(BeTrue())
 	})
 	It("should call the provided Update function", func() {
 		var called bool
-		client := NewSubResourceClient(srClient, SubResourceInterceptorFns{
+		client := NewSubResourceClient(srClient, SubResourceFns{
 			Update: func(ctx context.Context, client client.SubResourceClient, obj client.Object, opts ...client.SubResourceUpdateOption) error {
 				called = true
 				return nil
@@ -291,19 +291,19 @@ var _ = Describe("NewSubResourceClient", func() {
 	})
 	It("should call the underlying client if the provided Update function is nil", func() {
 		var called bool
-		client1 := NewSubResourceClient(srClient, SubResourceInterceptorFns{
+		client1 := NewSubResourceClient(srClient, SubResourceFns{
 			Update: func(ctx context.Context, client client.SubResourceClient, obj client.Object, opts ...client.SubResourceUpdateOption) error {
 				called = true
 				return nil
 			},
 		})
-		client2 := NewSubResourceClient(client1, SubResourceInterceptorFns{})
+		client2 := NewSubResourceClient(client1, SubResourceFns{})
 		_ = client2.Update(ctx, nil, nil)
 		Expect(called).To(BeTrue())
 	})
 	It("should call the provided Patch function", func() {
 		var called bool
-		client := NewSubResourceClient(srClient, SubResourceInterceptorFns{
+		client := NewSubResourceClient(srClient, SubResourceFns{
 			Patch: func(ctx context.Context, client client.SubResourceClient, obj client.Object, patch client.Patch, opts ...client.SubResourcePatchOption) error {
 				called = true
 				return nil
@@ -314,19 +314,19 @@ var _ = Describe("NewSubResourceClient", func() {
 	})
 	It("should call the underlying client if the provided Patch function is nil", func() {
 		var called bool
-		client1 := NewSubResourceClient(srClient, SubResourceInterceptorFns{
+		client1 := NewSubResourceClient(srClient, SubResourceFns{
 			Patch: func(ctx context.Context, client client.SubResourceClient, obj client.Object, patch client.Patch, opts ...client.SubResourcePatchOption) error {
 				called = true
 				return nil
 			},
 		})
-		client2 := NewSubResourceClient(client1, SubResourceInterceptorFns{})
+		client2 := NewSubResourceClient(client1, SubResourceFns{})
 		_ = client2.Patch(ctx, nil, nil)
 		Expect(called).To(BeTrue())
 	})
 	It("should call the provided Create function", func() {
 		var called bool
-		client := NewSubResourceClient(srClient, SubResourceInterceptorFns{
+		client := NewSubResourceClient(srClient, SubResourceFns{
 			Create: func(ctx context.Context, client client.SubResourceClient, obj client.Object, subResource client.Object, opts ...client.SubResourceCreateOption) error {
 				called = true
 				return nil
@@ -337,13 +337,13 @@ var _ = Describe("NewSubResourceClient", func() {
 	})
 	It("should call the underlying client if the provided Create function is nil", func() {
 		var called bool
-		client1 := NewSubResourceClient(srClient, SubResourceInterceptorFns{
+		client1 := NewSubResourceClient(srClient, SubResourceFns{
 			Create: func(ctx context.Context, client client.SubResourceClient, obj client.Object, subResource client.Object, opts ...client.SubResourceCreateOption) error {
 				called = true
 				return nil
 			},
 		})
-		client2 := NewSubResourceClient(client1, SubResourceInterceptorFns{})
+		client2 := NewSubResourceClient(client1, SubResourceFns{})
 		_ = client2.Create(ctx, nil, nil)
 		Expect(called).To(BeTrue())
 	})