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

ishitasequeira · web-flow · commit fa9023a006f6 · 2024-12-05T09:35:05.000-07:00
Signed-off-by: Ishita Sequeira &lt;ishiseq29@gmail.com&gt;
diff --git a/server/application/application.go b/server/application/application.go
@@ -2229,7 +2229,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
@@ -2946,7 +2946,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
`@@ -2229,7 +2229,7 @@ func getAmbiguousRevision(app appv1.Application, syncReq application.Applicati`
`2229`	`2229`	`ambiguousRevision := ""`
`2230`	`2230`	`if app.Spec.HasMultipleSources() {`
`2231`	`2231`	`for i, pos := range syncReq.SourcePositions {`
`2232`		`- if pos == int64(sourceIndex) {`
	`2232`	`+ if pos == int64(sourceIndex+1) {`
`2233`	`2233`	`ambiguousRevision = syncReq.Revisions[i]`
`2234`	`2234`	`}`
`2235`	`2235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2946,7 +2946,7 @@ func TestGetAmbiguousRevision_MultiSource(t *testing.T) {`
`2946`	`2946`	`},`
`2947`	`2947`	`}`
`2948`	`2948`	`syncReq := &application.ApplicationSyncRequest{`
`2949`		`- SourcePositions: []int64{0, 1},`
	`2949`	`+ SourcePositions: []int64{1, 2},`
`2950`	`2950`	`Revisions: []string{"rev1", "rev2"},`
`2951`	`2951`	`}`
`2952`	`2952`