Compare commits
2 Commits
main
...
2825-9-bui
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dceb5f9506 | ||
|
|
30b86f664e |
@ -6,6 +6,7 @@ import (
|
||||
|
||||
"github.com/alcionai/clues"
|
||||
"github.com/google/uuid"
|
||||
"golang.org/x/exp/slices"
|
||||
|
||||
"github.com/alcionai/corso/src/internal/common"
|
||||
"github.com/alcionai/corso/src/internal/common/crash"
|
||||
@ -269,7 +270,7 @@ func (op *BackupOperation) do(
|
||||
ctx,
|
||||
op.kopia,
|
||||
op.account.ID(),
|
||||
reasons,
|
||||
reasons, fallbackReasons,
|
||||
mans,
|
||||
cs,
|
||||
excludes,
|
||||
@ -405,7 +406,7 @@ func consumeBackupCollections(
|
||||
ctx context.Context,
|
||||
bc inject.BackupConsumer,
|
||||
tenantID string,
|
||||
reasons []kopia.Reason,
|
||||
reasons, fallbackReasons []kopia.Reason,
|
||||
mans []*kopia.ManifestEntry,
|
||||
cs []data.BackupCollection,
|
||||
excludes map[string]map[string]struct{},
|
||||
@ -425,7 +426,8 @@ func consumeBackupCollections(
|
||||
kopia.TagBackupCategory: "",
|
||||
}
|
||||
|
||||
for _, reason := range reasons {
|
||||
reunion := append(slices.Clone(reasons), fallbackReasons...)
|
||||
for _, reason := range reunion {
|
||||
for _, k := range reason.TagKeys() {
|
||||
tags[k] = ""
|
||||
}
|
||||
|
||||
@ -561,6 +561,15 @@ func (suite *BackupOpUnitSuite) TestBackupOperation_ConsumeBackupDataCollections
|
||||
ctx, flush := tester.NewContext()
|
||||
defer flush()
|
||||
|
||||
expectTags := map[string]string{
|
||||
"backup-id": "",
|
||||
"bob": "",
|
||||
"bobby": "",
|
||||
"exchangecontacts": "",
|
||||
"exchangeemail": "",
|
||||
"is-canon-backup": "",
|
||||
}
|
||||
|
||||
mbu := &mockBackupConsumer{
|
||||
checkFunc: func(
|
||||
bases []kopia.IncrementalBase,
|
||||
@ -568,16 +577,43 @@ func (suite *BackupOpUnitSuite) TestBackupOperation_ConsumeBackupDataCollections
|
||||
tags map[string]string,
|
||||
buildTreeWithBase bool,
|
||||
) {
|
||||
assert.Equal(t, expectTags, tags)
|
||||
assert.ElementsMatch(t, test.expected, bases)
|
||||
},
|
||||
}
|
||||
|
||||
reasons := []kopia.Reason{
|
||||
{
|
||||
ResourceOwner: "bob",
|
||||
Service: path.ExchangeService,
|
||||
Category: path.EmailCategory,
|
||||
},
|
||||
{
|
||||
ResourceOwner: "bobby",
|
||||
Service: path.ExchangeService,
|
||||
Category: path.EmailCategory,
|
||||
},
|
||||
}
|
||||
|
||||
fallbackReasons := []kopia.Reason{
|
||||
{
|
||||
ResourceOwner: "bob",
|
||||
Service: path.ExchangeService,
|
||||
Category: path.EmailCategory,
|
||||
},
|
||||
{
|
||||
ResourceOwner: "bob",
|
||||
Service: path.ExchangeService,
|
||||
Category: path.ContactsCategory,
|
||||
},
|
||||
}
|
||||
|
||||
//nolint:errcheck
|
||||
consumeBackupCollections(
|
||||
ctx,
|
||||
mbu,
|
||||
tenant,
|
||||
nil,
|
||||
reasons, fallbackReasons,
|
||||
test.inputMan,
|
||||
nil,
|
||||
nil,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user