Skip to content

Commit 09286ef

Browse files
committed
create constant for automatic rollback reason
1 parent 108634c commit 09286ef

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ func TestDetailsSetStateWithReason(t *testing.T) {
3535
det := NewDetails("99.999.9999", StateWatching, "test_action_id")
3636
require.Equal(t, StateWatching, det.State)
3737

38-
det.SetStateWithReason(StateRollback, "automatic rollback")
38+
det.SetStateWithReason(StateRollback, ReasonWatchFailed)
3939
assert.Equal(t, StateRollback, det.State)
40-
assert.Equal(t, "automatic rollback", det.Metadata.Reason)
40+
assert.Equal(t, ReasonWatchFailed, det.Metadata.Reason)
4141
}
4242

4343
func TestDetailsFail(t *testing.T) {

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ package details
66

77
type State string
88

9-
// The values of these State* constants should match those enumerated for
10-
// upgrade_details.state in https://github.com/elastic/fleet-server/blob/main/model/openapi.yml
119
const (
10+
// The values of these State* constants should match those enumerated for
11+
// upgrade_details.state in https://github.com/elastic/fleet-server/blob/main/model/openapi.yml
1212
StateRequested State = "UPG_REQUESTED"
1313
StateScheduled State = "UPG_SCHEDULED"
1414
StateDownloading State = "UPG_DOWNLOADING"
@@ -19,4 +19,7 @@ const (
1919
StateRollback State = "UPG_ROLLBACK"
2020
StateCompleted State = "UPG_COMPLETED"
2121
StateFailed State = "UPG_FAILED"
22+
23+
// List of well-known reasons for state transitions
24+
ReasonWatchFailed = "watch failed"
2225
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func (mfw *MarkerFileWatcher) processMarker(currentVersion string, commit string
146146
if marker.Details == nil {
147147
marker.Details = details.NewDetails("unknown", details.StateRollback, marker.GetActionID())
148148
} else if marker.Details.State == "" {
149-
marker.Details.SetStateWithReason(details.StateRollback, "automatic rollback")
149+
marker.Details.SetStateWithReason(details.StateRollback, details.ReasonWatchFailed)
150150
}
151151
}
152152

internal/pkg/agent/cmd/watch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func watchCmd(log *logp.Logger, topDir string, cfg *configuration.UpgradeWatcher
132132
if err := watcher.Watch(ctx, tilGrace, errorCheckInterval, log); err != nil {
133133
log.Error("Error detected, proceeding to rollback: %v", err)
134134

135-
upgradeDetails.SetStateWithReason(details.StateRollback, "automatic rollback")
135+
upgradeDetails.SetStateWithReason(details.StateRollback, details.ReasonWatchFailed)
136136
err = installModifier.Rollback(ctx, log, client.New(), paths.Top(), marker.PrevVersionedHome, marker.PrevHash)
137137
if err != nil {
138138
log.Error("rollback failed", err)

internal/pkg/agent/cmd/watch_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ func Test_watchCmd(t *testing.T) {
207207
TargetVersion: "4.5.6",
208208
State: details.StateRollback,
209209
Metadata: details.Metadata{
210-
Reason: "automatic rollback",
210+
Reason: details.ReasonWatchFailed,
211211
},
212212
},
213213
DesiredOutcome: upgrade.OUTCOME_UPGRADE,

testing/integration/ess/upgrade_rollback_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ inputs:
145145

146146
assert.Equal(t, details.StateRollback, details.State(state.UpgradeDetails.State))
147147
if !startVersion.Less(*upgradetest.Version_9_1_0_SNAPSHOT) {
148-
assert.Equal(t, "automatic rollback", state.UpgradeDetails.Metadata.Reason)
148+
assert.Equal(t, details.ReasonWatchFailed, state.UpgradeDetails.Metadata.Reason)
149149
}
150150
} else {
151151
t.Logf("rollback finished, status is '%s', cannot check UpgradeDetails", state.State.String())
@@ -387,7 +387,7 @@ func managedRollbackRestartTest(ctx context.Context, t *testing.T, info *define.
387387
require.NotNil(t, fleetAgent.UpgradeDetails, "upgrade details not set")
388388
assert.Equal(t, details.StateRollback, details.State(fleetAgent.UpgradeDetails.State))
389389
if !startVersion.Less(*upgradetest.Version_9_1_0_SNAPSHOT) {
390-
assert.Equal(t, "automatic rollback", fleetAgent.UpgradeDetails.Metadata.Reason)
390+
assert.Equal(t, details.ReasonWatchFailed, fleetAgent.UpgradeDetails.Metadata.Reason)
391391
}
392392
}
393393

@@ -462,7 +462,7 @@ func standaloneRollbackRestartTest(ctx context.Context, t *testing.T, startFixtu
462462
require.NotNil(t, state.UpgradeDetails)
463463
assert.Equal(t, details.StateRollback, details.State(state.UpgradeDetails.State))
464464
if !startVersion.Less(*upgradetest.Version_9_1_0_SNAPSHOT) {
465-
assert.Equal(t, "automatic rollback", state.UpgradeDetails.Metadata.Reason)
465+
assert.Equal(t, details.ReasonWatchFailed, state.UpgradeDetails.Metadata.Reason)
466466
}
467467
}
468468

0 commit comments

Comments
 (0)