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

tag a union of reason and fallback reasons

Browse Source
This commit is contained in:
ryanfkeepers 2023-04-11 14:54:29 -06:00
parent 9cea2d5333
commit 30b86f664e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/internal/operations/backup.go
View File

@ -6,6 +6,7 @@ import (
"github.com/alcionai/clues" "github.com/alcionai/clues"
"github.com/google/uuid" "github.com/google/uuid"
"golang.org/x/exp/slices"
"github.com/alcionai/corso/src/internal/common" "github.com/alcionai/corso/src/internal/common"
"github.com/alcionai/corso/src/internal/common/crash" "github.com/alcionai/corso/src/internal/common/crash"
@ -269,7 +270,7 @@ func (op *BackupOperation) do(
ctx, ctx,
op.kopia, op.kopia,
op.account.ID(), op.account.ID(),
reasons, reasons, fallbackReasons,
mans, mans,
cs, cs,
excludes, excludes,
@ -405,7 +406,7 @@ func consumeBackupCollections(
ctx context.Context, ctx context.Context,
bc inject.BackupConsumer, bc inject.BackupConsumer,
tenantID string, tenantID string,
reasons []kopia.Reason, reasons, fallbackReasons []kopia.Reason,
mans []*kopia.ManifestEntry, mans []*kopia.ManifestEntry,
cs []data.BackupCollection, cs []data.BackupCollection,
excludes map[string]map[string]struct{}, excludes map[string]map[string]struct{},
@ -425,7 +426,8 @@ func consumeBackupCollections(
kopia.TagBackupCategory: "", kopia.TagBackupCategory: "",
} }
for _, reason := range reasons { reunion := append(slices.Clone(reasons), fallbackReasons...)
for _, reason := range reunion {
for _, k := range reason.TagKeys() { for _, k := range reason.TagKeys() {
tags[k] = "" tags[k] = ""
} }

2
src/internal/operations/backup_test.go
View File

@ -577,7 +577,7 @@ func (suite *BackupOpUnitSuite) TestBackupOperation_ConsumeBackupDataCollections
ctx, ctx,
mbu, mbu,
tenant, tenant,
nil, nil, nil,
test.inputMan, test.inputMan,
nil, nil,
nil, nil,