diff --git a/src/cli/backup/exchange_e2e_test.go b/src/cli/backup/exchange_e2e_test.go index 9965652d6..2175a50e6 100644 --- a/src/cli/backup/exchange_e2e_test.go +++ b/src/cli/backup/exchange_e2e_test.go @@ -561,9 +561,8 @@ func runExchangeDetailsCmdTest(suite *PreparedBackupExchangeE2ESuite, category p type BackupDeleteExchangeE2ESuite struct { tester.Suite - dpnd dependencies - backupOp operations.BackupOperation - secondaryBackupOp operations.BackupOperation + dpnd dependencies + backupOps [3]operations.BackupOperation } func TestBackupDeleteExchangeE2ESuite(t *testing.T) { @@ -589,21 +588,15 @@ func (suite *BackupDeleteExchangeE2ESuite) SetupSuite() { sel := selectors.NewExchangeBackup(users) sel.Include(sel.MailFolders([]string{api.MailInbox}, selectors.PrefixMatch())) - backupOp, err := suite.dpnd.repo.NewBackup(ctx, sel.Selector) - require.NoError(t, err, clues.ToCore(err)) + for i := 0; i < cap(suite.backupOps); i++ { + backupOp, err := suite.dpnd.repo.NewBackup(ctx, sel.Selector) + require.NoError(t, err, clues.ToCore(err)) - suite.backupOp = backupOp + suite.backupOps[i] = backupOp - err = suite.backupOp.Run(ctx) - require.NoError(t, err, clues.ToCore(err)) - - backupOp2, err := suite.dpnd.repo.NewBackup(ctx, sel.Selector) - require.NoError(t, err, clues.ToCore(err)) - - suite.secondaryBackupOp = backupOp2 - - err = suite.secondaryBackupOp.Run(ctx) - require.NoError(t, err, clues.ToCore(err)) + err = suite.backupOps[i].Run(ctx) + require.NoError(t, err, clues.ToCore(err)) + } } func (suite *BackupDeleteExchangeE2ESuite) TestExchangeBackupDeleteCmd() { @@ -619,8 +612,8 @@ func (suite *BackupDeleteExchangeE2ESuite) TestExchangeBackupDeleteCmd() { "--config-file", suite.dpnd.configFilePath, "--"+flags.BackupIDsFN, fmt.Sprintf("%s,%s", - string(suite.backupOp.Results.BackupID), - string(suite.secondaryBackupOp.Results.BackupID))) + string(suite.backupOps[0].Results.BackupID), + string(suite.backupOps[1].Results.BackupID))) cli.BuildCommandTree(cmd) // run the command @@ -631,7 +624,7 @@ func (suite *BackupDeleteExchangeE2ESuite) TestExchangeBackupDeleteCmd() { cmd = cliTD.StubRootCmd( "backup", "details", "exchange", "--config-file", suite.dpnd.configFilePath, - "--backup", string(suite.backupOp.Results.BackupID)) + "--backup", string(suite.backupOps[0].Results.BackupID)) cli.BuildCommandTree(cmd) err = cmd.ExecuteContext(ctx) @@ -641,7 +634,7 @@ func (suite *BackupDeleteExchangeE2ESuite) TestExchangeBackupDeleteCmd() { cmd = cliTD.StubRootCmd( "backup", "details", "exchange", "--config-file", suite.dpnd.configFilePath, - "--backup", string(suite.secondaryBackupOp.Results.BackupID)) + "--backup", string(suite.backupOps[1].Results.BackupID)) cli.BuildCommandTree(cmd) err = cmd.ExecuteContext(ctx) @@ -660,7 +653,7 @@ func (suite *BackupDeleteExchangeE2ESuite) TestExchangeBackupDeleteCmd_SingleID( "backup", "delete", "exchange", "--config-file", suite.dpnd.configFilePath, "--"+flags.BackupFN, - string(suite.backupOp.Results.BackupID)) + string(suite.backupOps[2].Results.BackupID)) cli.BuildCommandTree(cmd) // run the command @@ -671,7 +664,7 @@ func (suite *BackupDeleteExchangeE2ESuite) TestExchangeBackupDeleteCmd_SingleID( cmd = cliTD.StubRootCmd( "backup", "details", "exchange", "--config-file", suite.dpnd.configFilePath, - "--backup", string(suite.secondaryBackupOp.Results.BackupID)) + "--backup", string(suite.backupOps[2].Results.BackupID)) cli.BuildCommandTree(cmd) err = cmd.ExecuteContext(ctx) diff --git a/src/cli/backup/groups_e2e_test.go b/src/cli/backup/groups_e2e_test.go index 66de86eb4..986979a4f 100644 --- a/src/cli/backup/groups_e2e_test.go +++ b/src/cli/backup/groups_e2e_test.go @@ -497,9 +497,8 @@ func runGroupsDetailsCmdTest(suite *PreparedBackupGroupsE2ESuite, category path. type BackupDeleteGroupsE2ESuite struct { tester.Suite - dpnd dependencies - backupOp operations.BackupOperation - secondaryBackupOp operations.BackupOperation + dpnd dependencies + backupOps [3]operations.BackupOperation } func TestBackupDeleteGroupsE2ESuite(t *testing.T) { @@ -525,22 +524,15 @@ func (suite *BackupDeleteGroupsE2ESuite) SetupSuite() { sel := selectors.NewGroupsBackup(groups) sel.Include(selTD.GroupsBackupChannelScope(sel)) - backupOp, err := suite.dpnd.repo.NewBackup(ctx, sel.Selector) - require.NoError(t, err, clues.ToCore(err)) + for i := 0; i < cap(suite.backupOps); i++ { + backupOp, err := suite.dpnd.repo.NewBackup(ctx, sel.Selector) + require.NoError(t, err, clues.ToCore(err)) - suite.backupOp = backupOp + suite.backupOps[i] = backupOp - err = suite.backupOp.Run(ctx) - require.NoError(t, err, clues.ToCore(err)) - - // secondary backup - secondaryBackupOp, err := suite.dpnd.repo.NewBackup(ctx, sel.Selector) - require.NoError(t, err, clues.ToCore(err)) - - suite.secondaryBackupOp = secondaryBackupOp - - err = suite.secondaryBackupOp.Run(ctx) - require.NoError(t, err, clues.ToCore(err)) + err = suite.backupOps[i].Run(ctx) + require.NoError(t, err, clues.ToCore(err)) + } } func (suite *BackupDeleteGroupsE2ESuite) TestGroupsBackupDeleteCmd() { @@ -556,8 +548,8 @@ func (suite *BackupDeleteGroupsE2ESuite) TestGroupsBackupDeleteCmd() { "--config-file", suite.dpnd.configFilePath, "--"+flags.BackupIDsFN, fmt.Sprintf("%s,%s", - string(suite.backupOp.Results.BackupID), - string(suite.secondaryBackupOp.Results.BackupID))) + string(suite.backupOps[0].Results.BackupID), + string(suite.backupOps[1].Results.BackupID))) cli.BuildCommandTree(cmd) // run the command @@ -568,7 +560,7 @@ func (suite *BackupDeleteGroupsE2ESuite) TestGroupsBackupDeleteCmd() { cmd = cliTD.StubRootCmd( "backup", "details", "groups", "--config-file", suite.dpnd.configFilePath, - "--backups", string(suite.backupOp.Results.BackupID)) + "--backups", string(suite.backupOps[0].Results.BackupID)) cli.BuildCommandTree(cmd) err = cmd.ExecuteContext(ctx) @@ -587,7 +579,7 @@ func (suite *BackupDeleteGroupsE2ESuite) TestGroupsBackupDeleteCmd_SingleID() { "backup", "delete", "groups", "--config-file", suite.dpnd.configFilePath, "--"+flags.BackupFN, - string(suite.backupOp.Results.BackupID)) + string(suite.backupOps[2].Results.BackupID)) cli.BuildCommandTree(cmd) // run the command @@ -598,7 +590,7 @@ func (suite *BackupDeleteGroupsE2ESuite) TestGroupsBackupDeleteCmd_SingleID() { cmd = cliTD.StubRootCmd( "backup", "details", "groups", "--config-file", suite.dpnd.configFilePath, - "--backup", string(suite.backupOp.Results.BackupID)) + "--backup", string(suite.backupOps[2].Results.BackupID)) cli.BuildCommandTree(cmd) err = cmd.ExecuteContext(ctx) diff --git a/src/cli/backup/onedrive_e2e_test.go b/src/cli/backup/onedrive_e2e_test.go index 77d599862..f4b2c0bdc 100644 --- a/src/cli/backup/onedrive_e2e_test.go +++ b/src/cli/backup/onedrive_e2e_test.go @@ -121,9 +121,8 @@ func (suite *NoBackupOneDriveE2ESuite) TestOneDriveBackupCmd_userNotInTenant() { type BackupDeleteOneDriveE2ESuite struct { tester.Suite - dpnd dependencies - backupOp operations.BackupOperation - secondaryBackupOp operations.BackupOperation + dpnd dependencies + backupOps [3]operations.BackupOperation } func TestBackupDeleteOneDriveE2ESuite(t *testing.T) { @@ -152,22 +151,15 @@ func (suite *BackupDeleteOneDriveE2ESuite) SetupSuite() { sel := selectors.NewOneDriveBackup(users) sel.Include(selTD.OneDriveBackupFolderScope(sel)) - backupOp, err := suite.dpnd.repo.NewBackupWithLookup(ctx, sel.Selector, ins) - require.NoError(t, err, clues.ToCore(err)) + for i := 0; i < cap(suite.backupOps); i++ { + backupOp, err := suite.dpnd.repo.NewBackupWithLookup(ctx, sel.Selector, ins) + require.NoError(t, err, clues.ToCore(err)) - suite.backupOp = backupOp + suite.backupOps[i] = backupOp - err = suite.backupOp.Run(ctx) - require.NoError(t, err, clues.ToCore(err)) - - // secondary backup - secondaryBackupOp, err := suite.dpnd.repo.NewBackupWithLookup(ctx, sel.Selector, ins) - require.NoError(t, err, clues.ToCore(err)) - - suite.secondaryBackupOp = secondaryBackupOp - - err = suite.secondaryBackupOp.Run(ctx) - require.NoError(t, err, clues.ToCore(err)) + err = suite.backupOps[i].Run(ctx) + require.NoError(t, err, clues.ToCore(err)) + } } func (suite *BackupDeleteOneDriveE2ESuite) TestOneDriveBackupDeleteCmd() { @@ -185,8 +177,8 @@ func (suite *BackupDeleteOneDriveE2ESuite) TestOneDriveBackupDeleteCmd() { "--config-file", suite.dpnd.configFilePath, "--"+flags.BackupIDsFN, fmt.Sprintf("%s,%s", - string(suite.backupOp.Results.BackupID), - string(suite.secondaryBackupOp.Results.BackupID))) + string(suite.backupOps[0].Results.BackupID), + string(suite.backupOps[1].Results.BackupID))) cli.BuildCommandTree(cmd) cmd.SetErr(&suite.dpnd.recorder) @@ -201,14 +193,14 @@ func (suite *BackupDeleteOneDriveE2ESuite) TestOneDriveBackupDeleteCmd() { strings.HasSuffix( result, fmt.Sprintf("Deleted OneDrive backup [%s %s]\n", - string(suite.backupOp.Results.BackupID), - string(suite.secondaryBackupOp.Results.BackupID)))) + string(suite.backupOps[0].Results.BackupID), + string(suite.backupOps[1].Results.BackupID)))) // a follow-up details call should fail, due to the backup ID being deleted cmd = cliTD.StubRootCmd( "backup", "details", "onedrive", "--config-file", suite.dpnd.configFilePath, - "--backups", string(suite.backupOp.Results.BackupID)) + "--backups", string(suite.backupOps[0].Results.BackupID)) cli.BuildCommandTree(cmd) err = cmd.ExecuteContext(ctx) @@ -229,7 +221,7 @@ func (suite *BackupDeleteOneDriveE2ESuite) TestOneDriveBackupDeleteCmd_SingleID( "backup", "delete", "onedrive", "--config-file", suite.dpnd.configFilePath, "--"+flags.BackupFN, - string(suite.backupOp.Results.BackupID)) + string(suite.backupOps[2].Results.BackupID)) cli.BuildCommandTree(cmd) cmd.SetErr(&suite.dpnd.recorder) @@ -244,13 +236,13 @@ func (suite *BackupDeleteOneDriveE2ESuite) TestOneDriveBackupDeleteCmd_SingleID( strings.HasSuffix( result, fmt.Sprintf("Deleted OneDrive backup [%s]\n", - string(suite.backupOp.Results.BackupID)))) + string(suite.backupOps[2].Results.BackupID)))) // a follow-up details call should fail, due to the backup ID being deleted cmd = cliTD.StubRootCmd( "backup", "details", "onedrive", "--config-file", suite.dpnd.configFilePath, - "--backup", string(suite.backupOp.Results.BackupID)) + "--backup", string(suite.backupOps[0].Results.BackupID)) cli.BuildCommandTree(cmd) err = cmd.ExecuteContext(ctx)