From a0ea09e9a19ac43cce186b7f9e383a13048f3c82 Mon Sep 17 00:00:00 2001 From: Danny Adams Date: Sat, 21 Jan 2023 02:06:03 -0500 Subject: [PATCH 1/4] Update to /connector/sharepoint/collection.go Ctrl option added to Collection Constructor. --- src/internal/connector/sharepoint/collection.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/internal/connector/sharepoint/collection.go b/src/internal/connector/sharepoint/collection.go index 8648ce6ce..3f924cded 100644 --- a/src/internal/connector/sharepoint/collection.go +++ b/src/internal/connector/sharepoint/collection.go @@ -66,6 +66,7 @@ func NewCollection( service graph.Servicer, category DataCategory, statusUpdater support.StatusUpdater, + ctrlOpts control.Options, ) *Collection { c := &Collection{ fullPath: folderPath, @@ -74,6 +75,7 @@ func NewCollection( service: service, statusUpdater: statusUpdater, category: category, + ctrl: ctrlOpts, } return c From f9e3a57ec30bb972702cbbd9bb9df7452a3990ce Mon Sep 17 00:00:00 2001 From: Danny Adams Date: Sat, 21 Jan 2023 02:07:34 -0500 Subject: [PATCH 2/4] Updates to /internal/connector/sharepoint/collection_test.go Control option added to NewCollection() calls within tests. --- src/internal/connector/sharepoint/collection_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/internal/connector/sharepoint/collection_test.go b/src/internal/connector/sharepoint/collection_test.go index e072ecaaa..cbe0a125a 100644 --- a/src/internal/connector/sharepoint/collection_test.go +++ b/src/internal/connector/sharepoint/collection_test.go @@ -17,6 +17,7 @@ import ( "github.com/alcionai/corso/src/internal/connector/support" "github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/tester" + "github.com/alcionai/corso/src/pkg/control" "github.com/alcionai/corso/src/pkg/path" ) @@ -73,7 +74,7 @@ func (suite *SharePointCollectionSuite) TestSharePointListCollection() { false) require.NoError(t, err) - col := NewCollection(dir, nil, List, nil) + col := NewCollection(dir, nil, List, nil, control.Options{}) col.data <- &Item{ id: testName, data: io.NopCloser(bytes.NewReader(byteArray)), @@ -122,7 +123,7 @@ func (suite *SharePointCollectionSuite) TestSharePointPageCollection_Populate() ) require.NoError(t, err) - col := NewCollection(dir, service, Pages, nil) + col := NewCollection(dir, service, Pages, nil, control.Defaults()) col.jobs = []string{tuples[0].id} streamChannel := col.Items() From f036d9dfb866bfe3e52e915889255ebe2d061eb8 Mon Sep 17 00:00:00 2001 From: Danny Adams Date: Sat, 21 Jan 2023 02:08:29 -0500 Subject: [PATCH 3/4] Updated to /connector/sharepoint/data_collections.go Control.Options added to NewCollection() calls. --- src/internal/connector/sharepoint/data_collections.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/internal/connector/sharepoint/data_collections.go b/src/internal/connector/sharepoint/data_collections.go index fc5708af9..ba0788422 100644 --- a/src/internal/connector/sharepoint/data_collections.go +++ b/src/internal/connector/sharepoint/data_collections.go @@ -123,7 +123,7 @@ func collectLists( return nil, errors.Wrapf(err, "failed to create collection path for site: %s", siteID) } - collection := NewCollection(dir, serv, List, updater.UpdateStatus) + collection := NewCollection(dir, serv, List, updater.UpdateStatus, ctrlOpts) collection.AddJob(tuple.id) spcs = append(spcs, collection) @@ -197,7 +197,7 @@ func collectPages( return nil, errors.Wrapf(err, "failed to create collection path for site: %s", siteID) } - collection := NewCollection(dir, serv, Pages, updater.UpdateStatus) + collection := NewCollection(dir, serv, Pages, updater.UpdateStatus, ctrlOpts) collection.AddJob(tuple.id) spcs = append(spcs, collection) From 4b67bb4684ac5aa6c8a2ec0e646dced8d304ff39 Mon Sep 17 00:00:00 2001 From: Danny Adams Date: Sat, 21 Jan 2023 02:13:16 -0500 Subject: [PATCH 4/4] Bug Fix: Initialize value at 0 --- src/internal/connector/sharepoint/collection_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/internal/connector/sharepoint/collection_test.go b/src/internal/connector/sharepoint/collection_test.go index cbe0a125a..482a6b5be 100644 --- a/src/internal/connector/sharepoint/collection_test.go +++ b/src/internal/connector/sharepoint/collection_test.go @@ -101,7 +101,7 @@ func (suite *SharePointCollectionSuite) TestSharePointPageCollection_Populate() defer flush() t := suite.T() - count := 1 + count := 0 siteID := tester.M365SiteID(t) a := tester.NewM365Account(t) account, err := a.M365Config()