fix monorepo selfheal support and add logs

Author: pasha-codefresh

controller/appcontroller.go

@@ -1961,10 +1961,14 @@ func alreadyAttemptedSync(app *appv1.Application, commitSHA string, commitSHAsMS
 		}
 	} else {
 		manifestsChangedMap := app.Status.Sync.ManifestsChanged
-		if os.Getenv("PERSIST_CHANGE_REVISIONS") != "1" || manifestsChangedMap[commitSHA] {
+		manifestChanged, ok := manifestsChangedMap[commitSHA]
+		// If record not exists, we need to do sync
+		if os.Getenv("PERSIST_CHANGE_REVISIONS") != "1" || !ok || manifestChanged {
 			if app.Status.OperationState.SyncResult.Revision != commitSHA {
 				return false, ""
 			}
+		} else {
+			log.Debugf("Skipping auto-sync: commitSHA %s has no changes", commitSHA)
 		}
 	}
 

controller/appcontroller_test.go

@@ -1980,4 +1980,12 @@ func TestAlreadyAttemptSync(t *testing.T) {
 		attempted, _ := alreadyAttemptedSync(app, "sha", []string{}, false)
 		assert.False(t, attempted)
 	})
+
+	t.Run("different manifest with sync result, with enabled flag", func(t *testing.T) {
+
+		_ = os.Setenv("PERSIST_CHANGE_REVISIONS", "1")
+		
+		attempted, _ := alreadyAttemptedSync(app, "sha", []string{}, false)
+		assert.False(t, attempted)
+	})
 }

controller/state.go

@@ -231,6 +231,7 @@ func (m *appStateManager) GetRepoObjs(app *v1alpha1.Application, sources []v1alp
 			// not need to change, if we already found at least one cached revision that has no changes
 			if updateRevisionResponse != nil && os.Getenv("PERSIST_CHANGE_REVISIONS") == "1" {
 				manifestsChanges[syncedRevision] = updateRevisionResponse.Changes
+				log.WithField("application", app.Name).Debugf("Persisting revision %s with changes exists %t", syncedRevision, updateRevisionResponse.Changes)
 			}
 			if err != nil {
 				return nil, nil, nil, fmt.Errorf("failed to compare revisions for source %d of %d: %w", i+1, len(sources), err)