diff --git a/src/cli/flags/restore_config.go b/src/cli/flags/restore_config.go index 36868aaa6..515f34297 100644 --- a/src/cli/flags/restore_config.go +++ b/src/cli/flags/restore_config.go @@ -19,7 +19,7 @@ var ( ) // AddRestoreConfigFlags adds the restore config flag set. -func AddRestoreConfigFlags(cmd *cobra.Command, canRestoreToAlternate bool) { +func AddRestoreConfigFlags(cmd *cobra.Command) { fs := cmd.Flags() fs.StringVar( &CollisionsFV, CollisionsFN, string(control.Skip), @@ -29,9 +29,7 @@ func AddRestoreConfigFlags(cmd *cobra.Command, canRestoreToAlternate bool) { &DestinationFV, DestinationFN, "", "Overrides the folder where items get restored; '/' places items into their original location") - if canRestoreToAlternate { - fs.StringVar( - &ToResourceFV, ToResourceFN, "", - "Overrides the protected resource (mailbox, site, user, etc) where data gets restored") - } + fs.StringVar( + &ToResourceFV, ToResourceFN, "", + "Overrides the protected resource (mailbox, site, user, etc) where data gets restored") } diff --git a/src/cli/restore/exchange.go b/src/cli/restore/exchange.go index a7ffdbb08..b1115e5a9 100644 --- a/src/cli/restore/exchange.go +++ b/src/cli/restore/exchange.go @@ -28,7 +28,7 @@ func addExchangeCommands(cmd *cobra.Command) *cobra.Command { flags.AddBackupIDFlag(c, true) flags.AddExchangeDetailsAndRestoreFlags(c) - flags.AddRestoreConfigFlags(c, true) + flags.AddRestoreConfigFlags(c) flags.AddFailFastFlag(c) } diff --git a/src/cli/restore/groups.go b/src/cli/restore/groups.go index c9ba2d6b7..f5b451550 100644 --- a/src/cli/restore/groups.go +++ b/src/cli/restore/groups.go @@ -31,7 +31,7 @@ func addGroupsCommands(cmd *cobra.Command) *cobra.Command { flags.AddSiteIDFlag(c, false) flags.AddNoPermissionsFlag(c) flags.AddSharePointDetailsAndRestoreFlags(c) - flags.AddRestoreConfigFlags(c, false) + flags.AddRestoreConfigFlags(c) flags.AddFailFastFlag(c) } diff --git a/src/cli/restore/groups_test.go b/src/cli/restore/groups_test.go index 0a8e2f17f..8a9fd31d1 100644 --- a/src/cli/restore/groups_test.go +++ b/src/cli/restore/groups_test.go @@ -66,7 +66,7 @@ func (suite *GroupsUnitSuite) TestAddGroupsCommands() { "--" + flags.PageFolderFN, flagsTD.FlgInputs(flagsTD.PageFolderInput), "--" + flags.CollisionsFN, flagsTD.Collisions, "--" + flags.DestinationFN, flagsTD.Destination, - // "--" + flags.ToResourceFN, flagsTD.ToResource, + "--" + flags.ToResourceFN, flagsTD.ToResource, "--" + flags.NoPermissionsFN, }, flagsTD.PreparedProviderFlags(), @@ -83,6 +83,7 @@ func (suite *GroupsUnitSuite) TestAddGroupsCommands() { opts := utils.MakeGroupsOpts(cmd) assert.Equal(t, flagsTD.BackupInput, flags.BackupIDFV) + assert.Equal(t, flagsTD.SiteInput, opts.Site) assert.Equal(t, flagsTD.LibraryInput, opts.Library) assert.ElementsMatch(t, flagsTD.FileNameInput, opts.FileName) 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.Collisions, opts.RestoreCfg.Collisions) 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) flagsTD.AssertProviderFlags(t, cmd) flagsTD.AssertStorageFlags(t, cmd) diff --git a/src/cli/restore/onedrive.go b/src/cli/restore/onedrive.go index 8b44d3758..6efbd4831 100644 --- a/src/cli/restore/onedrive.go +++ b/src/cli/restore/onedrive.go @@ -29,7 +29,7 @@ func addOneDriveCommands(cmd *cobra.Command) *cobra.Command { flags.AddBackupIDFlag(c, true) flags.AddOneDriveDetailsAndRestoreFlags(c) flags.AddNoPermissionsFlag(c) - flags.AddRestoreConfigFlags(c, true) + flags.AddRestoreConfigFlags(c) flags.AddFailFastFlag(c) } diff --git a/src/cli/restore/sharepoint.go b/src/cli/restore/sharepoint.go index c79756e7a..56459aa19 100644 --- a/src/cli/restore/sharepoint.go +++ b/src/cli/restore/sharepoint.go @@ -29,7 +29,7 @@ func addSharePointCommands(cmd *cobra.Command) *cobra.Command { flags.AddBackupIDFlag(c, true) flags.AddSharePointDetailsAndRestoreFlags(c) flags.AddNoPermissionsFlag(c) - flags.AddRestoreConfigFlags(c, true) + flags.AddRestoreConfigFlags(c) flags.AddFailFastFlag(c) }