chore: LastCompletedNonDryRunOperation support

controller/sync.go

@@ -444,11 +444,14 @@ func (m *appStateManager) SyncAppState(app *v1alpha1.Application, state *v1alpha
 
 	logEntry.WithField("duration", time.Since(start)).Info("sync/terminate complete")
 
-	if !syncOp.DryRun && len(syncOp.Resources) == 0 && state.Phase.Successful() {
-		err := m.persistRevisionHistory(app, compareResult.syncStatus.Revision, source, compareResult.syncStatus.Revisions, compareResult.syncStatus.ComparedTo.Sources, isMultiSourceRevision, state.StartedAt, state.Operation.InitiatedBy)
-		if err != nil {
-			state.Phase = common.OperationError
-			state.Message = fmt.Sprintf("failed to record sync to history: %v", err)
+	if !syncOp.DryRun && state.Phase.Successful() {
+		app.Status.LastCompletedNonDryRunOperation = state
+		if len(syncOp.Resources) == 0 {
+			err := m.persistRevisionHistory(app, compareResult.syncStatus.Revision, source, compareResult.syncStatus.Revisions, compareResult.syncStatus.ComparedTo.Sources, isMultiSourceRevision, state.StartedAt, state.Operation.InitiatedBy)
+			if err != nil {
+				state.Phase = common.OperationError
+				state.Message = fmt.Sprintf("failed to record sync to history: %v", err)
+			}
 		}
 	}
 }

pkg/apiclient/application/forwarder_overwrite.go

@@ -44,6 +44,7 @@ var appFields = map[string]func(app *v1alpha1.Application) any{
 		}
 		return nil
 	},
+	"status.lastNonDryRunOperationState": func(app *v1alpha1.Application) any { return app.GetLastNonDryRunOperationState() },
 	"status.resources": func(app *v1alpha1.Application) any {
 		if len(app.Status.Resources) > 0 {
 			return app.Status.Resources

pkg/apis/application/v1alpha1/types.go

@@ -1157,6 +1157,8 @@ type ApplicationStatus struct {
 	ControllerNamespace string `json:"controllerNamespace,omitempty" protobuf:"bytes,13,opt,name=controllerNamespace"`
 	// SourceHydrator stores information about the current state of source hydration
 	SourceHydrator SourceHydratorStatus `json:"sourceHydrator,omitempty" protobuf:"bytes,14,opt,name=sourceHydrator"`
+	// OperationState contains information about the last non dryrun completed operation
+	LastCompletedNonDryRunOperation *OperationState `json:"lastCompletedNonDryRunOperation,omitempty" protobuf:"bytes,15,opt,name=lastCompletedNonDryRunOperation"`
 }
 
 // SourceHydratorStatus contains information about the current state of source hydration
@@ -3214,6 +3216,15 @@ func (app *Application) IsFinalizerPresent(finalizer string) bool {
 	return getFinalizerIndex(app.ObjectMeta, finalizer) > -1
 }
 
+// GetLastNonDryRunOperationState returns the last complete or ongoing non dryrun operation if exists or nil in other case
+func (app *Application) GetLastNonDryRunOperationState() *OperationState {
+	if app.Status.OperationState != nil && app.Status.OperationState.Operation.DryRun() {
+		return app.Status.LastCompletedNonDryRunOperation
+	}
+
+	return app.Status.OperationState
+}
+
 // SetConditions updates the application status conditions for a subset of evaluated types.
 // If the application has a pre-existing condition of a type that is not in the evaluated list,
 // it will be preserved. If the application has a pre-existing condition of a type that