fix: incorrectly worded error message in argocd-update is corrected (#…

…3192) Signed-off-by: Rohan <[email protected]>
akuity · Jan 2, 2025 · 17f45df · 17f45df
1 parent 37d0647
commit 17f45df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/internal/directives/argocd_updater.go b/internal/directives/argocd_updater.go
@@ -388,8 +388,8 @@ func (a *argocdUpdater) mustPerformUpdate(
 			// NB: We return the current phase here because we want the caller
 			//     to know that an operation is still running.
 			return status.Phase, false, fmt.Errorf(
-				"current operation was not initiated by %q and not by %q: waiting for operation to complete",
-				applicationOperationInitiator, status.Operation.InitiatedBy.Username,
+				"current operation was initiated by %q and not by %q: waiting for operation to complete",
+				status.Operation.InitiatedBy.Username, applicationOperationInitiator,
 			)
 		}
 		// Initiate our own operation.

diff --git a/internal/directives/argocd_updater_test.go b/internal/directives/argocd_updater_test.go
@@ -978,7 +978,8 @@ func Test_argoCDUpdater_mustPerformUpdate(t *testing.T) {
 				}
 			},
 			assertions: func(t *testing.T, phase argocd.OperationPhase, mustUpdate bool, err error) {
-				require.ErrorContains(t, err, "current operation was not initiated by")
+				require.ErrorContains(t, err, "current operation was initiated by")
+				require.ErrorContains(t, err, "and not by")
 				require.ErrorContains(t, err, "waiting for operation to complete")
 				require.Equal(t, argocd.OperationRunning, phase)
 				require.False(t, mustUpdate)