Add minimum version check for creating rollbacks entries in update marker

Author: pchila

internal/pkg/agent/application/upgrade/step_mark.go

@@ -216,9 +216,10 @@ func markUpgrade(log *logger.Logger, dataDirPath string, updatedOn time.Time, ag
 		DesiredOutcome:    desiredOutcome,
 	}
 
-	if rollbackWindow > 0 {
-
+	if rollbackWindow > 0 && agent.parsedVersion != nil && !agent.parsedVersion.Less(*Version_9_2_0_SNAPSHOT) {
 		// if we have a not empty rollback window, write the prev version in the rollbacks_available field
+		// we also need to check the destination version because the manual rollback and delayed cleanup will be
+		// handled by that version of agent, so it needs to be recent enough
 		upgradeDetails.Metadata.RollbacksAvailable = []details.RollbackAvailable{
 			{
 				Version:    previousAgent.version,

internal/pkg/agent/application/upgrade/step_mark_test.go

@@ -268,7 +268,7 @@ desired_outcome: true
 func TestMarkUpgrade(t *testing.T) {
 	var parsed123SNAPSHOT = agtversion.NewParsedSemVer(1, 2, 3, "SNAPSHOT", "")
 	var parsed456SNAPSHOT = agtversion.NewParsedSemVer(4, 5, 6, "SNAPSHOT", "")
-
+	var parsed920SNAPSHOT = agtversion.NewParsedSemVer(9, 2, 0, "SNAPSHOT", "")
 	// fix a timestamp (truncated to the second because of loss of precision during marshalling/unmarshalling)
 	updatedOnNow := time.Now().UTC().Truncate(time.Second)
 
@@ -371,7 +371,7 @@ func TestMarkUpgrade(t *testing.T) {
 			},
 		},
 		{
-			name: "rollback window specified - available rollbacks must be present",
+			name: "rollback window specified but new version is too low - no rollbacks",
 			args: args{
 				updatedOn: updatedOnNow,
 				currentAgent: agentInstall{
@@ -410,6 +410,52 @@ func TestMarkUpgrade(t *testing.T) {
 						TargetVersion: "4.5.6-SNAPSHOT",
 						State:         "UPG_REPLACING",
 						ActionID:      "",
+					},
+					DesiredOutcome: OUTCOME_UPGRADE,
+				}
+				assert.Equal(t, expectedMarker, actualMarker)
+			},
+		},
+		{
+			name: "rollback window specified and new version is at least 9.2.0-SNAPSHOT - available rollbacks must be present",
+			args: args{
+				updatedOn: updatedOnNow,
+				currentAgent: agentInstall{
+					parsedVersion: parsed920SNAPSHOT,
+					version:       "9.2.0-SNAPSHOT",
+					hash:          "newagt",
+					versionedHome: filepath.Join("data", "elastic-agent-9.2.0-SNAPSHOT-newagt"),
+				},
+				previousAgent: agentInstall{
+					parsedVersion: parsed123SNAPSHOT,
+					version:       "1.2.3-SNAPSHOT",
+					hash:          "prvagt",
+					versionedHome: filepath.Join("data", "elastic-agent-1.2.3-SNAPSHOT-prvagt"),
+				},
+				action:         nil,
+				details:        details.NewDetails("9.2.0-SNAPSHOT", details.StateReplacing, ""),
+				desiredOutcome: OUTCOME_UPGRADE,
+				rollbackWindow: 7 * 24 * time.Hour,
+			},
+			wantErr: assert.NoError,
+			assertAfterMark: func(t *testing.T, dataDir string) {
+				actualMarker, err := LoadMarker(dataDir)
+				require.NoError(t, err, "error reading actualMarker content after writing")
+
+				expectedMarker := &UpdateMarker{
+					Version:           "9.2.0-SNAPSHOT",
+					Hash:              "newagt",
+					VersionedHome:     filepath.Join("data", "elastic-agent-9.2.0-SNAPSHOT-newagt"),
+					UpdatedOn:         updatedOnNow,
+					PrevVersion:       "1.2.3-SNAPSHOT",
+					PrevHash:          "prvagt",
+					PrevVersionedHome: filepath.Join("data", "elastic-agent-1.2.3-SNAPSHOT-prvagt"),
+					Acked:             false,
+					Action:            nil,
+					Details: &details.Details{
+						TargetVersion: "9.2.0-SNAPSHOT",
+						State:         "UPG_REPLACING",
+						ActionID:      "",
 						Metadata: details.Metadata{
 							RollbacksAvailable: []details.RollbackAvailable{
 								{

internal/pkg/agent/application/upgrade/upgrade.go

@@ -64,6 +64,9 @@ var (
 	ErrNilUpdateMarker      = errors.New("loaded a nil update marker")
 	ErrEmptyRollbackVersion = errors.New("rollback version is empty")
 	ErrNoRollbacksAvailable = errors.New("no rollbacks available")
+
+	// Version_9_2_0_SNAPSHOT is the minimum version for manual rollback and rollback reason
+	Version_9_2_0_SNAPSHOT = agtversion.NewParsedSemVer(9, 2, 0, "SNAPSHOT", "")
 )
 
 func init() {
@@ -371,7 +374,7 @@ func (u *Upgrader) Upgrade(ctx context.Context, version string, rollback bool, s
 		versionedHome: currentVersionedHome,
 	}
 	rollbackWindow := time.Duration(0)
-	if u.upgradeSettings != nil && u.upgradeSettings.Rollback != nil { // TODO && target version supports manual rollback and deferred cleanup
+	if u.upgradeSettings != nil && u.upgradeSettings.Rollback != nil {
 		rollbackWindow = u.upgradeSettings.Rollback.Window
 	}
 	if err := markUpgrade(u.log, paths.Data(), time.Now(), current, previous, action, det, OUTCOME_UPGRADE, rollbackWindow); err != nil {