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

Update groups restore flags to accept to-resource

Browse Source
This commit is contained in:
Abin Simon 2023-10-16 15:35:58 +05:30
parent 4b3cf68f99
commit b24f533327
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cli/flags/restore_config.go
View File

@ -19,7 +19,7 @@ var (
) )
// AddRestoreConfigFlags adds the restore config flag set. // AddRestoreConfigFlags adds the restore config flag set.
func AddRestoreConfigFlags(cmd *cobra.Command, canRestoreToAlternate bool) { func AddRestoreConfigFlags(cmd *cobra.Command) {
fs := cmd.Flags() fs := cmd.Flags()
fs.StringVar( fs.StringVar(
&CollisionsFV, CollisionsFN, string(control.Skip), &CollisionsFV, CollisionsFN, string(control.Skip),
@ -29,9 +29,7 @@ func AddRestoreConfigFlags(cmd *cobra.Command, canRestoreToAlternate bool) {
&DestinationFV, DestinationFN, "", &DestinationFV, DestinationFN, "",
"Overrides the folder where items get restored; '/' places items into their original location") "Overrides the folder where items get restored; '/' places items into their original location")
if canRestoreToAlternate { fs.StringVar(
fs.StringVar( &ToResourceFV, ToResourceFN, "",
&ToResourceFV, ToResourceFN, "", "Overrides the protected resource (mailbox, site, user, etc) where data gets restored")
"Overrides the protected resource (mailbox, site, user, etc) where data gets restored")
}
} }

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

@ -28,7 +28,7 @@ func addExchangeCommands(cmd *cobra.Command) *cobra.Command {
flags.AddBackupIDFlag(c, true) flags.AddBackupIDFlag(c, true)
flags.AddExchangeDetailsAndRestoreFlags(c) flags.AddExchangeDetailsAndRestoreFlags(c)
flags.AddRestoreConfigFlags(c, true) flags.AddRestoreConfigFlags(c)
flags.AddFailFastFlag(c) flags.AddFailFastFlag(c)
} }

2
src/cli/restore/groups.go
View File

@ -31,7 +31,7 @@ func addGroupsCommands(cmd *cobra.Command) *cobra.Command {
flags.AddSiteIDFlag(c, false) flags.AddSiteIDFlag(c, false)
flags.AddNoPermissionsFlag(c) flags.AddNoPermissionsFlag(c)
flags.AddSharePointDetailsAndRestoreFlags(c) flags.AddSharePointDetailsAndRestoreFlags(c)
flags.AddRestoreConfigFlags(c, false) flags.AddRestoreConfigFlags(c)
flags.AddFailFastFlag(c) flags.AddFailFastFlag(c)
} }

5
src/cli/restore/groups_test.go
View File

@ -66,7 +66,7 @@ func (suite *GroupsUnitSuite) TestAddGroupsCommands() {
"--" + flags.PageFolderFN, flagsTD.FlgInputs(flagsTD.PageFolderInput), "--" + flags.PageFolderFN, flagsTD.FlgInputs(flagsTD.PageFolderInput),
"--" + flags.CollisionsFN, flagsTD.Collisions, "--" + flags.CollisionsFN, flagsTD.Collisions,
"--" + flags.DestinationFN, flagsTD.Destination, "--" + flags.DestinationFN, flagsTD.Destination,
// "--" + flags.ToResourceFN, flagsTD.ToResource, "--" + flags.ToResourceFN, flagsTD.ToResource,
"--" + flags.NoPermissionsFN, "--" + flags.NoPermissionsFN,
}, },
flagsTD.PreparedProviderFlags(), flagsTD.PreparedProviderFlags(),
@ -83,6 +83,7 @@ func (suite *GroupsUnitSuite) TestAddGroupsCommands() {
opts := utils.MakeGroupsOpts(cmd) opts := utils.MakeGroupsOpts(cmd)
assert.Equal(t, flagsTD.BackupInput, flags.BackupIDFV) assert.Equal(t, flagsTD.BackupInput, flags.BackupIDFV)
assert.Equal(t, flagsTD.SiteInput, opts.Site)
assert.Equal(t, flagsTD.LibraryInput, opts.Library) assert.Equal(t, flagsTD.LibraryInput, opts.Library)
assert.ElementsMatch(t, flagsTD.FileNameInput, opts.FileName) assert.ElementsMatch(t, flagsTD.FileNameInput, opts.FileName)
assert.ElementsMatch(t, flagsTD.FolderPathInput, opts.FolderPath) assert.ElementsMatch(t, flagsTD.FolderPathInput, opts.FolderPath)
@ -92,7 +93,7 @@ func (suite *GroupsUnitSuite) TestAddGroupsCommands() {
assert.Equal(t, flagsTD.FileModifiedBeforeInput, opts.FileModifiedBefore) assert.Equal(t, flagsTD.FileModifiedBeforeInput, opts.FileModifiedBefore)
assert.Equal(t, flagsTD.Collisions, opts.RestoreCfg.Collisions) assert.Equal(t, flagsTD.Collisions, opts.RestoreCfg.Collisions)
assert.Equal(t, flagsTD.Destination, opts.RestoreCfg.Destination) assert.Equal(t, flagsTD.Destination, opts.RestoreCfg.Destination)
// assert.Equal(t, flagsTD.ToResource, opts.RestoreCfg.ProtectedResource) assert.Equal(t, flagsTD.ToResource, opts.RestoreCfg.ProtectedResource)
assert.True(t, flags.NoPermissionsFV) assert.True(t, flags.NoPermissionsFV)
flagsTD.AssertProviderFlags(t, cmd) flagsTD.AssertProviderFlags(t, cmd)
flagsTD.AssertStorageFlags(t, cmd) flagsTD.AssertStorageFlags(t, cmd)

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

@ -29,7 +29,7 @@ func addOneDriveCommands(cmd *cobra.Command) *cobra.Command {
flags.AddBackupIDFlag(c, true) flags.AddBackupIDFlag(c, true)
flags.AddOneDriveDetailsAndRestoreFlags(c) flags.AddOneDriveDetailsAndRestoreFlags(c)
flags.AddNoPermissionsFlag(c) flags.AddNoPermissionsFlag(c)
flags.AddRestoreConfigFlags(c, true) flags.AddRestoreConfigFlags(c)
flags.AddFailFastFlag(c) flags.AddFailFastFlag(c)
} }

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

@ -29,7 +29,7 @@ func addSharePointCommands(cmd *cobra.Command) *cobra.Command {
flags.AddBackupIDFlag(c, true) flags.AddBackupIDFlag(c, true)
flags.AddSharePointDetailsAndRestoreFlags(c) flags.AddSharePointDetailsAndRestoreFlags(c)
flags.AddNoPermissionsFlag(c) flags.AddNoPermissionsFlag(c)
flags.AddRestoreConfigFlags(c, true) flags.AddRestoreConfigFlags(c)
flags.AddFailFastFlag(c) flags.AddFailFastFlag(c)
} }