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

Fix MakeGroupsOpts

Browse Source
This commit is contained in:
Abin Simon 2023-10-17 15:53:48 +05:30
parent b592ef4749
commit ad9c3482ff
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/cli/utils/groups.go
View File

@ -69,9 +69,13 @@ func AddGroupsCategories(sel *selectors.GroupsBackup, cats []string) *selectors.
func MakeGroupsOpts(cmd *cobra.Command) GroupsOpts { func MakeGroupsOpts(cmd *cobra.Command) GroupsOpts {
restoreCfg := makeBaseRestoreCfgOpts(cmd) restoreCfg := makeBaseRestoreCfgOpts(cmd)
restoreCfg.SubServiceType = path.SharePointService // this is the only possibility as of now
restoreCfg.SubService = append(flags.SiteIDFV, flags.WebURLFV...)[0] // we should always have just one sites := append(flags.SiteIDFV, flags.WebURLFV...)
if len(sites) > 0 {
// There will either be zero or one sites, this is ensured by ValidateGroupsRestoreFlags
restoreCfg.SubServiceType = path.SharePointService
restoreCfg.SubService = sites[0]
}
return GroupsOpts{ return GroupsOpts{
Groups: flags.GroupFV, Groups: flags.GroupFV,
@ -114,15 +118,15 @@ func ValidateGroupsRestoreFlags(backupID string, opts GroupsOpts, isRestore bool
return clues.New("a backup ID is required") return clues.New("a backup ID is required")
} }
// The user has to explicitly specify which resource to restore. In // When restoring the user has to select a single site to
// this case, since we can only restore sites, the user is supposed // restore. During exports or other operation, they can either select
// to specify which site to restore. // the entire backup or just a single site.
if isRestore { if isRestore && len(opts.WebURL)+len(opts.SiteID) == 0 {
if len(opts.WebURL)+len(opts.SiteID) == 0 { return clues.New("web URL of the site to restore is required. Use --" + flags.SiteFN + " to provide one.")
return clues.New("web URL of the site to restore is required. Use --" + flags.SiteFN + " to provide one.") }
} else if len(opts.WebURL)+len(opts.SiteID) > 1 {
return clues.New("only a single site can be selected for restore") if len(opts.WebURL)+len(opts.SiteID) > 1 {
} return clues.New("only a single site can be selected when processing sub resources")
} }
if _, ok := opts.Populated[flags.FileCreatedAfterFN]; ok && !IsValidTimeFormat(opts.FileCreatedAfter) { if _, ok := opts.Populated[flags.FileCreatedAfterFN]; ok && !IsValidTimeFormat(opts.FileCreatedAfter) {