resource: use Patch in APIFinalizer

Signed-off-by: Dr. Stefan Schimanski <[email protected]>
crossplane · Sep 18, 2023 · 4af9c39 · 4af9c39
1 parent 2ad600c
commit 4af9c39
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/pkg/resource/api.go b/pkg/resource/api.go
@@ -161,17 +161,19 @@ func (a *APIFinalizer) AddFinalizer(ctx context.Context, obj Object) error {
 	if meta.FinalizerExists(obj, a.finalizer) {
 		return nil
 	}
+	orig := obj.DeepCopyObject().(Object)
 	meta.AddFinalizer(obj, a.finalizer)
-	return errors.Wrap(a.client.Update(ctx, obj), errUpdateObject)
+	return errors.Wrap(a.client.Patch(ctx, obj, client.MergeFromWithOptions(orig, client.MergeFromWithOptimisticLock{})), errUpdateObject)
 }
 
 // RemoveFinalizer from the supplied Managed resource.
 func (a *APIFinalizer) RemoveFinalizer(ctx context.Context, obj Object) error {
 	if !meta.FinalizerExists(obj, a.finalizer) {
 		return nil
 	}
+	orig := obj.DeepCopyObject().(Object)
 	meta.RemoveFinalizer(obj, a.finalizer)
-	return errors.Wrap(IgnoreNotFound(a.client.Update(ctx, obj)), errUpdateObject)
+	return errors.Wrap(IgnoreNotFound(a.client.Patch(ctx, obj, client.MergeFromWithOptions(orig, client.MergeFromWithOptimisticLock{}))), errUpdateObject)
 }
 
 // A FinalizerFns satisfy the Finalizer interface.

diff --git a/pkg/resource/api_test.go b/pkg/resource/api_test.go
@@ -302,7 +302,7 @@ func TestManagedRemoveFinalizer(t *testing.T) {
 		want   want
 	}{
 		"UpdateError": {
-			client: &test.MockClient{MockUpdate: test.NewMockUpdateFn(errBoom)},
+			client: &test.MockClient{MockPatch: test.NewMockPatchFn(errBoom)},
 			args: args{
 				ctx: context.Background(),
 				obj: &fake.Object{ObjectMeta: metav1.ObjectMeta{Finalizers: []string{finalizer}}},
@@ -313,7 +313,7 @@ func TestManagedRemoveFinalizer(t *testing.T) {
 			},
 		},
 		"Successful": {
-			client: &test.MockClient{MockUpdate: test.NewMockUpdateFn(nil)},
+			client: &test.MockClient{MockPatch: test.NewMockPatchFn(nil)},
 			args: args{
 				ctx: context.Background(),
 				obj: &fake.Object{ObjectMeta: metav1.ObjectMeta{Finalizers: []string{finalizer}}},
@@ -360,7 +360,7 @@ func TestAPIFinalizerAdder(t *testing.T) {
 		want   want
 	}{
 		"UpdateError": {
-			client: &test.MockClient{MockUpdate: test.NewMockUpdateFn(errBoom)},
+			client: &test.MockClient{MockPatch: test.NewMockPatchFn(errBoom)},
 			args: args{
 				ctx: context.Background(),
 				obj: &fake.Object{ObjectMeta: metav1.ObjectMeta{Finalizers: []string{}}},
@@ -371,7 +371,7 @@ func TestAPIFinalizerAdder(t *testing.T) {
 			},
 		},
 		"Successful": {
-			client: &test.MockClient{MockUpdate: test.NewMockUpdateFn(nil)},
+			client: &test.MockClient{MockPatch: test.NewMockPatchFn(nil)},
 			args: args{
 				ctx: context.Background(),
 				obj: &fake.Object{ObjectMeta: metav1.ObjectMeta{Finalizers: []string{}}},