Merge branch 'release-2.12' of github.com:codefresh-io/argo-cd into C…

…R-23842-revisions-info-reporting

# Conflicts:
#	changelog/CHANGELOG.md

VERSION

@@ -1 +1 @@
-2.12-2024.9.30-a87492b22
+2.12-2024.9.30-995854136

acr_controller/service/acr_service.go

@@ -3,6 +3,7 @@ package service
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"sync"
 
 	log "github.com/sirupsen/logrus"
@@ -41,11 +42,12 @@ func getChangeRevisionFromRevisions(revisions []string) string {
 }
 
 func getChangeRevision(app *application.Application) string {
-	if changeRevision := getChangeRevisionFromRevisions(app.Operation.Sync.ChangeRevisions); changeRevision != "" {
-		return changeRevision
-	}
 	if app.Status.OperationState != nil && app.Status.OperationState.Operation.Sync != nil {
-		if changeRevision := getChangeRevisionFromRevisions(app.Status.OperationState.Operation.Sync.ChangeRevisions); changeRevision != "" {
+		changeRevision := app.Status.OperationState.Operation.Sync.ChangeRevision
+		if changeRevision != "" {
+			return changeRevision
+		}
+		if changeRevision = getChangeRevisionFromRevisions(app.Status.OperationState.Operation.Sync.ChangeRevisions); changeRevision != "" {
 			return changeRevision
 		}
 	}
@@ -67,7 +69,7 @@ func (c *acrService) ChangeRevision(ctx context.Context, a *application.Applicat
 
 	if getChangeRevision(app) != "" {
 		log.Infof("Change revision already calculated for application %s", app.Name)
-		return nil
+		return errors.New("change revision already calculated")
 	}
 
 	revision, err := c.calculateRevision(ctx, app)

acr_controller/service/acr_service_test.go

@@ -170,4 +170,24 @@ func Test_ChangeRevision(r *testing.T) {
 
 		assert.Equal(t, "new-revision", app.Status.OperationState.Operation.Sync.ChangeRevision)
 	})
+
+	r.Run("Change revision already exists", func(t *testing.T) {
+		client := &mocks.ApplicationClient{}
+		client.On("GetChangeRevision", mock.Anything, mock.Anything).Return(&appclient.ChangeRevisionResponse{
+			Revision: pointer.String("new-revision"),
+		}, nil)
+		acrService := newTestACRService(client)
+		app := createTestApp(syncedAppWithHistory)
+
+		err := acrService.ChangeRevision(context.TODO(), app)
+		require.NoError(t, err)
+
+		app, err = acrService.applicationClientset.ArgoprojV1alpha1().Applications(app.Namespace).Get(context.TODO(), app.Name, metav1.GetOptions{})
+		require.NoError(t, err)
+
+		assert.Equal(t, "new-revision", app.Status.OperationState.Operation.Sync.ChangeRevision)
+
+		err = acrService.ChangeRevision(context.TODO(), app)
+		require.Error(t, err, "change revision already calculated")
+	})
 }

changelog/CHANGELOG-2.12-2024.9.30-995854136.md

@@ -0,0 +1,2 @@
+### Features
+-  fix: change revision controller should verify that revision already exists