b70d32923b
The goal of this PR is to normalize the cli packages in a way that 1/ showcases clear ownership of data, 2/ minimizes package bloat, and 3/ helps avoid circular import issues. To achieve this, two primary changes were made. First, the cli/options package was folded into cli/utils, so that all "shared functionality" is owned by a single package. Second, all flag values, globals, declarations, and mutator funcs (in the cli layer, logging package was not changed) were extracted from cli/utils and placed into cli/flags. This divides ownership between the declaration and population of the flags (cli/flags) from the utilization of values derived from flags in command processing (cli/utils). This PR contains zero logical changes. Only code movement and renaming. --- #### Does this PR need a docs update or release note? - [x] ⛔ No #### Type of change - [x] 🧹 Tech Debt/Cleanup #### Issue(s) * #3664 #### Test Plan - [x] ⚡ Unit test - [x] 💚 E2E
126 lines
3.3 KiB
Go
126 lines
3.3 KiB
Go
package utils
|
|
|
|
import (
|
|
"github.com/alcionai/clues"
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/alcionai/corso/src/cli/flags"
|
|
"github.com/alcionai/corso/src/pkg/selectors"
|
|
)
|
|
|
|
type OneDriveOpts struct {
|
|
Users []string
|
|
|
|
FileName []string
|
|
FolderPath []string
|
|
FileCreatedAfter string
|
|
FileCreatedBefore string
|
|
FileModifiedAfter string
|
|
FileModifiedBefore string
|
|
|
|
Populated flags.PopulatedFlags
|
|
}
|
|
|
|
func MakeOneDriveOpts(cmd *cobra.Command) OneDriveOpts {
|
|
return OneDriveOpts{
|
|
Users: flags.UserFV,
|
|
|
|
FileName: flags.FileNameFV,
|
|
FolderPath: flags.FolderPathFV,
|
|
FileCreatedAfter: flags.FileCreatedAfterFV,
|
|
FileCreatedBefore: flags.FileCreatedBeforeFV,
|
|
FileModifiedAfter: flags.FileModifiedAfterFV,
|
|
FileModifiedBefore: flags.FileModifiedBeforeFV,
|
|
|
|
Populated: flags.GetPopulatedFlags(cmd),
|
|
}
|
|
}
|
|
|
|
// ValidateOneDriveRestoreFlags checks common flags for correctness and interdependencies
|
|
func ValidateOneDriveRestoreFlags(backupID string, opts OneDriveOpts) error {
|
|
if len(backupID) == 0 {
|
|
return clues.New("a backup ID is required")
|
|
}
|
|
|
|
if _, ok := opts.Populated[flags.FileCreatedAfterFN]; ok && !IsValidTimeFormat(opts.FileCreatedAfter) {
|
|
return clues.New("invalid time format for created-after")
|
|
}
|
|
|
|
if _, ok := opts.Populated[flags.FileCreatedBeforeFN]; ok && !IsValidTimeFormat(opts.FileCreatedBefore) {
|
|
return clues.New("invalid time format for created-before")
|
|
}
|
|
|
|
if _, ok := opts.Populated[flags.FileModifiedAfterFN]; ok && !IsValidTimeFormat(opts.FileModifiedAfter) {
|
|
return clues.New("invalid time format for modified-after")
|
|
}
|
|
|
|
if _, ok := opts.Populated[flags.FileModifiedBeforeFN]; ok && !IsValidTimeFormat(opts.FileModifiedBefore) {
|
|
return clues.New("invalid time format for modified-before")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// AddOneDriveFilter adds the scope of the provided values to the selector's
|
|
// filter set
|
|
func AddOneDriveFilter(
|
|
sel *selectors.OneDriveRestore,
|
|
v string,
|
|
f func(string) []selectors.OneDriveScope,
|
|
) {
|
|
if len(v) == 0 {
|
|
return
|
|
}
|
|
|
|
sel.Filter(f(v))
|
|
}
|
|
|
|
// IncludeOneDriveRestoreDataSelectors builds the common data-selector
|
|
// inclusions for OneDrive commands.
|
|
func IncludeOneDriveRestoreDataSelectors(opts OneDriveOpts) *selectors.OneDriveRestore {
|
|
users := opts.Users
|
|
if len(users) == 0 {
|
|
users = selectors.Any()
|
|
}
|
|
|
|
sel := selectors.NewOneDriveRestore(users)
|
|
|
|
lp, ln := len(opts.FolderPath), len(opts.FileName)
|
|
|
|
// only use the inclusion if either a path or item name
|
|
// is specified
|
|
if lp+ln == 0 {
|
|
sel.Include(sel.AllData())
|
|
return sel
|
|
}
|
|
|
|
opts.FolderPath = trimFolderSlash(opts.FolderPath)
|
|
|
|
if ln == 0 {
|
|
opts.FileName = selectors.Any()
|
|
}
|
|
|
|
containsFolders, prefixFolders := splitFoldersIntoContainsAndPrefix(opts.FolderPath)
|
|
|
|
if len(containsFolders) > 0 {
|
|
sel.Include(sel.Items(containsFolders, opts.FileName))
|
|
}
|
|
|
|
if len(prefixFolders) > 0 {
|
|
sel.Include(sel.Items(prefixFolders, opts.FileName, selectors.PrefixMatch()))
|
|
}
|
|
|
|
return sel
|
|
}
|
|
|
|
// FilterOneDriveRestoreInfoSelectors builds the common info-selector filters.
|
|
func FilterOneDriveRestoreInfoSelectors(
|
|
sel *selectors.OneDriveRestore,
|
|
opts OneDriveOpts,
|
|
) {
|
|
AddOneDriveFilter(sel, opts.FileCreatedAfter, sel.CreatedAfter)
|
|
AddOneDriveFilter(sel, opts.FileCreatedBefore, sel.CreatedBefore)
|
|
AddOneDriveFilter(sel, opts.FileModifiedAfter, sel.ModifiedAfter)
|
|
AddOneDriveFilter(sel, opts.FileModifiedBefore, sel.ModifiedBefore)
|
|
}
|