fix: ensure resource status is patched before checking for updates on

Author: michaelhtm

pkg/runtime/reconciler.go

@@ -615,6 +615,12 @@ func (r *resourceReconciler) Sync(
 				return latest, err
 			}
 			r.rd.MarkAdopted(latest)
+			// ensure status is patched before checking for updates
+			err = r.patchResourceStatus(ctx, desired, latest)
+			if err != nil {
+				return latest, err
+			}
+			return latest, requeue.Needed(fmt.Errorf("requeuing to check for updates"))
 		}
 		if latest, err = r.updateResource(ctx, rm, resolved, latest); err != nil {
 			return latest, err

pkg/runtime/reconciler_test.go

@@ -532,7 +532,7 @@ func TestReconcilerAdoptOrCreateResource_Adopt(t *testing.T) {
 		ackv1alpha1.AnnotationAdoptionPolicy: "adopt-or-create",
 		ackv1alpha1.AnnotationAdoptionFields: adoptionFieldsString,
 	})
-	updated, updatedRTObj, _ := resourceMocks()
+	updated, _, _ := resourceMocks()
 	updated.On("Identifiers").Return(ids)
 	updated.On("Conditions").Return([]*ackv1alpha1.Condition{})
 	updated.On("MetaObject").Return(metav1.ObjectMeta{
@@ -572,28 +572,17 @@ func TestReconcilerAdoptOrCreateResource_Adopt(t *testing.T) {
 		ackv1alpha1.AnnotationAdoptionFields: adoptionFieldsString,
 		ackv1alpha1.AnnotationAdopted:        "true",
 	})
-	// setManaged
-	rd.On("Delta", latest, latest).Return(ackcompare.NewDelta()).Once()
-	// update
-	rd.On("Delta", desired, latest).Return(delta).Once()
-	//
-	rd.On("Delta", desired, updated).Return(ackcompare.NewDelta())
-	rd.On("Delta", updated, updated).Return(ackcompare.NewDelta())
-	rd.On("MarkAdopted", updated).Return().Once()
 
 	r, kc, scmd := reconcilerMocks(rmf)
 	rm.On("EnsureTags", ctx, desired, scmd).Return(nil)
 	statusWriter := &ctrlrtclientmock.SubResourceWriter{}
 	kc.On("Status").Return(statusWriter)
 	kc.On("Patch", withoutCancelContextMatcher, latestRTObj, mock.AnythingOfType("*client.mergeFromPatch")).Return(nil)
-	kc.On("Patch", withoutCancelContextMatcher, updatedRTObj, mock.AnythingOfType("*client.mergeFromPatch")).Return(nil)
-	statusWriter.On("Patch", withoutCancelContextMatcher, updatedRTObj, mock.AnythingOfType("*client.mergeFromPatch")).Return(nil)
+	statusWriter.On("Patch", withoutCancelContextMatcher, latestRTObj, mock.AnythingOfType("*client.mergeFromPatch")).Return(nil)
 	_, err := r.Sync(ctx, rm, desired)
-	require.Nil(err)
+	require.NotNil(err)
 	rm.AssertNumberOfCalls(t, "ReadOne", 1)
-	rm.AssertCalled(t, "Update", ctx, desired, latest, delta)
-	rd.AssertCalled(t, "Delta", desired, latest)
-	rd.AssertNumberOfCalls(t, "MarkAdopted", 2)
+	rd.AssertNumberOfCalls(t, "MarkAdopted", 1)
 	// Assert that the resource is not created or updated
 	rm.AssertNumberOfCalls(t, "Create", 0)
 }