diff --git a/src/go.mod b/src/go.mod index 73a18d0b0..003657d1a 100644 --- a/src/go.mod +++ b/src/go.mod @@ -20,7 +20,7 @@ require ( github.com/tidwall/pretty v1.2.0 github.com/tomlazar/table v0.1.2 go.uber.org/zap v1.21.0 - golang.org/x/tools v0.1.11 + golang.org/x/tools v0.1.12 ) require ( @@ -92,9 +92,9 @@ require ( go.uber.org/multierr v1.8.0 // indirect golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/net v0.0.0-20220630215102-69896b714898 // indirect - golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect - golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e // indirect + golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect + golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect + golang.org/x/sys v0.0.0-20220727055044-e65921a090b8 // indirect golang.org/x/text v0.3.7 // indirect google.golang.org/genproto v0.0.0-20220630174209-ad1d48641aa7 // indirect google.golang.org/grpc v1.47.0 // indirect diff --git a/src/go.sum b/src/go.sum index a846d1a86..79b33b6b7 100644 --- a/src/go.sum +++ b/src/go.sum @@ -484,6 +484,8 @@ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220630215102-69896b714898 h1:K7wO6V1IrczY9QOQ2WkVpw4JQSwCd52UsxVEirZUfiw= golang.org/x/net v0.0.0-20220630215102-69896b714898/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -508,6 +510,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -562,6 +566,8 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e h1:CsOuNlbOuf0mzxJIefr6Q4uAUetRUwZE4qt7VfzP+xo= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220727055044-e65921a090b8 h1:dyU22nBWzrmTQxtNrr4dzVOvaw35nUYE279vF9UmsI8= +golang.org/x/sys v0.0.0-20220727055044-e65921a090b8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -627,6 +633,8 @@ golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.11 h1:loJ25fNOEhSXfHrpoGj91eCUThwdNX6u24rO1xnNteY= golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= +golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/src/internal/operations/backup.go b/src/internal/operations/backup.go index c589e5835..4f51c5c3e 100644 --- a/src/internal/operations/backup.go +++ b/src/internal/operations/backup.go @@ -124,8 +124,8 @@ func (op *BackupOperation) persistResults( started time.Time, stats *backupStats, ) { - op.Status = Successful - if stats.readErr != nil || stats.writeErr != nil { + op.Status = Completed + if stats.k.TotalFileCount == 0 && (stats.readErr != nil || stats.writeErr != nil) { op.Status = Failed } diff --git a/src/internal/operations/backup_test.go b/src/internal/operations/backup_test.go index fe4528d75..f2c0ac538 100644 --- a/src/internal/operations/backup_test.go +++ b/src/internal/operations/backup_test.go @@ -31,8 +31,6 @@ func TestBackupOpSuite(t *testing.T) { suite.Run(t, new(BackupOpSuite)) } -// TODO: after modelStore integration is added, mock the store and/or -// move this to an integration test. func (suite *BackupOpSuite) TestBackupOperation_PersistResults() { t := suite.T() ctx := context.Background() @@ -59,13 +57,13 @@ func (suite *BackupOpSuite) TestBackupOperation_PersistResults() { op.persistResults(now, &stats) - assert.Equal(t, op.Status, Failed) - assert.Equal(t, op.Results.ItemsRead, stats.gc.Successful) - assert.Equal(t, op.Results.ReadErrors, stats.readErr) - assert.Equal(t, op.Results.ItemsWritten, stats.k.TotalFileCount) - assert.Equal(t, op.Results.WriteErrors, stats.writeErr) - assert.Equal(t, op.Results.StartedAt, now) - assert.Less(t, now, op.Results.CompletedAt) + assert.Equal(t, op.Status, Completed, "status") + assert.Equal(t, op.Results.ItemsRead, stats.gc.Successful, "items read") + assert.Equal(t, op.Results.ReadErrors, stats.readErr, "read errors") + assert.Equal(t, op.Results.ItemsWritten, stats.k.TotalFileCount, "items written") + assert.Equal(t, op.Results.WriteErrors, stats.writeErr, "write errors") + assert.Equal(t, op.Results.StartedAt, now, "started at") + assert.Less(t, now, op.Results.CompletedAt, "completed at") } // --------------------------------------------------------------------------- @@ -173,7 +171,7 @@ func (suite *BackupOpIntegrationSuite) TestBackup_Run() { require.NoError(t, bo.Run(ctx)) require.NotEmpty(t, bo.Results) require.NotEmpty(t, bo.Results.BackupID) - assert.Equal(t, bo.Status, Successful) + assert.Equal(t, bo.Status, Completed) assert.Greater(t, bo.Results.ItemsRead, 0) assert.Greater(t, bo.Results.ItemsWritten, 0) assert.Zero(t, bo.Results.ReadErrors) diff --git a/src/internal/operations/operation.go b/src/internal/operations/operation.go index 20257bc64..90e68301c 100644 --- a/src/internal/operations/operation.go +++ b/src/internal/operations/operation.go @@ -10,13 +10,22 @@ import ( "github.com/alcionai/corso/pkg/store" ) +// opStatus describes the current status of an operation. +// InProgress - the standard value for any process that has not +// arrived at an end state. The two end states are Failed and +// Completed. +// Failed - the operation was unable to begin processing data at all. +// No items have been written by the consumer. +// Completed - the operation was able to process one or more of the +// items in the request. Both partial success (0 < N < len(items) +// errored) and total success (0 errors) are set as Completed. type opStatus int //go:generate stringer -type=opStatus -linecomment const ( Unknown opStatus = iota // Status Unknown InProgress // In Progress - Successful // Successful + Completed // Completed Failed // Failed ) diff --git a/src/internal/operations/opstatus_string.go b/src/internal/operations/opstatus_string.go index 4b198783f..9277e6203 100644 --- a/src/internal/operations/opstatus_string.go +++ b/src/internal/operations/opstatus_string.go @@ -10,13 +10,13 @@ func _() { var x [1]struct{} _ = x[Unknown-0] _ = x[InProgress-1] - _ = x[Successful-2] + _ = x[Completed-2] _ = x[Failed-3] } -const _opStatus_name = "Status UnknownIn ProgressSuccessfulFailed" +const _opStatus_name = "Status UnknownIn ProgressCompletedFailed" -var _opStatus_index = [...]uint8{0, 14, 25, 35, 41} +var _opStatus_index = [...]uint8{0, 14, 25, 34, 40} func (i opStatus) String() string { if i < 0 || i >= opStatus(len(_opStatus_index)-1) { diff --git a/src/internal/operations/restore.go b/src/internal/operations/restore.go index e75c36646..4df3efda6 100644 --- a/src/internal/operations/restore.go +++ b/src/internal/operations/restore.go @@ -129,7 +129,6 @@ func (op *RestoreOperation) Run(ctx context.Context) error { } stats.gc = gc.AwaitStatus() - op.Status = Successful return nil } @@ -138,7 +137,7 @@ func (op *RestoreOperation) persistResults( started time.Time, stats *restoreStats, ) { - op.Status = Successful + op.Status = Completed if (stats.readErr != nil || stats.writeErr != nil) && (stats.gc == nil || stats.gc.Successful == 0) { op.Status = Failed diff --git a/src/internal/operations/restore_test.go b/src/internal/operations/restore_test.go index 611808798..c6a3685d1 100644 --- a/src/internal/operations/restore_test.go +++ b/src/internal/operations/restore_test.go @@ -180,7 +180,7 @@ func (suite *RestoreOpIntegrationSuite) TestRestore_Run() { require.NoError(t, ro.Run(ctx), "restoreOp.Run()") require.NotEmpty(t, ro.Results, "restoreOp results") - assert.Equal(t, ro.Status, Successful, "restoreOp status") + assert.Equal(t, ro.Status, Completed, "restoreOp status") assert.Greater(t, ro.Results.ItemsRead, 0, "restore items read") assert.Greater(t, ro.Results.ItemsWritten, 0, "restored items written") assert.Zero(t, ro.Results.ReadErrors, "errors while reading restore data")