diff --git a/src/internal/events/events.go b/src/internal/events/events.go index 1bc6b9e29..ce2ec5f18 100644 --- a/src/internal/events/events.go +++ b/src/internal/events/events.go @@ -28,17 +28,18 @@ const ( RestoreEnd = "restore-end" // Event Data Keys - BackupID = "backup-id" - DataRetrieved = "data-retrieved" - DataStored = "data-stored" - Duration = "duration" - EndTime = "end-time" - ItemsRead = "items-read" - ItemsWritten = "items-written" - Resources = "resources" - Service = "service" - StartTime = "start-time" - Status = "status" + BackupCreateTime = "backup-creation-time" + BackupID = "backup-id" + DataRetrieved = "data-retrieved" + DataStored = "data-stored" + Duration = "duration" + EndTime = "end-time" + ItemsRead = "items-read" + ItemsWritten = "items-written" + Resources = "resources" + Service = "service" + StartTime = "start-time" + Status = "status" ) type Eventer interface { diff --git a/src/internal/operations/backup.go b/src/internal/operations/backup.go index 3ac8ecc22..d3d397af7 100644 --- a/src/internal/operations/backup.go +++ b/src/internal/operations/backup.go @@ -95,7 +95,6 @@ func (op *BackupOperation) Run(ctx context.Context) (err error) { events.StartTime: startTime, events.Service: op.Selectors.Service.String(), // TODO: initial backup ID, - // TODO: events.ExchangeResources: , }, ) diff --git a/src/internal/operations/restore.go b/src/internal/operations/restore.go index b597b7d7a..a4272e628 100644 --- a/src/internal/operations/restore.go +++ b/src/internal/operations/restore.go @@ -86,21 +86,6 @@ type restoreStats struct { func (op *RestoreOperation) Run(ctx context.Context) (err error) { startTime := time.Now() - // TODO: persist initial state of restoreOperation in modelstore - op.bus.Event( - ctx, - events.RestoreStart, - map[string]any{ - events.StartTime: startTime, - events.Service: op.Selectors.Service.String(), - events.BackupID: op.BackupID, - // TODO: initial backup ID, - // TODO: events.ExchangeResources: , - // TODO: source backup time, - // TODO: restore options, - }, - ) - // persist operation results to the model store on exit opStats := restoreStats{} // TODO: persist results? @@ -121,6 +106,18 @@ func (op *RestoreOperation) Run(ctx context.Context) (err error) { return err } + // TODO: persist initial state of restoreOperation in modelstore + op.bus.Event( + ctx, + events.RestoreStart, + map[string]any{ + events.StartTime: startTime, + events.BackupID: op.BackupID, + events.BackupCreateTime: b.CreationTime, + // TODO: restore options, + }, + ) + var fds *details.Details switch op.Selectors.Service {