From 702e25bcda08c0b7f30a62a54269640b1677fe15 Mon Sep 17 00:00:00 2001 From: ryanfkeepers Date: Wed, 29 Mar 2023 15:51:59 -0600 Subject: [PATCH] rebase fixes --- src/internal/connector/graph_connector.go | 6 +++--- .../connector/graph_connector_onedrive_test.go | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/internal/connector/graph_connector.go b/src/internal/connector/graph_connector.go index 5277a3f7b..482661917 100644 --- a/src/internal/connector/graph_connector.go +++ b/src/internal/connector/graph_connector.go @@ -292,9 +292,9 @@ func (r resourceClient) getOwnerIDAndNameFrom( err error ) - if r.enum == Sites { - // TODO: check all suffixes in nameToID - } + // if r.enum == Sites { + // TODO: check all suffixes in nameToID + // } id, name, err = r.getter.GetIDAndName(ctx, owner) if err != nil { diff --git a/src/internal/connector/graph_connector_onedrive_test.go b/src/internal/connector/graph_connector_onedrive_test.go index 385055860..c02ab4020 100644 --- a/src/internal/connector/graph_connector_onedrive_test.go +++ b/src/internal/connector/graph_connector_onedrive_test.go @@ -452,11 +452,11 @@ func (suite *GraphConnectorSharePointIntegrationSuite) SetupSuite() { si.resourceOwner = tester.M365SiteID(suite.T()) - user, err := si.connector.Owners.Users().GetByID(ctx, si.user) + user, err := si.connector.Discovery.Users().GetByID(ctx, si.user) require.NoError(suite.T(), err, "fetching user", si.user, clues.ToCore(err)) si.userID = ptr.Val(user.GetId()) - secondaryUser, err := si.connector.Owners.Users().GetByID(ctx, si.secondaryUser) + secondaryUser, err := si.connector.Discovery.Users().GetByID(ctx, si.secondaryUser) require.NoError(suite.T(), err, "fetching user", si.secondaryUser, clues.ToCore(err)) si.secondaryUserID = ptr.Val(secondaryUser.GetId()) @@ -499,11 +499,11 @@ func (suite *GraphConnectorOneDriveIntegrationSuite) SetupSuite() { si.resourceOwner = si.user - user, err := si.connector.Owners.Users().GetByID(ctx, si.user) + user, err := si.connector.Discovery.Users().GetByID(ctx, si.user) require.NoError(suite.T(), err, "fetching user", si.user, clues.ToCore(err)) si.userID = ptr.Val(user.GetId()) - secondaryUser, err := si.connector.Owners.Users().GetByID(ctx, si.secondaryUser) + secondaryUser, err := si.connector.Discovery.Users().GetByID(ctx, si.secondaryUser) require.NoError(suite.T(), err, "fetching user", si.secondaryUser, clues.ToCore(err)) si.secondaryUserID = ptr.Val(secondaryUser.GetId()) @@ -695,11 +695,11 @@ func (suite *GraphConnectorOneDriveNightlySuite) SetupSuite() { si.resourceOwner = si.user - user, err := si.connector.Owners.Users().GetByID(ctx, si.user) + user, err := si.connector.Discovery.Users().GetByID(ctx, si.user) require.NoError(suite.T(), err, "fetching user", si.user, clues.ToCore(err)) si.userID = ptr.Val(user.GetId()) - secondaryUser, err := si.connector.Owners.Users().GetByID(ctx, si.secondaryUser) + secondaryUser, err := si.connector.Discovery.Users().GetByID(ctx, si.secondaryUser) require.NoError(suite.T(), err, "fetching user", si.secondaryUser, clues.ToCore(err)) si.secondaryUserID = ptr.Val(secondaryUser.GetId())