fix: 20791 - sync multi-source application out of order source syncs (#21071)

ishitasequeira · web-flow · commit 6c2a3fd1e802 · 2024-12-05T16:35:36.000Z
Signed-off-by: Ishita Sequeira &lt;ishiseq29@gmail.com&gt;
diff --git a/server/application/application.go b/server/application/application.go
@@ -2211,7 +2211,7 @@ func getAmbiguousRevision(app *appv1.Application, syncReq *application.Applicati
 	ambiguousRevision := ""
 	if app.Spec.HasMultipleSources() {
 		for i, pos := range syncReq.SourcePositions {
-			if pos == int64(sourceIndex) {
+			if pos == int64(sourceIndex+1) {
 				ambiguousRevision = syncReq.Revisions[i]
 			}
 		}
diff --git a/server/application/application_test.go b/server/application/application_test.go
@@ -2938,7 +2938,7 @@ func TestGetAmbiguousRevision_MultiSource(t *testing.T) {
 		},
 	}
 	syncReq := &application.ApplicationSyncRequest{
-		SourcePositions: []int64{0, 1},
+		SourcePositions: []int64{1, 2},
 		Revisions:       []string{"rev1", "rev2"},
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2211,7 +2211,7 @@ func getAmbiguousRevision(app appv1.Application, syncReq application.Applicati`
`2211`	`2211`	`ambiguousRevision := ""`
`2212`	`2212`	`if app.Spec.HasMultipleSources() {`
`2213`	`2213`	`for i, pos := range syncReq.SourcePositions {`
`2214`		`- if pos == int64(sourceIndex) {`
	`2214`	`+ if pos == int64(sourceIndex+1) {`
`2215`	`2215`	`ambiguousRevision = syncReq.Revisions[i]`
`2216`	`2216`	`}`
`2217`	`2217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2938,7 +2938,7 @@ func TestGetAmbiguousRevision_MultiSource(t *testing.T) {`
`2938`	`2938`	`},`
`2939`	`2939`	`}`
`2940`	`2940`	`syncReq := &application.ApplicationSyncRequest{`
`2941`		`- SourcePositions: []int64{0, 1},`
	`2941`	`+ SourcePositions: []int64{1, 2},`
`2942`	`2942`	`Revisions: []string{"rev1", "rev2"},`
`2943`	`2943`	`}`
`2944`	`2944`