From 636412fbea8793074d33b61b6e9e43adc56296da Mon Sep 17 00:00:00 2001
From: Jon Winton <jwinton@squareup.com>
Date: Mon, 13 Nov 2023 16:51:10 -0800
Subject: [PATCH 1/3] fix: add mergesource get before update

---
 controllers/mergesource_controller.go | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/controllers/mergesource_controller.go b/controllers/mergesource_controller.go
index 550d59a..2660b91 100644
--- a/controllers/mergesource_controller.go
+++ b/controllers/mergesource_controller.go
@@ -141,9 +141,21 @@ func (r *MergeSourceReconciler) reconcileMergeSource(
 		output += data
 	}
 
-	mergeSource.Status.Output = output
-	mergeSource.SetStatusCondition(cmmcv1beta1.MergeSourceConditionReady(len(sources)))
-	if err := r.Status().Update(ctx, mergeSource); err != nil {
+	// Retrieve new copy of the current MergeSource so that we're updating the most recent
+	// version of the resource when we update its status.
+	ms := &cmmcv1beta1.MergeSource{}
+	err = r.Get(ctx, types.NamespacedName{
+		Namespace: mergeSource.Namespace,
+		Name:      mergeSource.Name,
+	}, ms)
+	if err != nil {
+		return false, errors.Wrapf(err, "error retrieving mergeSource %s during status update phase", mergeSource.Name)
+	}
+
+	// Use the newly retrieved MergeSource to update the status.
+	ms.Status.Output = output
+	ms.SetStatusCondition(cmmcv1beta1.MergeSourceConditionReady(len(sources)))
+	if err = r.Status().Update(ctx, ms); err != nil {
 		return false, errors.Wrap(err, "failed updating status after accumulating watched resources")
 	}
 

From 4bfb60650369c02bf4af187a11fccc97dc626c3b Mon Sep 17 00:00:00 2001
From: Jon Winton <jwinton@squareup.com>
Date: Mon, 13 Nov 2023 16:52:49 -0800
Subject: [PATCH 2/3] fix: add configmap get before updating the annotations on
 the cm

---
 controllers/mergesource_controller.go | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/controllers/mergesource_controller.go b/controllers/mergesource_controller.go
index 2660b91..7f3d4df 100644
--- a/controllers/mergesource_controller.go
+++ b/controllers/mergesource_controller.go
@@ -272,7 +272,23 @@ func (r *MergeSourceReconciler) cleanUpWatchedByAnnotation(
 func (r *MergeSourceReconciler) annotateWatchedByConfigMap(
 	ctx context.Context, cm *corev1.ConfigMap, name string,
 ) error {
-	return errors.WithStack(anns.Apply(ctx, r.Client, cm, watchedBy.AddToList(name)))
+	// Retrieve the latest copy of the configmap we're looking to update
+	// before triggering the update to prevent errors with updating a resource
+	// without the most recent changes
+	currentCm := &corev1.ConfigMap{}
+	err := r.Get(ctx, types.NamespacedName{
+		Namespace: cm.Namespace,
+		Name:      cm.Name,
+	}, currentCm)
+	if err != nil {
+		// If not found, the ConfigMap has been deleted
+		if apierrors.IsNotFound(err) {
+			return nil
+		}
+		return errors.Wrapf(err, "error retrieving configmap %s for watched annotation update", cm.Name)
+	}
+
+	return errors.WithStack(anns.Apply(ctx, r.Client, currentCm, watchedBy.AddToList(name)))
 }
 
 type watchedConfigMap struct {

From e887afab5d6212a692c92f49b2facbb544ae9066 Mon Sep 17 00:00:00 2001
From: Jon Winton <jwinton@squareup.com>
Date: Mon, 13 Nov 2023 17:12:11 -0800
Subject: [PATCH 3/3] chore: ignore funlen

---
 controllers/mergesource_controller.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/controllers/mergesource_controller.go b/controllers/mergesource_controller.go
index 7f3d4df..d2825bb 100644
--- a/controllers/mergesource_controller.go
+++ b/controllers/mergesource_controller.go
@@ -94,6 +94,7 @@ func (r *MergeSourceReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	return ctrl.Result{RequeueAfter: time.Minute}, nil
 }
 
+//nolint:funlen
 func (r *MergeSourceReconciler) reconcileMergeSource(
 	ctx context.Context, mergeSource *MergeSource, watched *watchedConfigMap,
 ) (bool, error) {