From 6ecd33734c8c3b0a0435963c5f881115a18a8274 Mon Sep 17 00:00:00 2001
From: Ahmet Alp Balkan <ahmet@linkedin.com>
Date: Mon, 15 Apr 2024 09:25:50 -0700
Subject: [PATCH] style: rename fieldmanager to fieldowner

Addressing some leftover code review comments from the initial PR.
---
 pkg/client/fieldowner.go                      | 20 +++++++++----------
 ...ieldmanager_test.go => fieldowner_test.go} |  0
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename pkg/client/{fieldmanager_test.go => fieldowner_test.go} (100%)

diff --git a/pkg/client/fieldowner.go b/pkg/client/fieldowner.go
index 2f2f892ef3..07183cd192 100644
--- a/pkg/client/fieldowner.go
+++ b/pkg/client/fieldowner.go
@@ -30,28 +30,28 @@ import (
 // will be overridden.
 func WithFieldOwner(c Client, fieldOwner string) Client {
 	return &clientWithFieldManager{
-		manager: fieldOwner,
-		c:       c,
-		Reader:  c,
+		owner:  fieldOwner,
+		c:      c,
+		Reader: c,
 	}
 }
 
 type clientWithFieldManager struct {
-	manager string
-	c       Client
+	owner string
+	c     Client
 	Reader
 }
 
 func (f *clientWithFieldManager) Create(ctx context.Context, obj Object, opts ...CreateOption) error {
-	return f.c.Create(ctx, obj, append([]CreateOption{FieldOwner(f.manager)}, opts...)...)
+	return f.c.Create(ctx, obj, append([]CreateOption{FieldOwner(f.owner)}, opts...)...)
 }
 
 func (f *clientWithFieldManager) Update(ctx context.Context, obj Object, opts ...UpdateOption) error {
-	return f.c.Update(ctx, obj, append([]UpdateOption{FieldOwner(f.manager)}, opts...)...)
+	return f.c.Update(ctx, obj, append([]UpdateOption{FieldOwner(f.owner)}, opts...)...)
 }
 
 func (f *clientWithFieldManager) Patch(ctx context.Context, obj Object, patch Patch, opts ...PatchOption) error {
-	return f.c.Patch(ctx, obj, patch, append([]PatchOption{FieldOwner(f.manager)}, opts...)...)
+	return f.c.Patch(ctx, obj, patch, append([]PatchOption{FieldOwner(f.owner)}, opts...)...)
 }
 
 func (f *clientWithFieldManager) Delete(ctx context.Context, obj Object, opts ...DeleteOption) error {
@@ -73,7 +73,7 @@ func (f *clientWithFieldManager) IsObjectNamespaced(obj runtime.Object) (bool, e
 
 func (f *clientWithFieldManager) Status() StatusWriter {
 	return &subresourceClientWithFieldOwner{
-		owner:             f.manager,
+		owner:             f.owner,
 		subresourceWriter: f.c.Status(),
 	}
 }
@@ -81,7 +81,7 @@ func (f *clientWithFieldManager) Status() StatusWriter {
 func (f *clientWithFieldManager) SubResource(subresource string) SubResourceClient {
 	c := f.c.SubResource(subresource)
 	return &subresourceClientWithFieldOwner{
-		owner:             f.manager,
+		owner:             f.owner,
 		subresourceWriter: c,
 		SubResourceReader: c,
 	}
diff --git a/pkg/client/fieldmanager_test.go b/pkg/client/fieldowner_test.go
similarity index 100%
rename from pkg/client/fieldmanager_test.go
rename to pkg/client/fieldowner_test.go