From 8ad99d8d0522e3d5f5db78c26edb752c6e1b41cb Mon Sep 17 00:00:00 2001
From: k8s-infra-cherrypick-robot
 <90416843+k8s-infra-cherrypick-robot@users.noreply.github.com>
Date: Sun, 29 Jan 2023 14:46:36 -0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Add=20additional=20SubResource*=20f?=
 =?UTF-8?q?unctions=20for=20FieldOwner=20(#2153)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add additional SubResource* functions for FieldOwner

This enhances #2072 to allow FieldOwner work with SubResources to set the
FieldManager option.

* Typos

* Apply gofmt -s

* Add tests for FieldOwner

---------

Co-authored-by: David Schmitt <david.schmitt@overmind.tech>
---
 pkg/client/options.go      | 15 +++++++++
 pkg/client/options_test.go | 63 ++++++++++++++++++++++++++++++--------
 2 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/pkg/client/options.go b/pkg/client/options.go
index c8fa0dc797..7f6f5b83ff 100644
--- a/pkg/client/options.go
+++ b/pkg/client/options.go
@@ -154,6 +154,21 @@ func (f FieldOwner) ApplyToUpdate(opts *UpdateOptions) {
 	opts.FieldManager = string(f)
 }
 
+// ApplyToSubResourcePatch applies this configuration to the given patch options.
+func (f FieldOwner) ApplyToSubResourcePatch(opts *SubResourcePatchOptions) {
+	opts.FieldManager = string(f)
+}
+
+// ApplyToSubResourceCreate applies this configuration to the given create options.
+func (f FieldOwner) ApplyToSubResourceCreate(opts *SubResourceCreateOptions) {
+	opts.FieldManager = string(f)
+}
+
+// ApplyToSubResourceUpdate applies this configuration to the given update options.
+func (f FieldOwner) ApplyToSubResourceUpdate(opts *SubResourceUpdateOptions) {
+	opts.FieldManager = string(f)
+}
+
 // }}}
 
 // {{{ Create Options
diff --git a/pkg/client/options_test.go b/pkg/client/options_test.go
index ca7ee0fb08..8885ca3544 100644
--- a/pkg/client/options_test.go
+++ b/pkg/client/options_test.go
@@ -86,27 +86,27 @@ var _ = Describe("GetOptions", func() {
 var _ = Describe("CreateOptions", func() {
 	It("Should set DryRun", func() {
 		o := &client.CreateOptions{DryRun: []string{"Hello", "Theodore"}}
-		newCreatOpts := &client.CreateOptions{}
-		o.ApplyToCreate(newCreatOpts)
-		Expect(newCreatOpts).To(Equal(o))
+		newCreateOpts := &client.CreateOptions{}
+		o.ApplyToCreate(newCreateOpts)
+		Expect(newCreateOpts).To(Equal(o))
 	})
 	It("Should set FieldManager", func() {
 		o := &client.CreateOptions{FieldManager: "FieldManager"}
-		newCreatOpts := &client.CreateOptions{}
-		o.ApplyToCreate(newCreatOpts)
-		Expect(newCreatOpts).To(Equal(o))
+		newCreateOpts := &client.CreateOptions{}
+		o.ApplyToCreate(newCreateOpts)
+		Expect(newCreateOpts).To(Equal(o))
 	})
 	It("Should set Raw", func() {
 		o := &client.CreateOptions{Raw: &metav1.CreateOptions{DryRun: []string{"Bye", "Theodore"}}}
-		newCreatOpts := &client.CreateOptions{}
-		o.ApplyToCreate(newCreatOpts)
-		Expect(newCreatOpts).To(Equal(o))
+		newCreateOpts := &client.CreateOptions{}
+		o.ApplyToCreate(newCreateOpts)
+		Expect(newCreateOpts).To(Equal(o))
 	})
 	It("Should not set anything", func() {
 		o := &client.CreateOptions{}
-		newCreatOpts := &client.CreateOptions{}
-		o.ApplyToCreate(newCreatOpts)
-		Expect(newCreatOpts).To(Equal(o))
+		newCreateOpts := &client.CreateOptions{}
+		o.ApplyToCreate(newCreateOpts)
+		Expect(newCreateOpts).To(Equal(o))
 	})
 })
 
@@ -238,3 +238,42 @@ var _ = Describe("MatchingLabels", func() {
 		Expect(err.Error()).To(Equal(expectedErrMsg))
 	})
 })
+
+var _ = Describe("FieldOwner", func() {
+	It("Should apply to PatchOptions", func() {
+		o := &client.PatchOptions{FieldManager: "bar"}
+		t := client.FieldOwner("foo")
+		t.ApplyToPatch(o)
+		Expect(o.FieldManager).To(Equal("foo"))
+	})
+	It("Should apply to CreateOptions", func() {
+		o := &client.CreateOptions{FieldManager: "bar"}
+		t := client.FieldOwner("foo")
+		t.ApplyToCreate(o)
+		Expect(o.FieldManager).To(Equal("foo"))
+	})
+	It("Should apply to UpdateOptions", func() {
+		o := &client.UpdateOptions{FieldManager: "bar"}
+		t := client.FieldOwner("foo")
+		t.ApplyToUpdate(o)
+		Expect(o.FieldManager).To(Equal("foo"))
+	})
+	It("Should apply to SubResourcePatchOptions", func() {
+		o := &client.SubResourcePatchOptions{PatchOptions: client.PatchOptions{FieldManager: "bar"}}
+		t := client.FieldOwner("foo")
+		t.ApplyToSubResourcePatch(o)
+		Expect(o.FieldManager).To(Equal("foo"))
+	})
+	It("Should apply to SubResourceCreateOptions", func() {
+		o := &client.SubResourceCreateOptions{CreateOptions: client.CreateOptions{FieldManager: "bar"}}
+		t := client.FieldOwner("foo")
+		t.ApplyToSubResourceCreate(o)
+		Expect(o.FieldManager).To(Equal("foo"))
+	})
+	It("Should apply to SubResourceUpdateOptions", func() {
+		o := &client.SubResourceUpdateOptions{UpdateOptions: client.UpdateOptions{FieldManager: "bar"}}
+		t := client.FieldOwner("foo")
+		t.ApplyToSubResourceUpdate(o)
+		Expect(o.FieldManager).To(Equal("foo"))
+	})
+})