handle error conditions

src/internal/events/events.go

@@ -45,11 +45,14 @@ const (
 	ItemsRead        = "items_read"
 	ItemsWritten     = "items_written"
 	Resources        = "resources"
+	ResourcesName    = "resources_name"
 	RestoreID        = "restore_id"
 	ExportID         = "export_id"
 	Service          = "service"
 	StartTime        = "start_time"
 	Status           = "status"
+	Command          = "command"
+	ErrorMessage     = "error"
 
 	// default values for keys
 	RepoIDNotFound = "not_found"

src/internal/operations/backup.go

@@ -248,19 +248,25 @@ func (op *BackupOperation) Run(ctx context.Context) (err error) {
 		"disable_assist_backup", op.disableAssistBackup)
 
 	defer func() {
+		data := map[string]any{
+			events.BackupID:   op.Results.BackupID,
+			events.DataStored: op.Results.BytesUploaded,
+			events.Duration:   op.Results.CompletedAt.Sub(op.Results.StartedAt),
+			events.EndTime:    dttm.Format(op.Results.CompletedAt),
+			events.Resources:  op.Results.ResourceOwners,
+			events.Service:    op.Selectors.PathService().String(),
+			events.StartTime:  dttm.Format(op.Results.StartedAt),
+			events.Status:     op.Status.String(),
+		}
+
+		if op.Errors.Failure() != nil {
+			data[events.ErrorMessage] = op.Errors.Errors().Failure.Msg
+		}
+
 		op.bus.Event(
 			ctx,
 			events.BackupEnd,
-			map[string]any{
-				events.BackupID:   op.Results.BackupID,
-				events.DataStored: op.Results.BytesUploaded,
-				events.Duration:   op.Results.CompletedAt.Sub(op.Results.StartedAt),
-				events.EndTime:    dttm.Format(op.Results.CompletedAt),
-				events.Resources:  op.Results.ResourceOwners,
-				events.Service:    op.Selectors.PathService().String(),
-				events.StartTime:  dttm.Format(op.Results.StartedAt),
-				events.Status:     op.Status.String(),
-			})
+			data)
 	}()
 
 	// -----

src/internal/operations/export.go

@@ -144,22 +144,28 @@ func (op *ExportOperation) Run(ctx context.Context) (
 		"service", op.Selectors.Service)
 
 	defer func() {
+		data := map[string]any{
+			events.BackupID:      op.BackupID,
+			events.DataRetrieved: op.Results.BytesRead,
+			events.Duration:      op.Results.CompletedAt.Sub(op.Results.StartedAt),
+			events.EndTime:       dttm.Format(op.Results.CompletedAt),
+			events.ItemsRead:     op.Results.ItemsRead,
+			events.ItemsWritten:  op.Results.ItemsWritten,
+			events.Resources:     op.Results.ResourceOwners,
+			events.ExportID:      opStats.exportID,
+			events.Service:       op.Selectors.Service.String(),
+			events.StartTime:     dttm.Format(op.Results.StartedAt),
+			events.Status:        op.Status.String(),
+		}
+
+		if op.Errors.Failure() != nil {
+			data[events.ErrorMessage] = op.Errors.Errors()
+		}
+
 		op.bus.Event(
 			ctx,
 			events.ExportEnd,
-			map[string]any{
-				events.BackupID:      op.BackupID,
-				events.DataRetrieved: op.Results.BytesRead,
-				events.Duration:      op.Results.CompletedAt.Sub(op.Results.StartedAt),
-				events.EndTime:       dttm.Format(op.Results.CompletedAt),
-				events.ItemsRead:     op.Results.ItemsRead,
-				events.ItemsWritten:  op.Results.ItemsWritten,
-				events.Resources:     op.Results.ResourceOwners,
-				events.ExportID:      opStats.exportID,
-				events.Service:       op.Selectors.Service.String(),
-				events.StartTime:     dttm.Format(op.Results.StartedAt),
-				events.Status:        op.Status.String(),
-			})
+			data)
 	}()
 
 	// -----

src/internal/operations/maintenance.go

@@ -58,16 +58,22 @@ func (op *MaintenanceOperation) Run(ctx context.Context) (err error) {
 	op.Results.StartedAt = time.Now()
 
 	defer func() {
+		data := map[string]any{
+			events.StartTime: op.Results.StartedAt,
+			events.Duration:  op.Results.CompletedAt.Sub(op.Results.StartedAt),
+			events.EndTime:   dttm.Format(op.Results.CompletedAt),
+			events.Status:    op.Status.String(),
+			events.Resources: op.mOpts.Type.String(),
+		}
+
+		if op.Errors.Failure() != nil {
+			data[events.ErrorMessage] = op.Errors.Errors()
+		}
+
 		op.bus.Event(
 			ctx,
 			events.MaintenanceEnd,
-			map[string]any{
-				events.StartTime: op.Results.StartedAt,
-				events.Duration:  op.Results.CompletedAt.Sub(op.Results.StartedAt),
-				events.EndTime:   dttm.Format(op.Results.CompletedAt),
-				events.Status:    op.Status.String(),
-				events.Resources: op.mOpts.Type.String(),
-			})
+			data)
 	}()
 
 	return op.do(ctx)

src/internal/operations/restore.go

@@ -146,22 +146,28 @@ func (op *RestoreOperation) Run(ctx context.Context) (restoreDetails *details.De
 		"destination_container", clues.Hide(op.RestoreCfg.Location))
 
 	defer func() {
+		data := map[string]any{
+			events.BackupID:      op.BackupID,
+			events.DataRetrieved: op.Results.BytesRead,
+			events.Duration:      op.Results.CompletedAt.Sub(op.Results.StartedAt),
+			events.EndTime:       dttm.Format(op.Results.CompletedAt),
+			events.ItemsRead:     op.Results.ItemsRead,
+			events.ItemsWritten:  op.Results.ItemsWritten,
+			events.Resources:     op.Results.ResourceOwners,
+			events.RestoreID:     opStats.restoreID,
+			events.Service:       op.Selectors.Service.String(),
+			events.StartTime:     dttm.Format(op.Results.StartedAt),
+			events.Status:        op.Status.String(),
+		}
+
+		if op.Errors.Failure() != nil {
+			data[events.ErrorMessage] = op.Errors.Errors()
+		}
+
 		op.bus.Event(
 			ctx,
 			events.RestoreEnd,
-			map[string]any{
-				events.BackupID:      op.BackupID,
-				events.DataRetrieved: op.Results.BytesRead,
-				events.Duration:      op.Results.CompletedAt.Sub(op.Results.StartedAt),
-				events.EndTime:       dttm.Format(op.Results.CompletedAt),
-				events.ItemsRead:     op.Results.ItemsRead,
-				events.ItemsWritten:  op.Results.ItemsWritten,
-				events.Resources:     op.Results.ResourceOwners,
-				events.RestoreID:     opStats.restoreID,
-				events.Service:       op.Selectors.Service.String(),
-				events.StartTime:     dttm.Format(op.Results.StartedAt),
-				events.Status:        op.Status.String(),
-			})
+			data)
 	}()
 
 	// -----

src/internal/operations/restore_test.go

@@ -366,6 +366,5 @@ func (suite *RestoreOpIntegrationSuite) TestRestore_Run_errorNoBackup() {
 	require.Nil(t, ds, "restoreOp.Run() should not produce details")
 	assert.Zero(t, ro.Results.ResourceOwners, "resource owners")
 	assert.Zero(t, ro.Results.BytesRead, "bytes read")
-	// no restore start, because we'd need to find the backup first.
 	assert.Equal(t, 1, mb.TimesCalled[events.RestoreEnd], "restore-end events")
 }