Merge pull request #1917 from FillZpp/add-client-GetOptions

k8s-ci-robot · web-flow · commit f46919744bee · 2022-06-02T09:45:47.000-07:00
⚠ Add GetOptions as optional argument of client.Reader and all its implementation
diff --git a/pkg/cache/informer_cache.go b/pkg/cache/informer_cache.go
@@ -51,7 +51,7 @@ type informerCache struct {
 }
 
 // Get implements Reader.
-func (ip *informerCache) Get(ctx context.Context, key client.ObjectKey, out client.Object) error {
+func (ip *informerCache) Get(ctx context.Context, key client.ObjectKey, out client.Object, opts ...client.GetOption) error {
 	gvk, err := apiutil.GVKForObject(out, ip.Scheme)
 	if err != nil {
 		return err
diff --git a/pkg/cache/informertest/fake_cache.go b/pkg/cache/informertest/fake_cache.go
@@ -131,7 +131,7 @@ func (c *FakeInformers) IndexField(ctx context.Context, obj client.Object, field
 }
 
 // Get implements Cache.
-func (c *FakeInformers) Get(ctx context.Context, key client.ObjectKey, obj client.Object) error {
+func (c *FakeInformers) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
 	return nil
 }
 
diff --git a/pkg/cache/internal/cache_reader.go b/pkg/cache/internal/cache_reader.go
@@ -54,7 +54,7 @@ type CacheReader struct {
 }
 
 // Get checks the indexer for the object and writes a copy of it if found.
-func (c *CacheReader) Get(_ context.Context, key client.ObjectKey, out client.Object) error {
+func (c *CacheReader) Get(_ context.Context, key client.ObjectKey, out client.Object, opts ...client.GetOption) error {
 	if c.scopeName == apimeta.RESTScopeNameRoot {
 		key.Namespace = ""
 	}
diff --git a/pkg/cache/multi_namespace_cache.go b/pkg/cache/multi_namespace_cache.go
@@ -200,7 +200,7 @@ func (c *multiNamespaceCache) IndexField(ctx context.Context, obj client.Object,
 	return nil
 }
 
-func (c *multiNamespaceCache) Get(ctx context.Context, key client.ObjectKey, obj client.Object) error {
+func (c *multiNamespaceCache) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
 	isNamespaced, err := objectutil.IsAPINamespaced(obj, c.Scheme, c.RESTMapper)
 	if err != nil {
 		return err
diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -241,16 +241,16 @@ func (c *client) Patch(ctx context.Context, obj Object, patch Patch, opts ...Pat
 }
 
 // Get implements client.Client.
-func (c *client) Get(ctx context.Context, key ObjectKey, obj Object) error {
+func (c *client) Get(ctx context.Context, key ObjectKey, obj Object, opts ...GetOption) error {
 	switch obj.(type) {
 	case *unstructured.Unstructured:
-		return c.unstructuredClient.Get(ctx, key, obj)
+		return c.unstructuredClient.Get(ctx, key, obj, opts...)
 	case *metav1.PartialObjectMetadata:
 		// Metadata only object should always preserve the GVK coming in from the caller.
 		defer c.resetGroupVersionKind(obj, obj.GetObjectKind().GroupVersionKind())
-		return c.metadataClient.Get(ctx, key, obj)
+		return c.metadataClient.Get(ctx, key, obj, opts...)
 	default:
-		return c.typedClient.Get(ctx, key, obj)
+		return c.typedClient.Get(ctx, key, obj, opts...)
 	}
 }
 
diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go
@@ -2913,6 +2913,24 @@ var _ = Describe("Client", func() {
 		})
 	})
 
+	Describe("GetOptions", func() {
+		It("should be convertable to metav1.GetOptions", func() {
+			o := (&client.GetOptions{}).ApplyOptions([]client.GetOption{
+				&client.GetOptions{Raw: &metav1.GetOptions{ResourceVersion: "RV0"}},
+			})
+			mo := o.AsGetOptions()
+			Expect(mo).NotTo(BeNil())
+			Expect(mo.ResourceVersion).To(Equal("RV0"))
+		})
+
+		It("should produce empty metav1.GetOptions if nil", func() {
+			var o *client.GetOptions
+			Expect(o.AsGetOptions()).To(Equal(&metav1.GetOptions{}))
+			o = &client.GetOptions{}
+			Expect(o.AsGetOptions()).To(Equal(&metav1.GetOptions{}))
+		})
+	})
+
 	Describe("ListOptions", func() {
 		It("should be convertable to metav1.ListOptions", func() {
 			lo := (&client.ListOptions{}).ApplyOptions([]client.ListOption{
@@ -3389,7 +3407,7 @@ type fakeReader struct {
 	Called int
 }
 
-func (f *fakeReader) Get(ctx context.Context, key client.ObjectKey, obj client.Object) error {
+func (f *fakeReader) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
 	f.Called++
 	return nil
 }
diff --git a/pkg/client/dryrun.go b/pkg/client/dryrun.go
@@ -72,8 +72,8 @@ func (c *dryRunClient) Patch(ctx context.Context, obj Object, patch Patch, opts
 }
 
 // Get implements client.Client.
-func (c *dryRunClient) Get(ctx context.Context, key ObjectKey, obj Object) error {
-	return c.client.Get(ctx, key, obj)
+func (c *dryRunClient) Get(ctx context.Context, key ObjectKey, obj Object, opts ...GetOption) error {
+	return c.client.Get(ctx, key, obj, opts...)
 }
 
 // List implements client.Client.
diff --git a/pkg/client/fake/client.go b/pkg/client/fake/client.go
@@ -329,7 +329,7 @@ func (t versionedTracker) Update(gvr schema.GroupVersionResource, obj runtime.Ob
 	return t.ObjectTracker.Update(gvr, obj, ns)
 }
 
-func (c *fakeClient) Get(ctx context.Context, key client.ObjectKey, obj client.Object) error {
+func (c *fakeClient) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
 	gvr, err := getGVRFromObject(obj, c.scheme)
 	if err != nil {
 		return err
diff --git a/pkg/client/interfaces.go b/pkg/client/interfaces.go
@@ -50,7 +50,7 @@ type Reader interface {
 	// Get retrieves an obj for the given object key from the Kubernetes Cluster.
 	// obj must be a struct pointer so that obj can be updated with the response
 	// returned by the Server.
-	Get(ctx context.Context, key ObjectKey, obj Object) error
+	Get(ctx context.Context, key ObjectKey, obj Object, opts ...GetOption) error
 
 	// List retrieves list of objects for a given namespace and list options. On a
 	// successful call, Items field in the list will be populated with the
diff --git a/pkg/client/metadata_client.go b/pkg/client/metadata_client.go
@@ -116,20 +116,23 @@ func (mc *metadataClient) Patch(ctx context.Context, obj Object, patch Patch, op
 }
 
 // Get implements client.Client.
-func (mc *metadataClient) Get(ctx context.Context, key ObjectKey, obj Object) error {
+func (mc *metadataClient) Get(ctx context.Context, key ObjectKey, obj Object, opts ...GetOption) error {
 	metadata, ok := obj.(*metav1.PartialObjectMetadata)
 	if !ok {
 		return fmt.Errorf("metadata client did not understand object: %T", obj)
 	}
 
 	gvk := metadata.GroupVersionKind()
 
+	getOpts := GetOptions{}
+	getOpts.ApplyOptions(opts)
+
 	resInt, err := mc.getResourceInterface(gvk, key.Namespace)
 	if err != nil {
 		return err
 	}
 
-	res, err := resInt.Get(ctx, key.Name, metav1.GetOptions{})
+	res, err := resInt.Get(ctx, key.Name, *getOpts.AsGetOptions())
 	if err != nil {
 		return err
 	}
diff --git a/pkg/client/namespaced_client.go b/pkg/client/namespaced_client.go
@@ -138,7 +138,7 @@ func (n *namespacedClient) Patch(ctx context.Context, obj Object, patch Patch, o
 }
 
 // Get implements client.Client.
-func (n *namespacedClient) Get(ctx context.Context, key ObjectKey, obj Object) error {
+func (n *namespacedClient) Get(ctx context.Context, key ObjectKey, obj Object, opts ...GetOption) error {
 	isNamespaceScoped, err := objectutil.IsAPINamespaced(obj, n.Scheme(), n.RESTMapper())
 	if err != nil {
 		return fmt.Errorf("error finding the scope of the object: %w", err)
@@ -149,7 +149,7 @@ func (n *namespacedClient) Get(ctx context.Context, key ObjectKey, obj Object) e
 		}
 		key.Namespace = n.namespace
 	}
-	return n.client.Get(ctx, key, obj)
+	return n.client.Get(ctx, key, obj, opts...)
 }
 
 // List implements client.Client.
diff --git a/pkg/client/options.go b/pkg/client/options.go
@@ -37,6 +37,12 @@ type DeleteOption interface {
 	ApplyToDelete(*DeleteOptions)
 }
 
+// GetOption is some configuration that modifies options for a get request.
+type GetOption interface {
+	// ApplyToGet applies this configuration to the given get options.
+	ApplyToGet(*GetOptions)
+}
+
 // ListOption is some configuration that modifies options for a list request.
 type ListOption interface {
 	// ApplyToList applies this configuration to the given list options.
@@ -311,6 +317,45 @@ func (p PropagationPolicy) ApplyToDeleteAllOf(opts *DeleteAllOfOptions) {
 
 // }}}
 
+// {{{ Get Options
+
+// GetOptions contains options for get operation.
+// Now it only has a Raw field, with support for specific resourceVersion.
+type GetOptions struct {
+	// Raw represents raw GetOptions, as passed to the API server.  Note
+	// that these may not be respected by all implementations of interface.
+	Raw *metav1.GetOptions
+}
+
+var _ GetOption = &GetOptions{}
+
+// ApplyToGet implements GetOption for GetOptions.
+func (o *GetOptions) ApplyToGet(lo *GetOptions) {
+	if o.Raw != nil {
+		lo.Raw = o.Raw
+	}
+}
+
+// AsGetOptions returns these options as a flattened metav1.GetOptions.
+// This may mutate the Raw field.
+func (o *GetOptions) AsGetOptions() *metav1.GetOptions {
+	if o == nil || o.Raw == nil {
+		return &metav1.GetOptions{}
+	}
+	return o.Raw
+}
+
+// ApplyOptions applies the given get options on these options,
+// and then returns itself (for convenient chaining).
+func (o *GetOptions) ApplyOptions(opts []GetOption) *GetOptions {
+	for _, opt := range opts {
+		opt.ApplyToGet(o)
+	}
+	return o
+}
+
+// }}}
+
 // {{{ List Options
 
 // ListOptions contains options for limiting or filtering results.
diff --git a/pkg/client/options_test.go b/pkg/client/options_test.go
@@ -74,6 +74,15 @@ var _ = Describe("ListOptions", func() {
 	})
 })
 
+var _ = Describe("GetOptions", func() {
+	It("Should set Raw", func() {
+		o := &client.GetOptions{Raw: &metav1.GetOptions{ResourceVersion: "RV0"}}
+		newGetOpts := &client.GetOptions{}
+		o.ApplyToGet(newGetOpts)
+		Expect(newGetOpts).To(Equal(o))
+	})
+})
+
 var _ = Describe("CreateOptions", func() {
 	It("Should set DryRun", func() {
 		o := &client.CreateOptions{DryRun: []string{"Hello", "Theodore"}}
diff --git a/pkg/client/split.go b/pkg/client/split.go
@@ -121,13 +121,13 @@ func (d *delegatingReader) shouldBypassCache(obj runtime.Object) (bool, error) {
 }
 
 // Get retrieves an obj for a given object key from the Kubernetes Cluster.
-func (d *delegatingReader) Get(ctx context.Context, key ObjectKey, obj Object) error {
+func (d *delegatingReader) Get(ctx context.Context, key ObjectKey, obj Object, opts ...GetOption) error {
 	if isUncached, err := d.shouldBypassCache(obj); err != nil {
 		return err
 	} else if isUncached {
-		return d.ClientReader.Get(ctx, key, obj)
+		return d.ClientReader.Get(ctx, key, obj, opts...)
 	}
-	return d.CacheReader.Get(ctx, key, obj)
+	return d.CacheReader.Get(ctx, key, obj, opts...)
 }
 
 // List retrieves list of objects for a given namespace and list options.
diff --git a/pkg/client/typed_client.go b/pkg/client/typed_client.go
@@ -132,14 +132,17 @@ func (c *typedClient) Patch(ctx context.Context, obj Object, patch Patch, opts .
 }
 
 // Get implements client.Client.
-func (c *typedClient) Get(ctx context.Context, key ObjectKey, obj Object) error {
+func (c *typedClient) Get(ctx context.Context, key ObjectKey, obj Object, opts ...GetOption) error {
 	r, err := c.cache.getResource(obj)
 	if err != nil {
 		return err
 	}
+	getOpts := GetOptions{}
+	getOpts.ApplyOptions(opts)
 	return r.Get().
 		NamespaceIfScoped(key.Namespace, r.isNamespaced()).
 		Resource(r.resource()).
+		VersionedParams(getOpts.AsGetOptions(), c.paramCodec).
 		Name(key.Name).Do(ctx).Into(obj)
 }
 
diff --git a/pkg/client/unstructured_client.go b/pkg/client/unstructured_client.go
@@ -165,14 +165,17 @@ func (uc *unstructuredClient) Patch(ctx context.Context, obj Object, patch Patch
 }
 
 // Get implements client.Client.
-func (uc *unstructuredClient) Get(ctx context.Context, key ObjectKey, obj Object) error {
+func (uc *unstructuredClient) Get(ctx context.Context, key ObjectKey, obj Object, opts ...GetOption) error {
 	u, ok := obj.(*unstructured.Unstructured)
 	if !ok {
 		return fmt.Errorf("unstructured client did not understand object: %T", obj)
 	}
 
 	gvk := u.GroupVersionKind()
 
+	getOpts := GetOptions{}
+	getOpts.ApplyOptions(opts)
+
 	r, err := uc.cache.getResource(obj)
 	if err != nil {
 		return err
@@ -181,6 +184,7 @@ func (uc *unstructuredClient) Get(ctx context.Context, key ObjectKey, obj Object
 	result := r.Get().
 		NamespaceIfScoped(key.Namespace, r.isNamespaced()).
 		Resource(r.resource()).
+		VersionedParams(getOpts.AsGetOptions(), uc.paramCodec).
 		Name(key.Name).
 		Do(ctx).
 		Into(obj)
diff --git a/pkg/controller/controllerutil/controllerutil_test.go b/pkg/controller/controllerutil/controllerutil_test.go
@@ -832,6 +832,6 @@ type errorReader struct {
 	client.Client
 }
 
-func (e errorReader) Get(ctx context.Context, key client.ObjectKey, into client.Object) error {
+func (e errorReader) Get(ctx context.Context, key client.ObjectKey, into client.Object, opts ...client.GetOption) error {
 	return fmt.Errorf("unexpected error")
 }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ type informerCache struct {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`// Get implements Reader.`
`54`		`-func (ip *informerCache) Get(ctx context.Context, key client.ObjectKey, out client.Object) error {`
	`54`	`+func (ip *informerCache) Get(ctx context.Context, key client.ObjectKey, out client.Object, opts ...client.GetOption) error {`
`55`	`55`	`gvk, err := apiutil.GVKForObject(out, ip.Scheme)`
`56`	`56`	`if err != nil {`
`57`	`57`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func (c *FakeInformers) IndexField(ctx context.Context, obj client.Object, field`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`// Get implements Cache.`
`134`		`-func (c *FakeInformers) Get(ctx context.Context, key client.ObjectKey, obj client.Object) error {`
	`134`	`+func (c *FakeInformers) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {`
`135`	`135`	`return nil`
`136`	`136`	`}`
`137`	`137`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ type CacheReader struct {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`// Get checks the indexer for the object and writes a copy of it if found.`
`57`		`-func (c *CacheReader) Get(_ context.Context, key client.ObjectKey, out client.Object) error {`
	`57`	`+func (c *CacheReader) Get(_ context.Context, key client.ObjectKey, out client.Object, opts ...client.GetOption) error {`
`58`	`58`	`if c.scopeName == apimeta.RESTScopeNameRoot {`
`59`	`59`	`key.Namespace = ""`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ func (c *multiNamespaceCache) IndexField(ctx context.Context, obj client.Object,`
`200`	`200`	`return nil`
`201`	`201`	`}`
`202`	`202`
`203`		`-func (c *multiNamespaceCache) Get(ctx context.Context, key client.ObjectKey, obj client.Object) error {`
	`203`	`+func (c *multiNamespaceCache) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {`
`204`	`204`	`isNamespaced, err := objectutil.IsAPINamespaced(obj, c.Scheme, c.RESTMapper)`
`205`	`205`	`if err != nil {`
`206`	`206`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -241,16 +241,16 @@ func (c *client) Patch(ctx context.Context, obj Object, patch Patch, opts ...Pat`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`// Get implements client.Client.`
`244`		`-func (c *client) Get(ctx context.Context, key ObjectKey, obj Object) error {`
	`244`	`+func (c *client) Get(ctx context.Context, key ObjectKey, obj Object, opts ...GetOption) error {`
`245`	`245`	`switch obj.(type) {`
`246`	`246`	`case *unstructured.Unstructured:`
`247`		`- return c.unstructuredClient.Get(ctx, key, obj)`
	`247`	`+ return c.unstructuredClient.Get(ctx, key, obj, opts...)`
`248`	`248`	`case *metav1.PartialObjectMetadata:`
`249`	`249`	`// Metadata only object should always preserve the GVK coming in from the caller.`
`250`	`250`	`defer c.resetGroupVersionKind(obj, obj.GetObjectKind().GroupVersionKind())`
`251`		`- return c.metadataClient.Get(ctx, key, obj)`
	`251`	`+ return c.metadataClient.Get(ctx, key, obj, opts...)`
`252`	`252`	`default:`
`253`		`- return c.typedClient.Get(ctx, key, obj)`
	`253`	`+ return c.typedClient.Get(ctx, key, obj, opts...)`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,8 @@ func (c *dryRunClient) Patch(ctx context.Context, obj Object, patch Patch, opts`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`// Get implements client.Client.`
`75`		`-func (c *dryRunClient) Get(ctx context.Context, key ObjectKey, obj Object) error {`
`76`		`- return c.client.Get(ctx, key, obj)`
	`75`	`+func (c *dryRunClient) Get(ctx context.Context, key ObjectKey, obj Object, opts ...GetOption) error {`
	`76`	`+ return c.client.Get(ctx, key, obj, opts...)`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`// List implements client.Client.`
Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ func (t versionedTracker) Update(gvr schema.GroupVersionResource, obj runtime.Ob`
`329`	`329`	`return t.ObjectTracker.Update(gvr, obj, ns)`
`330`	`330`	`}`
`331`	`331`
`332`		`-func (c *fakeClient) Get(ctx context.Context, key client.ObjectKey, obj client.Object) error {`
	`332`	`+func (c *fakeClient) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {`
`333`	`333`	`gvr, err := getGVRFromObject(obj, c.scheme)`
`334`	`334`	`if err != nil {`
`335`	`335`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -116,20 +116,23 @@ func (mc *metadataClient) Patch(ctx context.Context, obj Object, patch Patch, op`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`// Get implements client.Client.`
`119`		`-func (mc *metadataClient) Get(ctx context.Context, key ObjectKey, obj Object) error {`
	`119`	`+func (mc *metadataClient) Get(ctx context.Context, key ObjectKey, obj Object, opts ...GetOption) error {`
`120`	`120`	`metadata, ok := obj.(*metav1.PartialObjectMetadata)`
`121`	`121`	`if !ok {`
`122`	`122`	`return fmt.Errorf("metadata client did not understand object: %T", obj)`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`gvk := metadata.GroupVersionKind()`
`126`	`126`
	`127`	`+ getOpts := GetOptions{}`
	`128`	`+ getOpts.ApplyOptions(opts)`
	`129`	`+`
`127`	`130`	`resInt, err := mc.getResourceInterface(gvk, key.Namespace)`
`128`	`131`	`if err != nil {`
`129`	`132`	`return err`
`130`	`133`	`}`
`131`	`134`
`132`		`- res, err := resInt.Get(ctx, key.Name, metav1.GetOptions{})`
	`135`	`+ res, err := resInt.Get(ctx, key.Name, *getOpts.AsGetOptions())`
`133`	`136`	`if err != nil {`
`134`	`137`	`return err`
`135`	`138`	`}`