Fix incremetnal backup tests for Groups
This commit is contained in:
parent
4a2dc774b3
commit
04c3d202fa
@ -42,6 +42,8 @@ func (suite *GroupsBackupIntgSuite) SetupSuite() {
|
|||||||
func (suite *GroupsBackupIntgSuite) TestBackup_Run_incrementalGroups() {
|
func (suite *GroupsBackupIntgSuite) TestBackup_Run_incrementalGroups() {
|
||||||
sel := selectors.NewGroupsRestore([]string{suite.its.group.ID})
|
sel := selectors.NewGroupsRestore([]string{suite.its.group.ID})
|
||||||
|
|
||||||
|
// sel.Filter(sel.Site(suite.its.group.RootSite.ID))
|
||||||
|
|
||||||
ic := func(cs []string) selectors.Selector {
|
ic := func(cs []string) selectors.Selector {
|
||||||
sel.Include(sel.LibraryFolders(cs, selectors.PrefixMatch()))
|
sel.Include(sel.LibraryFolders(cs, selectors.PrefixMatch()))
|
||||||
return sel.Selector
|
return sel.Selector
|
||||||
|
|||||||
@ -398,6 +398,21 @@ func generateContainerOfItems(
|
|||||||
restoreCfg.Location = destFldr
|
restoreCfg.Location = destFldr
|
||||||
restoreCfg.IncludePermissions = true
|
restoreCfg.IncludePermissions = true
|
||||||
|
|
||||||
|
if sel.Service == selectors.ServiceGroups {
|
||||||
|
restoreCfg.SubService.Type = path.SharePointService
|
||||||
|
restoreCfg.SubService.ID = siteID
|
||||||
|
}
|
||||||
|
|
||||||
|
var protectedResource idname.Provider = sel
|
||||||
|
|
||||||
|
// In case of groups, we use the root site as the restore target
|
||||||
|
if sel.Service == selectors.ServiceGroups {
|
||||||
|
rootSite, err := ctrl.AC.Sites().GetByID(ctx, siteID, api.CallConfig{})
|
||||||
|
require.NoError(t, err, clues.ToCore(err))
|
||||||
|
|
||||||
|
protectedResource = idname.NewProvider(siteID, ptr.Val(rootSite.GetName()))
|
||||||
|
}
|
||||||
|
|
||||||
dataColls := buildCollections(
|
dataColls := buildCollections(
|
||||||
t,
|
t,
|
||||||
service,
|
service,
|
||||||
@ -410,7 +425,7 @@ func generateContainerOfItems(
|
|||||||
rcc := inject.RestoreConsumerConfig{
|
rcc := inject.RestoreConsumerConfig{
|
||||||
BackupVersion: backupVersion,
|
BackupVersion: backupVersion,
|
||||||
Options: opts,
|
Options: opts,
|
||||||
ProtectedResource: sel,
|
ProtectedResource: protectedResource,
|
||||||
RestoreConfig: restoreCfg,
|
RestoreConfig: restoreCfg,
|
||||||
Selector: sel,
|
Selector: sel,
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user