Updates to /sharepoint/data_collections.go

Allows for metadata information to be passed in.
This commit is contained in:
Danny Adams 2023-02-15 15:15:32 -05:00
parent a8cf3d36ca
commit 50712a0682
2 changed files with 6 additions and 6 deletions

View File

@ -256,6 +256,7 @@ func (suite *ConnectorDataCollectionIntegrationSuite) TestSharePointDataCollecti
ctx, ctx,
graph.HTTPClient(graph.NoTimeout()), graph.HTTPClient(graph.NoTimeout()),
test.getSelector(), test.getSelector(),
nil,
connector.credentials, connector.credentials,
connector.Service, connector.Service,
connector, connector,

View File

@ -30,6 +30,7 @@ func DataCollections(
ctx context.Context, ctx context.Context,
itemClient *http.Client, itemClient *http.Client,
selector selectors.Selector, selector selectors.Selector,
metadata []data.RestoreCollection,
creds account.M365Config, creds account.M365Config,
serv graph.Servicer, serv graph.Servicer,
su statusUpdater, su statusUpdater,
@ -73,6 +74,7 @@ func DataCollections(
spcs, _, err = collectLibraries( spcs, _, err = collectLibraries(
ctx, ctx,
itemClient, itemClient,
metadata,
serv, serv,
creds.AzureTenantID, creds.AzureTenantID,
site, site,
@ -143,6 +145,7 @@ func collectLists(
func collectLibraries( func collectLibraries(
ctx context.Context, ctx context.Context,
itemClient *http.Client, itemClient *http.Client,
metadata []data.RestoreCollection,
serv graph.Servicer, serv graph.Servicer,
tenantID, siteID string, tenantID, siteID string,
scope selectors.SharePointScope, scope selectors.SharePointScope,
@ -156,7 +159,7 @@ func collectLibraries(
logger.Ctx(ctx).With("site", siteID).Debug("Creating SharePoint Library collections") logger.Ctx(ctx).With("site", siteID).Debug("Creating SharePoint Library collections")
colls := onedrive.NewCollections( odcs, excludes, err := onedrive.NewCollections(
itemClient, itemClient,
tenantID, tenantID,
siteID, siteID,
@ -164,11 +167,7 @@ func collectLibraries(
folderMatcher{scope}, folderMatcher{scope},
serv, serv,
updater.UpdateStatus, updater.UpdateStatus,
ctrlOpts) ctrlOpts).Get(ctx, metadata)
// TODO(ashmrtn): Pass previous backup metadata when SharePoint supports delta
// token-based incrementals.
odcs, excludes, err := colls.Get(ctx, nil)
if err != nil { if err != nil {
return nil, nil, support.WrapAndAppend(siteID, err, errs) return nil, nil, support.WrapAndAppend(siteID, err, errs)
} }