larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli naming readability and clarification (#2990)

Browse Source 
Appends FV to the shared values populated by
cobra flags.  This helps ensure those values are
not confused by other, like-named values used as
func params or local vars.  Also amends some
other varname issues.

---

#### Does this PR need a docs update or release note?

- [x] ⛔ No

#### Type of change

- [x] 🧹 Tech Debt/Cleanup

#### Test Plan

- [x] ⚡ Unit test
This commit is contained in:
Keepers 2023-03-30 12:11:38 -06:00 committed by GitHub
parent 25cffcdf8d
commit a6a037df28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 266 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cli/backup/exchange.go
View File

@ -148,7 +148,7 @@ func createExchangeCmd(cmd *cobra.Command, args []string) error {
return nil return nil
} }
if err := validateExchangeBackupCreateFlags(utils.User, utils.CategoryData); err != nil { if err := validateExchangeBackupCreateFlags(utils.UserFV, utils.CategoryDataFV); err != nil {
return err return err
} }
@ -159,7 +159,7 @@ func createExchangeCmd(cmd *cobra.Command, args []string) error {
defer utils.CloseRepo(ctx, r) defer utils.CloseRepo(ctx, r)
sel := exchangeBackupCreateSelectors(utils.User, utils.CategoryData) sel := exchangeBackupCreateSelectors(utils.UserFV, utils.CategoryDataFV)
// TODO: log/print recoverable errors // TODO: log/print recoverable errors
errs := fault.New(false) errs := fault.New(false)
@ -237,7 +237,7 @@ func exchangeListCmd() *cobra.Command {
// lists the history of backup operations // lists the history of backup operations
func listExchangeCmd(cmd *cobra.Command, args []string) error { func listExchangeCmd(cmd *cobra.Command, args []string) error {
return genericListCommand(cmd, utils.BackupID, path.ExchangeService, args) return genericListCommand(cmd, utils.BackupIDFV, path.ExchangeService, args)
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -273,7 +273,7 @@ func detailsExchangeCmd(cmd *cobra.Command, args []string) error {
ctrlOpts := options.Control() ctrlOpts := options.Control()
ds, err := runDetailsExchangeCmd(ctx, r, utils.BackupID, opts, ctrlOpts.SkipReduce) ds, err := runDetailsExchangeCmd(ctx, r, utils.BackupIDFV, opts, ctrlOpts.SkipReduce)
if err != nil { if err != nil {
return Only(ctx, err) return Only(ctx, err)
} }
@ -341,5 +341,5 @@ func exchangeDeleteCmd() *cobra.Command {
// deletes an exchange service backup. // deletes an exchange service backup.
func deleteExchangeCmd(cmd *cobra.Command, args []string) error { func deleteExchangeCmd(cmd *cobra.Command, args []string) error {
return genericDeleteCommand(cmd, utils.BackupID, "Exchange", args) return genericDeleteCommand(cmd, utils.BackupIDFV, "Exchange", args)
} }

10
src/cli/backup/onedrive.go
View File

@ -132,7 +132,7 @@ func createOneDriveCmd(cmd *cobra.Command, args []string) error {
return nil return nil
} }
if err := validateOneDriveBackupCreateFlags(utils.User); err != nil { if err := validateOneDriveBackupCreateFlags(utils.UserFV); err != nil {
return err return err
} }
@ -143,7 +143,7 @@ func createOneDriveCmd(cmd *cobra.Command, args []string) error {
defer utils.CloseRepo(ctx, r) defer utils.CloseRepo(ctx, r)
sel := oneDriveBackupCreateSelectors(utils.User) sel := oneDriveBackupCreateSelectors(utils.UserFV)
// TODO: log/print recoverable errors // TODO: log/print recoverable errors
errs := fault.New(false) errs := fault.New(false)
@ -198,7 +198,7 @@ func oneDriveListCmd() *cobra.Command {
// lists the history of backup operations // lists the history of backup operations
func listOneDriveCmd(cmd *cobra.Command, args []string) error { func listOneDriveCmd(cmd *cobra.Command, args []string) error {
return genericListCommand(cmd, utils.BackupID, path.OneDriveService, args) return genericListCommand(cmd, utils.BackupIDFV, path.OneDriveService, args)
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -234,7 +234,7 @@ func detailsOneDriveCmd(cmd *cobra.Command, args []string) error {
ctrlOpts := options.Control() ctrlOpts := options.Control()
ds, err := runDetailsOneDriveCmd(ctx, r, utils.BackupID, opts, ctrlOpts.SkipReduce) ds, err := runDetailsOneDriveCmd(ctx, r, utils.BackupIDFV, opts, ctrlOpts.SkipReduce)
if err != nil { if err != nil {
return Only(ctx, err) return Only(ctx, err)
} }
@ -299,5 +299,5 @@ func oneDriveDeleteCmd() *cobra.Command {
// deletes a oneDrive service backup. // deletes a oneDrive service backup.
func deleteOneDriveCmd(cmd *cobra.Command, args []string) error { func deleteOneDriveCmd(cmd *cobra.Command, args []string) error {
return genericDeleteCommand(cmd, utils.BackupID, "OneDrive", args) return genericDeleteCommand(cmd, utils.BackupIDFV, "OneDrive", args)
} }

10
src/cli/backup/sharepoint.go
View File

@ -140,7 +140,7 @@ func createSharePointCmd(cmd *cobra.Command, args []string) error {
return nil return nil
} }
if err := validateSharePointBackupCreateFlags(utils.SiteID, utils.WebURL, utils.CategoryData); err != nil { if err := validateSharePointBackupCreateFlags(utils.SiteIDFV, utils.WebURLFV, utils.CategoryDataFV); err != nil {
return err return err
} }
@ -159,7 +159,7 @@ func createSharePointCmd(cmd *cobra.Command, args []string) error {
return Only(ctx, clues.Wrap(err, "Failed to connect to Microsoft APIs")) return Only(ctx, clues.Wrap(err, "Failed to connect to Microsoft APIs"))
} }
sel, err := sharePointBackupCreateSelectors(ctx, utils.SiteID, utils.WebURL, utils.CategoryData, gc) sel, err := sharePointBackupCreateSelectors(ctx, utils.SiteIDFV, utils.WebURLFV, utils.CategoryDataFV, gc)
if err != nil { if err != nil {
return Only(ctx, clues.Wrap(err, "Retrieving up sharepoint sites by ID and URL")) return Only(ctx, clues.Wrap(err, "Retrieving up sharepoint sites by ID and URL"))
} }
@ -275,7 +275,7 @@ func sharePointListCmd() *cobra.Command {
// lists the history of backup operations // lists the history of backup operations
func listSharePointCmd(cmd *cobra.Command, args []string) error { func listSharePointCmd(cmd *cobra.Command, args []string) error {
return genericListCommand(cmd, utils.BackupID, path.SharePointService, args) return genericListCommand(cmd, utils.BackupIDFV, path.SharePointService, args)
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -295,7 +295,7 @@ func sharePointDeleteCmd() *cobra.Command {
// deletes a sharePoint service backup. // deletes a sharePoint service backup.
func deleteSharePointCmd(cmd *cobra.Command, args []string) error { func deleteSharePointCmd(cmd *cobra.Command, args []string) error {
return genericDeleteCommand(cmd, utils.BackupID, "SharePoint", args) return genericDeleteCommand(cmd, utils.BackupIDFV, "SharePoint", args)
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -331,7 +331,7 @@ func detailsSharePointCmd(cmd *cobra.Command, args []string) error {
ctrlOpts := options.Control() ctrlOpts := options.Control()
ds, err := runDetailsSharePointCmd(ctx, r, utils.BackupID, opts, ctrlOpts.SkipReduce) ds, err := runDetailsSharePointCmd(ctx, r, utils.BackupIDFV, opts, ctrlOpts.SkipReduce)
if err != nil { if err != nil {
return Only(ctx, err) return Only(ctx, err)
} }

8
src/cli/restore/exchange.go
View File

@ -84,11 +84,11 @@ func restoreExchangeCmd(cmd *cobra.Command, args []string) error {
opts := utils.MakeExchangeOpts(cmd) opts := utils.MakeExchangeOpts(cmd)
if utils.RunMode == utils.RunModeFlagTest { if utils.RunModeFV == utils.RunModeFlagTest {
return nil return nil
} }
if err := utils.ValidateExchangeRestoreFlags(utils.BackupID, opts); err != nil { if err := utils.ValidateExchangeRestoreFlags(utils.BackupIDFV, opts); err != nil {
return err return err
} }
@ -110,7 +110,7 @@ func restoreExchangeCmd(cmd *cobra.Command, args []string) error {
sel := utils.IncludeExchangeRestoreDataSelectors(opts) sel := utils.IncludeExchangeRestoreDataSelectors(opts)
utils.FilterExchangeRestoreInfoSelectors(sel, opts) utils.FilterExchangeRestoreInfoSelectors(sel, opts)
ro, err := r.NewRestore(ctx, utils.BackupID, sel.Selector, dest) ro, err := r.NewRestore(ctx, utils.BackupIDFV, sel.Selector, dest)
if err != nil { if err != nil {
return Only(ctx, clues.Wrap(err, "Failed to initialize Exchange restore")) return Only(ctx, clues.Wrap(err, "Failed to initialize Exchange restore"))
} }
@ -118,7 +118,7 @@ func restoreExchangeCmd(cmd *cobra.Command, args []string) error {
ds, err := ro.Run(ctx) ds, err := ro.Run(ctx)
if err != nil { if err != nil {
if errors.Is(err, data.ErrNotFound) { if errors.Is(err, data.ErrNotFound) {
return Only(ctx, clues.New("Backup or backup details missing for id "+utils.BackupID)) return Only(ctx, clues.New("Backup or backup details missing for id "+utils.BackupIDFV))
} }
return Only(ctx, clues.Wrap(err, "Failed to run Exchange restore")) return Only(ctx, clues.Wrap(err, "Failed to run Exchange restore"))

68
src/cli/restore/exchange_test.go
View File

@ -60,26 +60,26 @@ func (suite *ExchangeUnitSuite) TestAddExchangeCommands() {
cmd.SetArgs([]string{ cmd.SetArgs([]string{
"exchange", "exchange",
"--" + utils.RunModeFN, utils.RunModeFlagTest, "--" + utils.RunModeFN, utils.RunModeFlagTest,
"--" + utils.BackupFN, testdata.BackupInpt, "--" + utils.BackupFN, testdata.BackupInput,
"--" + utils.ContactFN, testdata.FlgInpts(testdata.ContactInpt), "--" + utils.ContactFN, testdata.FlgInputs(testdata.ContactInput),
"--" + utils.ContactFolderFN, testdata.FlgInpts(testdata.ContactFldInpt), "--" + utils.ContactFolderFN, testdata.FlgInputs(testdata.ContactFldInput),
"--" + utils.ContactNameFN, testdata.ContactNameInpt, "--" + utils.ContactNameFN, testdata.ContactNameInput,
"--" + utils.EmailFN, testdata.FlgInpts(testdata.EmailInpt), "--" + utils.EmailFN, testdata.FlgInputs(testdata.EmailInput),
"--" + utils.EmailFolderFN, testdata.FlgInpts(testdata.EmailFldInpt), "--" + utils.EmailFolderFN, testdata.FlgInputs(testdata.EmailFldInput),
"--" + utils.EmailReceivedAfterFN, testdata.EmailReceivedAfterInpt, "--" + utils.EmailReceivedAfterFN, testdata.EmailReceivedAfterInput,
"--" + utils.EmailReceivedBeforeFN, testdata.EmailReceivedBeforeInpt, "--" + utils.EmailReceivedBeforeFN, testdata.EmailReceivedBeforeInput,
"--" + utils.EmailSenderFN, testdata.EmailSenderInpt, "--" + utils.EmailSenderFN, testdata.EmailSenderInput,
"--" + utils.EmailSubjectFN, testdata.EmailSubjectInpt, "--" + utils.EmailSubjectFN, testdata.EmailSubjectInput,
"--" + utils.EventFN, testdata.FlgInpts(testdata.EventInpt), "--" + utils.EventFN, testdata.FlgInputs(testdata.EventInput),
"--" + utils.EventCalendarFN, testdata.FlgInpts(testdata.EventCalInpt), "--" + utils.EventCalendarFN, testdata.FlgInputs(testdata.EventCalInput),
"--" + utils.EventOrganizerFN, testdata.EventOrganizerInpt, "--" + utils.EventOrganizerFN, testdata.EventOrganizerInput,
"--" + utils.EventRecursFN, testdata.EventRecursInpt, "--" + utils.EventRecursFN, testdata.EventRecursInput,
"--" + utils.EventStartsAfterFN, testdata.EventStartsAfterInpt, "--" + utils.EventStartsAfterFN, testdata.EventStartsAfterInput,
"--" + utils.EventStartsBeforeFN, testdata.EventStartsBeforeInpt, "--" + utils.EventStartsBeforeFN, testdata.EventStartsBeforeInput,
"--" + utils.EventSubjectFN, testdata.EventSubjectInpt, "--" + utils.EventSubjectFN, testdata.EventSubjectInput,
}) })
cmd.SetOut(new(bytes.Buffer)) // drop output cmd.SetOut(new(bytes.Buffer)) // drop output
@ -88,26 +88,26 @@ func (suite *ExchangeUnitSuite) TestAddExchangeCommands() {
assert.NoError(t, err, clues.ToCore(err)) assert.NoError(t, err, clues.ToCore(err))
opts := utils.MakeExchangeOpts(cmd) opts := utils.MakeExchangeOpts(cmd)
assert.Equal(t, testdata.BackupInpt, utils.BackupID) assert.Equal(t, testdata.BackupInput, utils.BackupIDFV)
assert.ElementsMatch(t, testdata.ContactInpt, opts.Contact) assert.ElementsMatch(t, testdata.ContactInput, opts.Contact)
assert.ElementsMatch(t, testdata.ContactFldInpt, opts.ContactFolder) assert.ElementsMatch(t, testdata.ContactFldInput, opts.ContactFolder)
assert.Equal(t, testdata.ContactNameInpt, opts.ContactName) assert.Equal(t, testdata.ContactNameInput, opts.ContactName)
assert.ElementsMatch(t, testdata.EmailInpt, opts.Email) assert.ElementsMatch(t, testdata.EmailInput, opts.Email)
assert.ElementsMatch(t, testdata.EmailFldInpt, opts.EmailFolder) assert.ElementsMatch(t, testdata.EmailFldInput, opts.EmailFolder)
assert.Equal(t, testdata.EmailReceivedAfterInpt, opts.EmailReceivedAfter) assert.Equal(t, testdata.EmailReceivedAfterInput, opts.EmailReceivedAfter)
assert.Equal(t, testdata.EmailReceivedBeforeInpt, opts.EmailReceivedBefore) assert.Equal(t, testdata.EmailReceivedBeforeInput, opts.EmailReceivedBefore)
assert.Equal(t, testdata.EmailSenderInpt, opts.EmailSender) assert.Equal(t, testdata.EmailSenderInput, opts.EmailSender)
assert.Equal(t, testdata.EmailSubjectInpt, opts.EmailSubject) assert.Equal(t, testdata.EmailSubjectInput, opts.EmailSubject)
assert.ElementsMatch(t, testdata.EventInpt, opts.Event) assert.ElementsMatch(t, testdata.EventInput, opts.Event)
assert.ElementsMatch(t, testdata.EventCalInpt, opts.EventCalendar) assert.ElementsMatch(t, testdata.EventCalInput, opts.EventCalendar)
assert.Equal(t, testdata.EventOrganizerInpt, opts.EventOrganizer) assert.Equal(t, testdata.EventOrganizerInput, opts.EventOrganizer)
assert.Equal(t, testdata.EventRecursInpt, opts.EventRecurs) assert.Equal(t, testdata.EventRecursInput, opts.EventRecurs)
assert.Equal(t, testdata.EventStartsAfterInpt, opts.EventStartsAfter) assert.Equal(t, testdata.EventStartsAfterInput, opts.EventStartsAfter)
assert.Equal(t, testdata.EventStartsBeforeInpt, opts.EventStartsBefore) assert.Equal(t, testdata.EventStartsBeforeInput, opts.EventStartsBefore)
assert.Equal(t, testdata.EventSubjectInpt, opts.EventSubject) assert.Equal(t, testdata.EventSubjectInput, opts.EventSubject)
}) })
} }
} }

8
src/cli/restore/onedrive.go
View File

@ -86,11 +86,11 @@ func restoreOneDriveCmd(cmd *cobra.Command, args []string) error {
opts := utils.MakeOneDriveOpts(cmd) opts := utils.MakeOneDriveOpts(cmd)
if utils.RunMode == utils.RunModeFlagTest { if utils.RunModeFV == utils.RunModeFlagTest {
return nil return nil
} }
if err := utils.ValidateOneDriveRestoreFlags(utils.BackupID, opts); err != nil { if err := utils.ValidateOneDriveRestoreFlags(utils.BackupIDFV, opts); err != nil {
return err return err
} }
@ -112,7 +112,7 @@ func restoreOneDriveCmd(cmd *cobra.Command, args []string) error {
sel := utils.IncludeOneDriveRestoreDataSelectors(opts) sel := utils.IncludeOneDriveRestoreDataSelectors(opts)
utils.FilterOneDriveRestoreInfoSelectors(sel, opts) utils.FilterOneDriveRestoreInfoSelectors(sel, opts)
ro, err := r.NewRestore(ctx, utils.BackupID, sel.Selector, dest) ro, err := r.NewRestore(ctx, utils.BackupIDFV, sel.Selector, dest)
if err != nil { if err != nil {
return Only(ctx, clues.Wrap(err, "Failed to initialize OneDrive restore")) return Only(ctx, clues.Wrap(err, "Failed to initialize OneDrive restore"))
} }
@ -120,7 +120,7 @@ func restoreOneDriveCmd(cmd *cobra.Command, args []string) error {
ds, err := ro.Run(ctx) ds, err := ro.Run(ctx)
if err != nil { if err != nil {
if errors.Is(err, data.ErrNotFound) { if errors.Is(err, data.ErrNotFound) {
return Only(ctx, clues.New("Backup or backup details missing for id "+utils.BackupID)) return Only(ctx, clues.New("Backup or backup details missing for id "+utils.BackupIDFV))
} }
return Only(ctx, clues.Wrap(err, "Failed to run OneDrive restore")) return Only(ctx, clues.Wrap(err, "Failed to run OneDrive restore"))

28
src/cli/restore/onedrive_test.go
View File

@ -59,14 +59,14 @@ func (suite *OneDriveUnitSuite) TestAddOneDriveCommands() {
cmd.SetArgs([]string{ cmd.SetArgs([]string{
"onedrive", "onedrive",
"--" + utils.RunModeFN, utils.RunModeFlagTest, "--" + utils.RunModeFN, utils.RunModeFlagTest,
"--" + utils.BackupFN, testdata.BackupInpt, "--" + utils.BackupFN, testdata.BackupInput,
"--" + utils.FileFN, testdata.FlgInpts(testdata.FileNamesInpt), "--" + utils.FileFN, testdata.FlgInputs(testdata.FileNameInput),
"--" + utils.FolderFN, testdata.FlgInpts(testdata.FolderPathsInpt), "--" + utils.FolderFN, testdata.FlgInputs(testdata.FolderPathInput),
"--" + utils.FileCreatedAfterFN, testdata.FileCreatedAfterInpt, "--" + utils.FileCreatedAfterFN, testdata.FileCreatedAfterInput,
"--" + utils.FileCreatedBeforeFN, testdata.FileCreatedBeforeInpt, "--" + utils.FileCreatedBeforeFN, testdata.FileCreatedBeforeInput,
"--" + utils.FileModifiedAfterFN, testdata.FileModifiedAfterInpt, "--" + utils.FileModifiedAfterFN, testdata.FileModifiedAfterInput,
"--" + utils.FileModifiedBeforeFN, testdata.FileModifiedBeforeInpt, "--" + utils.FileModifiedBeforeFN, testdata.FileModifiedBeforeInput,
}) })
cmd.SetOut(new(bytes.Buffer)) // drop output cmd.SetOut(new(bytes.Buffer)) // drop output
@ -75,14 +75,14 @@ func (suite *OneDriveUnitSuite) TestAddOneDriveCommands() {
assert.NoError(t, err, clues.ToCore(err)) assert.NoError(t, err, clues.ToCore(err))
opts := utils.MakeOneDriveOpts(cmd) opts := utils.MakeOneDriveOpts(cmd)
assert.Equal(t, testdata.BackupInpt, utils.BackupID) assert.Equal(t, testdata.BackupInput, utils.BackupIDFV)
assert.ElementsMatch(t, testdata.FileNamesInpt, opts.FileNames) assert.ElementsMatch(t, testdata.FileNameInput, opts.FileName)
assert.ElementsMatch(t, testdata.FolderPathsInpt, opts.FolderPaths) assert.ElementsMatch(t, testdata.FolderPathInput, opts.FolderPath)
assert.Equal(t, testdata.FileCreatedAfterInpt, opts.FileCreatedAfter) assert.Equal(t, testdata.FileCreatedAfterInput, opts.FileCreatedAfter)
assert.Equal(t, testdata.FileCreatedBeforeInpt, opts.FileCreatedBefore) assert.Equal(t, testdata.FileCreatedBeforeInput, opts.FileCreatedBefore)
assert.Equal(t, testdata.FileModifiedAfterInpt, opts.FileModifiedAfter) assert.Equal(t, testdata.FileModifiedAfterInput, opts.FileModifiedAfter)
assert.Equal(t, testdata.FileModifiedBeforeInpt, opts.FileModifiedBefore) assert.Equal(t, testdata.FileModifiedBeforeInput, opts.FileModifiedBefore)
}) })
} }
} }

8
src/cli/restore/sharepoint.go
View File

@ -85,11 +85,11 @@ func restoreSharePointCmd(cmd *cobra.Command, args []string) error {
opts := utils.MakeSharePointOpts(cmd) opts := utils.MakeSharePointOpts(cmd)
if utils.RunMode == utils.RunModeFlagTest { if utils.RunModeFV == utils.RunModeFlagTest {
return nil return nil
} }
if err := utils.ValidateSharePointRestoreFlags(utils.BackupID, opts); err != nil { if err := utils.ValidateSharePointRestoreFlags(utils.BackupIDFV, opts); err != nil {
return err return err
} }
@ -111,7 +111,7 @@ func restoreSharePointCmd(cmd *cobra.Command, args []string) error {
sel := utils.IncludeSharePointRestoreDataSelectors(opts) sel := utils.IncludeSharePointRestoreDataSelectors(opts)
utils.FilterSharePointRestoreInfoSelectors(sel, opts) utils.FilterSharePointRestoreInfoSelectors(sel, opts)
ro, err := r.NewRestore(ctx, utils.BackupID, sel.Selector, dest) ro, err := r.NewRestore(ctx, utils.BackupIDFV, sel.Selector, dest)
if err != nil { if err != nil {
return Only(ctx, clues.Wrap(err, "Failed to initialize SharePoint restore")) return Only(ctx, clues.Wrap(err, "Failed to initialize SharePoint restore"))
} }
@ -119,7 +119,7 @@ func restoreSharePointCmd(cmd *cobra.Command, args []string) error {
ds, err := ro.Run(ctx) ds, err := ro.Run(ctx)
if err != nil { if err != nil {
if errors.Is(err, data.ErrNotFound) { if errors.Is(err, data.ErrNotFound) {
return Only(ctx, clues.New("Backup or backup details missing for id "+utils.BackupID)) return Only(ctx, clues.New("Backup or backup details missing for id "+utils.BackupIDFV))
} }
return Only(ctx, clues.Wrap(err, "Failed to run SharePoint restore")) return Only(ctx, clues.Wrap(err, "Failed to run SharePoint restore"))

48
src/cli/restore/sharepoint_test.go
View File

@ -59,21 +59,21 @@ func (suite *SharePointUnitSuite) TestAddSharePointCommands() {
cmd.SetArgs([]string{ cmd.SetArgs([]string{
"sharepoint", "sharepoint",
"--" + utils.RunModeFN, utils.RunModeFlagTest, "--" + utils.RunModeFN, utils.RunModeFlagTest,
"--" + utils.BackupFN, testdata.BackupInpt, "--" + utils.BackupFN, testdata.BackupInput,
"--" + utils.LibraryFN, testdata.LibraryInpt, "--" + utils.LibraryFN, testdata.LibraryInput,
"--" + utils.FileFN, testdata.FlgInpts(testdata.FileNamesInpt), "--" + utils.FileFN, testdata.FlgInputs(testdata.FileNameInput),
"--" + utils.FolderFN, testdata.FlgInpts(testdata.FolderPathsInpt), "--" + utils.FolderFN, testdata.FlgInputs(testdata.FolderPathInput),
"--" + utils.FileCreatedAfterFN, testdata.FileCreatedAfterInpt, "--" + utils.FileCreatedAfterFN, testdata.FileCreatedAfterInput,
"--" + utils.FileCreatedBeforeFN, testdata.FileCreatedBeforeInpt, "--" + utils.FileCreatedBeforeFN, testdata.FileCreatedBeforeInput,
"--" + utils.FileModifiedAfterFN, testdata.FileModifiedAfterInpt, "--" + utils.FileModifiedAfterFN, testdata.FileModifiedAfterInput,
"--" + utils.FileModifiedBeforeFN, testdata.FileModifiedBeforeInpt, "--" + utils.FileModifiedBeforeFN, testdata.FileModifiedBeforeInput,
"--" + utils.ListItemFN, testdata.FlgInpts(testdata.ListItemInpt), "--" + utils.ListItemFN, testdata.FlgInputs(testdata.ListItemInput),
"--" + utils.ListFolderFN, testdata.FlgInpts(testdata.ListFolderInpt), "--" + utils.ListFolderFN, testdata.FlgInputs(testdata.ListFolderInput),
"--" + utils.PageFN, testdata.FlgInpts(testdata.PageInpt), "--" + utils.PageFN, testdata.FlgInputs(testdata.PageInput),
"--" + utils.PageFolderFN, testdata.FlgInpts(testdata.PageFolderInpt), "--" + utils.PageFolderFN, testdata.FlgInputs(testdata.PageFolderInput),
}) })
cmd.SetOut(new(bytes.Buffer)) // drop output cmd.SetOut(new(bytes.Buffer)) // drop output
@ -82,21 +82,21 @@ func (suite *SharePointUnitSuite) TestAddSharePointCommands() {
assert.NoError(t, err, clues.ToCore(err)) assert.NoError(t, err, clues.ToCore(err))
opts := utils.MakeSharePointOpts(cmd) opts := utils.MakeSharePointOpts(cmd)
assert.Equal(t, testdata.BackupInpt, utils.BackupID) assert.Equal(t, testdata.BackupInput, utils.BackupIDFV)
assert.Equal(t, testdata.LibraryInpt, opts.Library) assert.Equal(t, testdata.LibraryInput, opts.Library)
assert.ElementsMatch(t, testdata.FileNamesInpt, opts.FileName) assert.ElementsMatch(t, testdata.FileNameInput, opts.FileName)
assert.ElementsMatch(t, testdata.FolderPathsInpt, opts.FolderPath) assert.ElementsMatch(t, testdata.FolderPathInput, opts.FolderPath)
assert.Equal(t, testdata.FileCreatedAfterInpt, opts.FileCreatedAfter) assert.Equal(t, testdata.FileCreatedAfterInput, opts.FileCreatedAfter)
assert.Equal(t, testdata.FileCreatedBeforeInpt, opts.FileCreatedBefore) assert.Equal(t, testdata.FileCreatedBeforeInput, opts.FileCreatedBefore)
assert.Equal(t, testdata.FileModifiedAfterInpt, opts.FileModifiedAfter) assert.Equal(t, testdata.FileModifiedAfterInput, opts.FileModifiedAfter)
assert.Equal(t, testdata.FileModifiedBeforeInpt, opts.FileModifiedBefore) assert.Equal(t, testdata.FileModifiedBeforeInput, opts.FileModifiedBefore)
assert.ElementsMatch(t, testdata.ListItemInpt, opts.ListItem) assert.ElementsMatch(t, testdata.ListItemInput, opts.ListItem)
assert.ElementsMatch(t, testdata.ListFolderInpt, opts.ListFolder) assert.ElementsMatch(t, testdata.ListFolderInput, opts.ListFolder)
assert.ElementsMatch(t, testdata.PageInpt, opts.Page) assert.ElementsMatch(t, testdata.PageInput, opts.Page)
assert.ElementsMatch(t, testdata.PageFolderInpt, opts.PageFolder) assert.ElementsMatch(t, testdata.PageFolderInput, opts.PageFolder)
}) })
} }
} }

102
src/cli/utils/exchange.go
View File

@ -7,7 +7,7 @@ import (
"github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/selectors"
) )
// flag names // flag names (id: FN)
const ( const (
ContactFN = "contact" ContactFN = "contact"
ContactFolderFN = "contact-folder" ContactFolderFN = "contact-folder"
@ -29,26 +29,26 @@ const (
EventSubjectFN = "event-subject" EventSubjectFN = "event-subject"
) )
// flag population values // flag values (ie: FV)
var ( var (
Contact []string ContactFV []string
ContactFolder []string ContactFolderFV []string
ContactName string ContactNameFV string
Email []string EmailFV []string
EmailFolder []string EmailFolderFV []string
EmailReceivedAfter string EmailReceivedAfterFV string
EmailReceivedBefore string EmailReceivedBeforeFV string
EmailSender string EmailSenderFV string
EmailSubject string EmailSubjectFV string
Event []string EventFV []string
EventCalendar []string EventCalendarFV []string
EventOrganizer string EventOrganizerFV string
EventRecurs string EventRecursFV string
EventStartsAfter string EventStartsAfterFV string
EventStartsBefore string EventStartsBeforeFV string
EventSubject string EventSubjectFV string
) )
type ExchangeOpts struct { type ExchangeOpts struct {
@ -79,26 +79,26 @@ type ExchangeOpts struct {
// populates an ExchangeOpts struct with the command's current flags. // populates an ExchangeOpts struct with the command's current flags.
func MakeExchangeOpts(cmd *cobra.Command) ExchangeOpts { func MakeExchangeOpts(cmd *cobra.Command) ExchangeOpts {
return ExchangeOpts{ return ExchangeOpts{
Users: User, Users: UserFV,
Contact: Contact, Contact: ContactFV,
ContactFolder: ContactFolder, ContactFolder: ContactFolderFV,
ContactName: ContactName, ContactName: ContactNameFV,
Email: Email, Email: EmailFV,
EmailFolder: EmailFolder, EmailFolder: EmailFolderFV,
EmailReceivedAfter: EmailReceivedAfter, EmailReceivedAfter: EmailReceivedAfterFV,
EmailReceivedBefore: EmailReceivedBefore, EmailReceivedBefore: EmailReceivedBeforeFV,
EmailSender: EmailSender, EmailSender: EmailSenderFV,
EmailSubject: EmailSubject, EmailSubject: EmailSubjectFV,
Event: Event, Event: EventFV,
EventCalendar: EventCalendar, EventCalendar: EventCalendarFV,
EventOrganizer: EventOrganizer, EventOrganizer: EventOrganizerFV,
EventRecurs: EventRecurs, EventRecurs: EventRecursFV,
EventStartsAfter: EventStartsAfter, EventStartsAfter: EventStartsAfterFV,
EventStartsBefore: EventStartsBefore, EventStartsBefore: EventStartsBeforeFV,
EventSubject: EventSubject, EventSubject: EventSubjectFV,
Populated: GetPopulatedFlags(cmd), Populated: GetPopulatedFlags(cmd),
} }
@ -111,71 +111,71 @@ func AddExchangeDetailsAndRestoreFlags(cmd *cobra.Command) {
// email flags // email flags
fs.StringSliceVar( fs.StringSliceVar(
&Email, &EmailFV,
EmailFN, nil, EmailFN, nil,
"Select emails by email ID; accepts '"+Wildcard+"' to select all emails.") "Select emails by email ID; accepts '"+Wildcard+"' to select all emails.")
fs.StringSliceVar( fs.StringSliceVar(
&EmailFolder, &EmailFolderFV,
EmailFolderFN, nil, EmailFolderFN, nil,
"Select emails within a folder; accepts '"+Wildcard+"' to select all email folders.") "Select emails within a folder; accepts '"+Wildcard+"' to select all email folders.")
fs.StringVar( fs.StringVar(
&EmailSubject, &EmailSubjectFV,
EmailSubjectFN, "", EmailSubjectFN, "",
"Select emails with a subject containing this value.") "Select emails with a subject containing this value.")
fs.StringVar( fs.StringVar(
&EmailSender, &EmailSenderFV,
EmailSenderFN, "", EmailSenderFN, "",
"Select emails from a specific sender.") "Select emails from a specific sender.")
fs.StringVar( fs.StringVar(
&EmailReceivedAfter, &EmailReceivedAfterFV,
EmailReceivedAfterFN, "", EmailReceivedAfterFN, "",
"Select emails received after this datetime.") "Select emails received after this datetime.")
fs.StringVar( fs.StringVar(
&EmailReceivedBefore, &EmailReceivedBeforeFV,
EmailReceivedBeforeFN, "", EmailReceivedBeforeFN, "",
"Select emails received before this datetime.") "Select emails received before this datetime.")
// event flags // event flags
fs.StringSliceVar( fs.StringSliceVar(
&Event, &EventFV,
EventFN, nil, EventFN, nil,
"Select events by event ID; accepts '"+Wildcard+"' to select all events.") "Select events by event ID; accepts '"+Wildcard+"' to select all events.")
fs.StringSliceVar( fs.StringSliceVar(
&EventCalendar, &EventCalendarFV,
EventCalendarFN, nil, EventCalendarFN, nil,
"Select events under a calendar; accepts '"+Wildcard+"' to select all events.") "Select events under a calendar; accepts '"+Wildcard+"' to select all events.")
fs.StringVar( fs.StringVar(
&EventSubject, &EventSubjectFV,
EventSubjectFN, "", EventSubjectFN, "",
"Select events with a subject containing this value.") "Select events with a subject containing this value.")
fs.StringVar( fs.StringVar(
&EventOrganizer, &EventOrganizerFV,
EventOrganizerFN, "", EventOrganizerFN, "",
"Select events from a specific organizer.") "Select events from a specific organizer.")
fs.StringVar( fs.StringVar(
&EventRecurs, &EventRecursFV,
EventRecursFN, "", EventRecursFN, "",
"Select recurring events. Use `--event-recurs false` to select non-recurring events.") "Select recurring events. Use `--event-recurs false` to select non-recurring events.")
fs.StringVar( fs.StringVar(
&EventStartsAfter, &EventStartsAfterFV,
EventStartsAfterFN, "", EventStartsAfterFN, "",
"Select events starting after this datetime.") "Select events starting after this datetime.")
fs.StringVar( fs.StringVar(
&EventStartsBefore, &EventStartsBeforeFV,
EventStartsBeforeFN, "", EventStartsBeforeFN, "",
"Select events starting before this datetime.") "Select events starting before this datetime.")
// contact flags // contact flags
fs.StringSliceVar( fs.StringSliceVar(
&Contact, &ContactFV,
ContactFN, nil, ContactFN, nil,
"Select contacts by contact ID; accepts '"+Wildcard+"' to select all contacts.") "Select contacts by contact ID; accepts '"+Wildcard+"' to select all contacts.")
fs.StringSliceVar( fs.StringSliceVar(
&ContactFolder, &ContactFolderFV,
ContactFolderFN, nil, ContactFolderFN, nil,
"Select contacts within a folder; accepts '"+Wildcard+"' to select all contact folders.") "Select contacts within a folder; accepts '"+Wildcard+"' to select all contact folders.")
fs.StringVar( fs.StringVar(
&ContactName, &ContactNameFV,
ContactNameFN, "", ContactNameFN, "",
"Select contacts whose contact name contains this value.") "Select contacts whose contact name contains this value.")
} }

42
src/cli/utils/flags.go
View File

@ -12,33 +12,33 @@ import (
"github.com/alcionai/corso/src/pkg/path" "github.com/alcionai/corso/src/pkg/path"
) )
// common flag vars // common flag vars (eg: FV)
var ( var (
// RunMode describes the type of run, such as: // RunMode describes the type of run, such as:
// flagtest, dry, run. Should default to 'run'. // flagtest, dry, run. Should default to 'run'.
RunMode string RunModeFV string
BackupID string BackupIDFV string
FolderPath []string FolderPathFV []string
FileName []string FileNameFV []string
FileCreatedAfter string FileCreatedAfterFV string
FileCreatedBefore string FileCreatedBeforeFV string
FileModifiedAfter string FileModifiedAfterFV string
FileModifiedBefore string FileModifiedBeforeFV string
Library string LibraryFV string
SiteID []string SiteIDFV []string
WebURL []string WebURLFV []string
User []string UserFV []string
// for selection of data by category. eg: `--data email,contacts` // for selection of data by category. eg: `--data email,contacts`
CategoryData []string CategoryDataFV []string
) )
// common flag names // common flag names (eg: FN)
const ( const (
RunModeFN = "run-mode" RunModeFN = "run-mode"
@ -67,7 +67,7 @@ const (
// AddBackupIDFlag adds the --backup flag. // AddBackupIDFlag adds the --backup flag.
func AddBackupIDFlag(cmd *cobra.Command, require bool) { func AddBackupIDFlag(cmd *cobra.Command, require bool) {
cmd.Flags().StringVar(&BackupID, BackupFN, "", "ID of the backup to retrieve.") cmd.Flags().StringVar(&BackupIDFV, BackupFN, "", "ID of the backup to retrieve.")
if require { if require {
cobra.CheckErr(cmd.MarkFlagRequired(BackupFN)) cobra.CheckErr(cmd.MarkFlagRequired(BackupFN))
@ -95,7 +95,7 @@ func AddDataFlag(cmd *cobra.Command, allowed []string, hide bool) {
} }
fs.StringSliceVar( fs.StringSliceVar(
&CategoryData, &CategoryDataFV,
CategoryDataFN, nil, CategoryDataFN, nil,
"Select one or more types of data to backup: "+allowedMsg+".") "Select one or more types of data to backup: "+allowedMsg+".")
@ -111,14 +111,14 @@ func AddRunModeFlag(cmd *cobra.Command, persistent bool) {
fs = cmd.PersistentFlags() fs = cmd.PersistentFlags()
} }
fs.StringVar(&RunMode, RunModeFN, "run", "What mode to run: dry, test, run. Defaults to run.") fs.StringVar(&RunModeFV, RunModeFN, "run", "What mode to run: dry, test, run. Defaults to run.")
cobra.CheckErr(fs.MarkHidden(RunModeFN)) cobra.CheckErr(fs.MarkHidden(RunModeFN))
} }
// AddUserFlag adds the --user flag. // AddUserFlag adds the --user flag.
func AddUserFlag(cmd *cobra.Command) { func AddUserFlag(cmd *cobra.Command) {
cmd.Flags().StringSliceVar( cmd.Flags().StringSliceVar(
&User, &UserFV,
UserFN, nil, UserFN, nil,
"Backup a specific user's data; accepts '"+Wildcard+"' to select all users.") "Backup a specific user's data; accepts '"+Wildcard+"' to select all users.")
cobra.CheckErr(cmd.MarkFlagRequired(UserFN)) cobra.CheckErr(cmd.MarkFlagRequired(UserFN))
@ -134,7 +134,7 @@ func AddSiteIDFlag(cmd *cobra.Command) {
// duplicate values within a flag declaration. ie: --site-id a,b,c does not // duplicate values within a flag declaration. ie: --site-id a,b,c does not
// work. Users must call --site-id a --site-id b --site-id c. // work. Users must call --site-id a --site-id b --site-id c.
fs.StringArrayVar( fs.StringArrayVar(
&SiteID, &SiteIDFV,
SiteIDFN, nil, SiteIDFN, nil,
//nolint:lll //nolint:lll
"Backup data by site ID; accepts '"+Wildcard+"' to select all sites. Args cannot be comma-delimited and must use multiple flags.") "Backup data by site ID; accepts '"+Wildcard+"' to select all sites. Args cannot be comma-delimited and must use multiple flags.")
@ -144,7 +144,7 @@ func AddSiteIDFlag(cmd *cobra.Command) {
// AddSiteFlag adds the --site flag, which accepts webURL values. // AddSiteFlag adds the --site flag, which accepts webURL values.
func AddSiteFlag(cmd *cobra.Command) { func AddSiteFlag(cmd *cobra.Command) {
cmd.Flags().StringSliceVar( cmd.Flags().StringSliceVar(
&WebURL, &WebURLFV,
SiteFN, nil, SiteFN, nil,
"Backup data by site URL; accepts '"+Wildcard+"' to select all sites.") "Backup data by site URL; accepts '"+Wildcard+"' to select all sites.")
} }

42
src/cli/utils/onedrive.go
View File

@ -10,8 +10,8 @@ import (
type OneDriveOpts struct { type OneDriveOpts struct {
Users []string Users []string
FileNames []string FileName []string
FolderPaths []string FolderPath []string
FileCreatedAfter string FileCreatedAfter string
FileCreatedBefore string FileCreatedBefore string
FileModifiedAfter string FileModifiedAfter string
@ -22,14 +22,14 @@ type OneDriveOpts struct {
func MakeOneDriveOpts(cmd *cobra.Command) OneDriveOpts { func MakeOneDriveOpts(cmd *cobra.Command) OneDriveOpts {
return OneDriveOpts{ return OneDriveOpts{
Users: User, Users: UserFV,
FileNames: FileName, FileName: FileNameFV,
FolderPaths: FolderPath, FolderPath: FolderPathFV,
FileCreatedAfter: FileCreatedAfter, FileCreatedAfter: FileCreatedAfterFV,
FileCreatedBefore: FileCreatedBefore, FileCreatedBefore: FileCreatedBeforeFV,
FileModifiedAfter: FileModifiedAfter, FileModifiedAfter: FileModifiedAfterFV,
FileModifiedBefore: FileModifiedBefore, FileModifiedBefore: FileModifiedBeforeFV,
Populated: GetPopulatedFlags(cmd), Populated: GetPopulatedFlags(cmd),
} }
@ -41,31 +41,31 @@ func AddOneDriveDetailsAndRestoreFlags(cmd *cobra.Command) {
fs := cmd.Flags() fs := cmd.Flags()
fs.StringSliceVar( fs.StringSliceVar(
&FolderPath, &FolderPathFV,
FolderFN, nil, FolderFN, nil,
"Select files by OneDrive folder; defaults to root.") "Select files by OneDrive folder; defaults to root.")
fs.StringSliceVar( fs.StringSliceVar(
&FileName, &FileNameFV,
FileFN, nil, FileFN, nil,
"Select files by name.") "Select files by name.")
fs.StringVar( fs.StringVar(
&FileCreatedAfter, &FileCreatedAfterFV,
FileCreatedAfterFN, "", FileCreatedAfterFN, "",
"Select files created after this datetime.") "Select files created after this datetime.")
fs.StringVar( fs.StringVar(
&FileCreatedBefore, &FileCreatedBeforeFV,
FileCreatedBeforeFN, "", FileCreatedBeforeFN, "",
"Select files created before this datetime.") "Select files created before this datetime.")
fs.StringVar( fs.StringVar(
&FileModifiedAfter, &FileModifiedAfterFV,
FileModifiedAfterFN, "", FileModifiedAfterFN, "",
"Select files modified after this datetime.") "Select files modified after this datetime.")
fs.StringVar( fs.StringVar(
&FileModifiedBefore, &FileModifiedBeforeFV,
FileModifiedBeforeFN, "", FileModifiedBeforeFN, "",
"Select files modified before this datetime.") "Select files modified before this datetime.")
} }
@ -119,7 +119,7 @@ func IncludeOneDriveRestoreDataSelectors(opts OneDriveOpts) *selectors.OneDriveR
sel := selectors.NewOneDriveRestore(users) sel := selectors.NewOneDriveRestore(users)
lp, ln := len(opts.FolderPaths), len(opts.FileNames) lp, ln := len(opts.FolderPath), len(opts.FileName)
// only use the inclusion if either a path or item name // only use the inclusion if either a path or item name
// is specified // is specified
@ -128,20 +128,20 @@ func IncludeOneDriveRestoreDataSelectors(opts OneDriveOpts) *selectors.OneDriveR
return sel return sel
} }
opts.FolderPaths = trimFolderSlash(opts.FolderPaths) opts.FolderPath = trimFolderSlash(opts.FolderPath)
if ln == 0 { if ln == 0 {
opts.FileNames = selectors.Any() opts.FileName = selectors.Any()
} }
containsFolders, prefixFolders := splitFoldersIntoContainsAndPrefix(opts.FolderPaths) containsFolders, prefixFolders := splitFoldersIntoContainsAndPrefix(opts.FolderPath)
if len(containsFolders) > 0 { if len(containsFolders) > 0 {
sel.Include(sel.Items(containsFolders, opts.FileNames)) sel.Include(sel.Items(containsFolders, opts.FileName))
} }
if len(prefixFolders) > 0 { if len(prefixFolders) > 0 {
sel.Include(sel.Items(prefixFolders, opts.FileNames, selectors.PrefixMatch())) sel.Include(sel.Items(prefixFolders, opts.FileName, selectors.PrefixMatch()))
} }
return sel return sel

24
src/cli/utils/onedrive_test.go
View File

@ -37,8 +37,8 @@ func (suite *OneDriveUtilsSuite) TestIncludeOneDriveRestoreDataSelectors() {
name: "no inputs", name: "no inputs",
opts: utils.OneDriveOpts{ opts: utils.OneDriveOpts{
Users: empty, Users: empty,
FileNames: empty, FileName: empty,
FolderPaths: empty, FolderPath: empty,
}, },
expectIncludeLen: 1, expectIncludeLen: 1,
}, },
@ -46,8 +46,8 @@ func (suite *OneDriveUtilsSuite) TestIncludeOneDriveRestoreDataSelectors() {
name: "single inputs", name: "single inputs",
opts: utils.OneDriveOpts{ opts: utils.OneDriveOpts{
Users: single, Users: single,
FileNames: single, FileName: single,
FolderPaths: single, FolderPath: single,
}, },
expectIncludeLen: 1, expectIncludeLen: 1,
}, },
@ -55,8 +55,8 @@ func (suite *OneDriveUtilsSuite) TestIncludeOneDriveRestoreDataSelectors() {
name: "multi inputs", name: "multi inputs",
opts: utils.OneDriveOpts{ opts: utils.OneDriveOpts{
Users: multi, Users: multi,
FileNames: multi, FileName: multi,
FolderPaths: multi, FolderPath: multi,
}, },
expectIncludeLen: 1, expectIncludeLen: 1,
}, },
@ -64,8 +64,8 @@ func (suite *OneDriveUtilsSuite) TestIncludeOneDriveRestoreDataSelectors() {
name: "folder contains", name: "folder contains",
opts: utils.OneDriveOpts{ opts: utils.OneDriveOpts{
Users: empty, Users: empty,
FileNames: empty, FileName: empty,
FolderPaths: containsOnly, FolderPath: containsOnly,
}, },
expectIncludeLen: 1, expectIncludeLen: 1,
}, },
@ -73,8 +73,8 @@ func (suite *OneDriveUtilsSuite) TestIncludeOneDriveRestoreDataSelectors() {
name: "folder prefixes", name: "folder prefixes",
opts: utils.OneDriveOpts{ opts: utils.OneDriveOpts{
Users: empty, Users: empty,
FileNames: empty, FileName: empty,
FolderPaths: prefixOnly, FolderPath: prefixOnly,
}, },
expectIncludeLen: 1, expectIncludeLen: 1,
}, },
@ -82,8 +82,8 @@ func (suite *OneDriveUtilsSuite) TestIncludeOneDriveRestoreDataSelectors() {
name: "folder prefixes and contains", name: "folder prefixes and contains",
opts: utils.OneDriveOpts{ opts: utils.OneDriveOpts{
Users: empty, Users: empty,
FileNames: empty, FileName: empty,
FolderPaths: containsAndPrefix, FolderPath: containsAndPrefix,
}, },
expectIncludeLen: 2, expectIncludeLen: 2,
}, },

32
src/cli/utils/sharepoint.go
View File

@ -45,16 +45,16 @@ type SharePointOpts struct {
func MakeSharePointOpts(cmd *cobra.Command) SharePointOpts { func MakeSharePointOpts(cmd *cobra.Command) SharePointOpts {
return SharePointOpts{ return SharePointOpts{
SiteID: SiteID, SiteID: SiteIDFV,
WebURL: WebURL, WebURL: WebURLFV,
Library: Library, Library: LibraryFV,
FileName: FileName, FileName: FileNameFV,
FolderPath: FolderPath, FolderPath: FolderPathFV,
FileCreatedAfter: FileCreatedAfter, FileCreatedAfter: FileCreatedAfterFV,
FileCreatedBefore: FileCreatedBefore, FileCreatedBefore: FileCreatedBeforeFV,
FileModifiedAfter: FileModifiedAfter, FileModifiedAfter: FileModifiedAfterFV,
FileModifiedBefore: FileModifiedBefore, FileModifiedBefore: FileModifiedBeforeFV,
ListFolder: ListFolder, ListFolder: ListFolder,
ListItem: ListItem, ListItem: ListItem,
@ -74,31 +74,31 @@ func AddSharePointDetailsAndRestoreFlags(cmd *cobra.Command) {
// libraries // libraries
fs.StringVar( fs.StringVar(
&Library, &LibraryFV,
LibraryFN, "", LibraryFN, "",
"Select only this library; defaults to all libraries.") "Select only this library; defaults to all libraries.")
fs.StringSliceVar( fs.StringSliceVar(
&FolderPath, &FolderPathFV,
FolderFN, nil, FolderFN, nil,
"Select by folder; defaults to root.") "Select by folder; defaults to root.")
fs.StringSliceVar( fs.StringSliceVar(
&FileName, &FileNameFV,
FileFN, nil, FileFN, nil,
"Select by file name.") "Select by file name.")
fs.StringVar( fs.StringVar(
&FileCreatedAfter, &FileCreatedAfterFV,
FileCreatedAfterFN, "", FileCreatedAfterFN, "",
"Select files created after this datetime.") "Select files created after this datetime.")
fs.StringVar( fs.StringVar(
&FileCreatedBefore, &FileCreatedBeforeFV,
FileCreatedBeforeFN, "", FileCreatedBeforeFN, "",
"Select files created before this datetime.") "Select files created before this datetime.")
fs.StringVar( fs.StringVar(
&FileModifiedAfter, &FileModifiedAfterFV,
FileModifiedAfterFN, "", FileModifiedAfterFN, "",
"Select files modified after this datetime.") "Select files modified after this datetime.")
fs.StringVar( fs.StringVar(
&FileModifiedBefore, &FileModifiedBeforeFV,
FileModifiedBeforeFN, "", FileModifiedBeforeFN, "",
"Select files modified before this datetime.") "Select files modified before this datetime.")

64
src/cli/utils/testdata/flags.go vendored
View File

@ -2,45 +2,45 @@ package testdata
import "strings" import "strings"
func FlgInpts(in []string) string { return strings.Join(in, ",") } func FlgInputs(in []string) string { return strings.Join(in, ",") }
var ( var (
BackupInpt = "backup-id" BackupInput = "backup-id"
UsersInpt = []string{"users1", "users2"} UsersInput = []string{"users1", "users2"}
SiteIDInpt = []string{"siteID1", "siteID2"} SiteIDInput = []string{"siteID1", "siteID2"}
WebURLInpt = []string{"webURL1", "webURL2"} WebURLInput = []string{"webURL1", "webURL2"}
ContactInpt = []string{"contact1", "contact2"} ContactInput = []string{"contact1", "contact2"}
ContactFldInpt = []string{"contactFld1", "contactFld2"} ContactFldInput = []string{"contactFld1", "contactFld2"}
ContactNameInpt = "contactName" ContactNameInput = "contactName"
EmailInpt = []string{"mail1", "mail2"} EmailInput = []string{"mail1", "mail2"}
EmailFldInpt = []string{"mailFld1", "mailFld2"} EmailFldInput = []string{"mailFld1", "mailFld2"}
EmailReceivedAfterInpt = "mailReceivedAfter" EmailReceivedAfterInput = "mailReceivedAfter"
EmailReceivedBeforeInpt = "mailReceivedBefore" EmailReceivedBeforeInput = "mailReceivedBefore"
EmailSenderInpt = "mailSender" EmailSenderInput = "mailSender"
EmailSubjectInpt = "mailSubjet" EmailSubjectInput = "mailSubjet"
EventInpt = []string{"event1", "event2"} EventInput = []string{"event1", "event2"}
EventCalInpt = []string{"eventCal1", "eventCal2"} EventCalInput = []string{"eventCal1", "eventCal2"}
EventOrganizerInpt = "eventOrganizer" EventOrganizerInput = "eventOrganizer"
EventRecursInpt = "eventRecurs" EventRecursInput = "eventRecurs"
EventStartsAfterInpt = "eventStartsAfter" EventStartsAfterInput = "eventStartsAfter"
EventStartsBeforeInpt = "eventStartsBefore" EventStartsBeforeInput = "eventStartsBefore"
EventSubjectInpt = "eventSubject" EventSubjectInput = "eventSubject"
LibraryInpt = "library" LibraryInput = "library"
FileNamesInpt = []string{"fileName1", "fileName2"} FileNameInput = []string{"fileName1", "fileName2"}
FolderPathsInpt = []string{"folderPath1", "folderPath2"} FolderPathInput = []string{"folderPath1", "folderPath2"}
FileCreatedAfterInpt = "fileCreatedAfter" FileCreatedAfterInput = "fileCreatedAfter"
FileCreatedBeforeInpt = "fileCreatedBefore" FileCreatedBeforeInput = "fileCreatedBefore"
FileModifiedAfterInpt = "fileModifiedAfter" FileModifiedAfterInput = "fileModifiedAfter"
FileModifiedBeforeInpt = "fileModifiedBefore" FileModifiedBeforeInput = "fileModifiedBefore"
ListFolderInpt = []string{"listFolder1", "listFolder2"} ListFolderInput = []string{"listFolder1", "listFolder2"}
ListItemInpt = []string{"listItem1", "listItem2"} ListItemInput = []string{"listItem1", "listItem2"}
PageFolderInpt = []string{"pageFolder1", "pageFolder2"} PageFolderInput = []string{"pageFolder1", "pageFolder2"}
PageInpt = []string{"page1", "page2"} PageInput = []string{"page1", "page2"}
) )

16
src/cli/utils/testdata/opts.go vendored
View File

@ -352,28 +352,28 @@ var (
Name: "AllFiles", Name: "AllFiles",
Expected: testdata.OneDriveItems, Expected: testdata.OneDriveItems,
Opts: utils.OneDriveOpts{ Opts: utils.OneDriveOpts{
FolderPaths: selectors.Any(), FolderPath: selectors.Any(),
}, },
}, },
{ {
Name: "FolderPrefixMatch", Name: "FolderPrefixMatch",
Expected: testdata.OneDriveItems, Expected: testdata.OneDriveItems,
Opts: utils.OneDriveOpts{ Opts: utils.OneDriveOpts{
FolderPaths: []string{testdata.OneDriveFolderFolder}, FolderPath: []string{testdata.OneDriveFolderFolder},
}, },
}, },
{ {
Name: "FolderPrefixMatchTrailingSlash", Name: "FolderPrefixMatchTrailingSlash",
Expected: testdata.OneDriveItems, Expected: testdata.OneDriveItems,
Opts: utils.OneDriveOpts{ Opts: utils.OneDriveOpts{
FolderPaths: []string{testdata.OneDriveFolderFolder + "/"}, FolderPath: []string{testdata.OneDriveFolderFolder + "/"},
}, },
}, },
{ {
Name: "FolderPrefixMatchTrailingSlash", Name: "FolderPrefixMatchTrailingSlash",
Expected: testdata.OneDriveItems, Expected: testdata.OneDriveItems,
Opts: utils.OneDriveOpts{ Opts: utils.OneDriveOpts{
FolderPaths: []string{testdata.OneDriveFolderFolder + "/"}, FolderPath: []string{testdata.OneDriveFolderFolder + "/"},
}, },
}, },
{ {
@ -383,7 +383,7 @@ var (
testdata.OneDriveItems[1], testdata.OneDriveItems[1],
}, },
Opts: utils.OneDriveOpts{ Opts: utils.OneDriveOpts{
FileNames: []string{ FileName: []string{
testdata.OneDriveItems[0].ShortRef, testdata.OneDriveItems[0].ShortRef,
testdata.OneDriveItems[1].ShortRef, testdata.OneDriveItems[1].ShortRef,
}, },
@ -393,7 +393,7 @@ var (
Name: "SingleItem", Name: "SingleItem",
Expected: []details.DetailsEntry{testdata.OneDriveItems[0]}, Expected: []details.DetailsEntry{testdata.OneDriveItems[0]},
Opts: utils.OneDriveOpts{ Opts: utils.OneDriveOpts{
FileNames: []string{ FileName: []string{
testdata.OneDriveItems[0].OneDrive.ItemName, testdata.OneDriveItems[0].OneDrive.ItemName,
}, },
}, },
@ -405,7 +405,7 @@ var (
testdata.OneDriveItems[1], testdata.OneDriveItems[1],
}, },
Opts: utils.OneDriveOpts{ Opts: utils.OneDriveOpts{
FileNames: []string{ FileName: []string{
testdata.OneDriveItems[0].OneDrive.ItemName, testdata.OneDriveItems[0].OneDrive.ItemName,
testdata.OneDriveItems[1].OneDrive.ItemName, testdata.OneDriveItems[1].OneDrive.ItemName,
}, },
@ -415,7 +415,7 @@ var (
Name: "NoSelectRepoItemName", Name: "NoSelectRepoItemName",
Expected: []details.DetailsEntry{}, Expected: []details.DetailsEntry{},
Opts: utils.OneDriveOpts{ Opts: utils.OneDriveOpts{
FileNames: []string{ FileName: []string{
testdata.OneDriveItemPath1.Item(), testdata.OneDriveItemPath1.Item(),
}, },
}, },