Centralize setting sel config
This commit is contained in:
parent
27ff840be8
commit
cf71d4eccc
@ -382,8 +382,6 @@ func genericDetailsCore(
|
|||||||
) (*details.Details, error) {
|
) (*details.Details, error) {
|
||||||
ctx = clues.Add(ctx, "backup_id", backupID)
|
ctx = clues.Add(ctx, "backup_id", backupID)
|
||||||
|
|
||||||
sel.Configure(selectors.Config{OnlyMatchItemNames: true})
|
|
||||||
|
|
||||||
d, _, errs := bg.GetBackupDetails(ctx, backupID)
|
d, _, errs := bg.GetBackupDetails(ctx, backupID)
|
||||||
// TODO: log/track recoverable errors
|
// TODO: log/track recoverable errors
|
||||||
if errs.Failure() != nil {
|
if errs.Failure() != nil {
|
||||||
|
|||||||
@ -277,7 +277,6 @@ func runDetailsExchangeCmd(cmd *cobra.Command) error {
|
|||||||
opts := utils.MakeExchangeOpts(cmd)
|
opts := utils.MakeExchangeOpts(cmd)
|
||||||
|
|
||||||
sel := utils.IncludeExchangeRestoreDataSelectors(opts)
|
sel := utils.IncludeExchangeRestoreDataSelectors(opts)
|
||||||
sel.Configure(selectors.Config{OnlyMatchItemNames: true})
|
|
||||||
utils.FilterExchangeRestoreInfoSelectors(sel, opts)
|
utils.FilterExchangeRestoreInfoSelectors(sel, opts)
|
||||||
|
|
||||||
ds, err := genericDetailsCommand(cmd, flags.BackupIDFV, sel.Selector)
|
ds, err := genericDetailsCommand(cmd, flags.BackupIDFV, sel.Selector)
|
||||||
|
|||||||
@ -232,7 +232,6 @@ func runDetailsGroupsCmd(cmd *cobra.Command) error {
|
|||||||
opts := utils.MakeGroupsOpts(cmd)
|
opts := utils.MakeGroupsOpts(cmd)
|
||||||
|
|
||||||
sel := utils.IncludeGroupsRestoreDataSelectors(ctx, opts)
|
sel := utils.IncludeGroupsRestoreDataSelectors(ctx, opts)
|
||||||
sel.Configure(selectors.Config{OnlyMatchItemNames: true})
|
|
||||||
utils.FilterGroupsRestoreInfoSelectors(sel, opts)
|
utils.FilterGroupsRestoreInfoSelectors(sel, opts)
|
||||||
|
|
||||||
ds, err := genericDetailsCommand(cmd, flags.BackupIDFV, sel.Selector)
|
ds, err := genericDetailsCommand(cmd, flags.BackupIDFV, sel.Selector)
|
||||||
|
|||||||
@ -240,7 +240,6 @@ func runDetailsOneDriveCmd(cmd *cobra.Command) error {
|
|||||||
opts := utils.MakeOneDriveOpts(cmd)
|
opts := utils.MakeOneDriveOpts(cmd)
|
||||||
|
|
||||||
sel := utils.IncludeOneDriveRestoreDataSelectors(opts)
|
sel := utils.IncludeOneDriveRestoreDataSelectors(opts)
|
||||||
sel.Configure(selectors.Config{OnlyMatchItemNames: true})
|
|
||||||
utils.FilterOneDriveRestoreInfoSelectors(sel, opts)
|
utils.FilterOneDriveRestoreInfoSelectors(sel, opts)
|
||||||
|
|
||||||
ds, err := genericDetailsCommand(cmd, flags.BackupIDFV, sel.Selector)
|
ds, err := genericDetailsCommand(cmd, flags.BackupIDFV, sel.Selector)
|
||||||
|
|||||||
@ -331,7 +331,6 @@ func runDetailsSharePointCmd(cmd *cobra.Command) error {
|
|||||||
opts := utils.MakeSharePointOpts(cmd)
|
opts := utils.MakeSharePointOpts(cmd)
|
||||||
|
|
||||||
sel := utils.IncludeSharePointRestoreDataSelectors(ctx, opts)
|
sel := utils.IncludeSharePointRestoreDataSelectors(ctx, opts)
|
||||||
sel.Configure(selectors.Config{OnlyMatchItemNames: true})
|
|
||||||
utils.FilterSharePointRestoreInfoSelectors(sel, opts)
|
utils.FilterSharePointRestoreInfoSelectors(sel, opts)
|
||||||
|
|
||||||
ds, err := genericDetailsCommand(cmd, flags.BackupIDFV, sel.Selector)
|
ds, err := genericDetailsCommand(cmd, flags.BackupIDFV, sel.Selector)
|
||||||
|
|||||||
@ -170,6 +170,8 @@ func IncludeExchangeRestoreDataSelectors(opts ExchangeOpts) *selectors.ExchangeR
|
|||||||
AddExchangeInclude(sel, opts.EmailFolder, opts.Email, sel.Mails)
|
AddExchangeInclude(sel, opts.EmailFolder, opts.Email, sel.Mails)
|
||||||
AddExchangeInclude(sel, opts.EventCalendar, opts.Event, sel.Events)
|
AddExchangeInclude(sel, opts.EventCalendar, opts.Event, sel.Events)
|
||||||
|
|
||||||
|
sel.Configure(selectors.Config{OnlyMatchItemNames: true})
|
||||||
|
|
||||||
return sel
|
return sel
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -293,6 +293,8 @@ func IncludeGroupsRestoreDataSelectors(ctx context.Context, opts GroupsOpts) *se
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sel.Configure(selectors.Config{OnlyMatchItemNames: true})
|
||||||
|
|
||||||
return sel
|
return sel
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -119,6 +119,8 @@ func IncludeOneDriveRestoreDataSelectors(opts OneDriveOpts) *selectors.OneDriveR
|
|||||||
sel.Include(sel.Items(prefixFolders, opts.FileName, selectors.PrefixMatch()))
|
sel.Include(sel.Items(prefixFolders, opts.FileName, selectors.PrefixMatch()))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sel.Configure(selectors.Config{OnlyMatchItemNames: true})
|
||||||
|
|
||||||
return sel
|
return sel
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -212,6 +212,8 @@ func IncludeSharePointRestoreDataSelectors(ctx context.Context, opts SharePointO
|
|||||||
sel.Include(sel.WebURL(urls))
|
sel.Include(sel.WebURL(urls))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sel.Configure(selectors.Config{OnlyMatchItemNames: true})
|
||||||
|
|
||||||
return sel
|
return sel
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user