larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

force userPN on exchange, onedrive backup (#3052)

Browse Source 
#### Does this PR need a docs update or release note?

- [x] ⛔ No

#### Type of change

- [x] 🐛 Bugfix

#### Issue(s)

* #2825

#### Test Plan

- [x] 💪 Manual
This commit is contained in:
Keepers 2023-04-06 17:53:45 -06:00 committed by GitHub
parent 0fd1314479
commit b953eb1bd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cli/backup/exchange_e2e_test.go
View File

@ -303,8 +303,8 @@ func (suite *PreparedBackupExchangeE2ESuite) SetupSuite() {
var ( var (
users = []string{suite.m365UserID} users = []string{suite.m365UserID}
idToName = map[string]string{suite.m365UserID: "todo-name-" + suite.m365UserID} idToName = map[string]string{suite.m365UserID: suite.m365UserID}
nameToID = map[string]string{"todo-name-" + suite.m365UserID: suite.m365UserID} nameToID = map[string]string{suite.m365UserID: suite.m365UserID}
ins = common.IDsNames{ ins = common.IDsNames{
IDToName: idToName, IDToName: idToName,
NameToID: nameToID, NameToID: nameToID,

4
src/cli/backup/onedrive_e2e_test.go
View File

@ -209,8 +209,8 @@ func (suite *BackupDeleteOneDriveE2ESuite) SetupSuite() {
var ( var (
m365UserID = tester.M365UserID(t) m365UserID = tester.M365UserID(t)
users = []string{m365UserID} users = []string{m365UserID}
idToName = map[string]string{m365UserID: "todo-name-" + m365UserID} idToName = map[string]string{m365UserID: m365UserID}
nameToID = map[string]string{"todo-name-" + m365UserID: m365UserID} nameToID = map[string]string{m365UserID: m365UserID}
ins = common.IDsNames{ ins = common.IDsNames{
IDToName: idToName, IDToName: idToName,
NameToID: nameToID, NameToID: nameToID,

4
src/cli/backup/sharepoint_e2e_test.go
View File

@ -161,8 +161,8 @@ func (suite *BackupDeleteSharePointE2ESuite) SetupSuite() {
var ( var (
m365SiteID = tester.M365SiteID(t) m365SiteID = tester.M365SiteID(t)
sites = []string{m365SiteID} sites = []string{m365SiteID}
idToName = map[string]string{m365SiteID: "todo-name-" + m365SiteID} idToName = map[string]string{m365SiteID: m365SiteID}
nameToID = map[string]string{"todo-name-" + m365SiteID: m365SiteID} nameToID = map[string]string{m365SiteID: m365SiteID}
ins = common.IDsNames{ ins = common.IDsNames{
IDToName: idToName, IDToName: idToName,
NameToID: nameToID, NameToID: nameToID,

4
src/cli/restore/exchange_e2e_test.go
View File

@ -77,8 +77,8 @@ func (suite *RestoreExchangeE2ESuite) SetupSuite() {
var ( var (
users = []string{suite.m365UserID} users = []string{suite.m365UserID}
idToName = map[string]string{suite.m365UserID: "todo-name-" + suite.m365UserID} idToName = map[string]string{suite.m365UserID: suite.m365UserID}
nameToID = map[string]string{"todo-name-" + suite.m365UserID: suite.m365UserID} nameToID = map[string]string{suite.m365UserID: suite.m365UserID}
ins = common.IDsNames{ ins = common.IDsNames{
IDToName: idToName, IDToName: idToName,
NameToID: nameToID, NameToID: nameToID,

6
src/pkg/repository/repository.go
View File

@ -27,6 +27,7 @@ import (
"github.com/alcionai/corso/src/pkg/control" "github.com/alcionai/corso/src/pkg/control"
"github.com/alcionai/corso/src/pkg/fault" "github.com/alcionai/corso/src/pkg/fault"
"github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/logger"
"github.com/alcionai/corso/src/pkg/path"
"github.com/alcionai/corso/src/pkg/selectors" "github.com/alcionai/corso/src/pkg/selectors"
"github.com/alcionai/corso/src/pkg/storage" "github.com/alcionai/corso/src/pkg/storage"
"github.com/alcionai/corso/src/pkg/store" "github.com/alcionai/corso/src/pkg/store"
@ -318,6 +319,11 @@ func (r repository) NewBackupWithLookup(
return operations.BackupOperation{}, errors.Wrap(err, "resolving resource owner details") return operations.BackupOperation{}, errors.Wrap(err, "resolving resource owner details")
} }
// Exchange and OneDrive need to maintain the user PN as the ID until we're ready to migrate
if sel.PathService() != path.SharePointService {
ownerID = ownerName
}
// TODO: retrieve display name from gc // TODO: retrieve display name from gc
sel = sel.SetDiscreteOwnerIDName(ownerID, ownerName) sel = sel.SetDiscreteOwnerIDName(ownerID, ownerName)