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

Export some consts/functions

Browse Source 
Needed to allow backup filtering. Would be better to have a function
that returns the values based on a Reason or something.
This commit is contained in:
Ashlie Martinez 2023-10-06 11:35:03 -07:00
parent dab4d7f0c7
commit 1867a13f4d
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,7 +167,7 @@ func New(
for _, reason := range backup.Reasons { for _, reason := range backup.Reasons {
mergeBases[backup.ID] = append( mergeBases[backup.ID] = append(
mergeBases[backup.ID], mergeBases[backup.ID],
serviceCatString(reason.Service(), reason.Category())) ServiceCatString(reason.Service(), reason.Category()))
} }
} }
@ -175,7 +175,7 @@ func New(
for _, reason := range backup.Reasons { for _, reason := range backup.Reasons {
assistBases[backup.ID] = append( assistBases[backup.ID] = append(
assistBases[backup.ID], assistBases[backup.ID],
serviceCatString(reason.Service(), reason.Category())) ServiceCatString(reason.Service(), reason.Category()))
} }
} }
@ -258,7 +258,7 @@ func (b Backup) Bases() (PersistedBaseSet, error) {
} }
func (b Backup) Tenant() (string, error) { func (b Backup) Tenant() (string, error) {
t := b.Tags[tenantIDKey] t := b.Tags[TenantIDKey]
if len(t) == 0 { if len(t) == 0 {
return "", clues.Wrap(errs.NotFound, "getting tenant") return "", clues.Wrap(errs.NotFound, "getting tenant")
} }

14
src/pkg/backup/backup_bases.go
View File

@ -24,20 +24,20 @@ const (
// [1] https://github.com/kopia/kopia/blob/05e729a7858a6e86cb48ba29fb53cb6045efce2b/cli/command_snapshot_create.go#L169 // [1] https://github.com/kopia/kopia/blob/05e729a7858a6e86cb48ba29fb53cb6045efce2b/cli/command_snapshot_create.go#L169
LegacyUserTagPrefix = "tag:" LegacyUserTagPrefix = "tag:"
tenantIDKey = "tenant" TenantIDKey = "tenant"
resourceIDKey = "protectedResource" ResourceIDKey = "protectedResource"
serviceCatPrefix = "sc-" serviceCatPrefix = "sc-"
separator = "_" separator = "_"
// Sentinel value for tags. Could technically be empty but we'll store // Sentinel value for tags. Could technically be empty but we'll store
// something for now. // something for now.
//nolint //nolint
defaultTagValue = "1" DefaultTagValue = "1"
) )
var errMissingPrefix = clues.New("missing tag prefix") var errMissingPrefix = clues.New("missing tag prefix")
func serviceCatString( func ServiceCatString(
service path.ServiceType, service path.ServiceType,
category path.CategoryType, category path.CategoryType,
) string { ) string {
@ -86,9 +86,9 @@ func serviceCatStringToTypes(
// nolint // nolint
func reasonTags(r identity.Reasoner) map[string]string { func reasonTags(r identity.Reasoner) map[string]string {
return map[string]string{ return map[string]string{
tenantIDKey: r.Tenant(), TenantIDKey: r.Tenant(),
resourceIDKey: r.ProtectedResource(), ResourceIDKey: r.ProtectedResource(),
serviceCatString(r.Service(), r.Category()): defaultTagValue, ServiceCatString(r.Service(), r.Category()): DefaultTagValue,
} }
} }

6
src/pkg/backup/backup_bases_test.go
View File

@ -30,7 +30,7 @@ func (suite *BackupBasesUnitSuite) TestServiceCategorySerialization() {
}{ }{
{ {
name: "ProperFormat", name: "ProperFormat",
input: serviceCatString(path.ExchangeService, path.EmailCategory), input: ServiceCatString(path.ExchangeService, path.EmailCategory),
expectErr: assert.NoError, expectErr: assert.NoError,
expectService: path.ExchangeService, expectService: path.ExchangeService,
expectCategory: path.EmailCategory, expectCategory: path.EmailCategory,
@ -38,14 +38,14 @@ func (suite *BackupBasesUnitSuite) TestServiceCategorySerialization() {
{ {
name: "MissingPrefix", name: "MissingPrefix",
input: strings.TrimPrefix( input: strings.TrimPrefix(
serviceCatString(path.ExchangeService, path.EmailCategory), ServiceCatString(path.ExchangeService, path.EmailCategory),
serviceCatPrefix), serviceCatPrefix),
expectErr: assert.Error, expectErr: assert.Error,
}, },
{ {
name: "MissingSeparator", name: "MissingSeparator",
input: strings.ReplaceAll( input: strings.ReplaceAll(
serviceCatString(path.ExchangeService, path.EmailCategory), ServiceCatString(path.ExchangeService, path.EmailCategory),
separator, separator,
""), ""),
expectErr: assert.Error, expectErr: assert.Error,

24
src/pkg/backup/backup_test.go
View File

@ -104,13 +104,13 @@ func (suite *BackupUnitSuite) TestBackup_Bases() {
res.AssistBases = map[model.StableID][]string{} res.AssistBases = map[model.StableID][]string{}
res.MergeBases[mergeID] = []string{ res.MergeBases[mergeID] = []string{
serviceCatString( ServiceCatString(
defaultEmailReason.Service(), defaultEmailReason.Service(),
defaultEmailReason.Category()), defaultEmailReason.Category()),
} }
res.AssistBases[assistID] = []string{ res.AssistBases[assistID] = []string{
serviceCatString( ServiceCatString(
defaultEmailReason.Service(), defaultEmailReason.Service(),
defaultEmailReason.Category()), defaultEmailReason.Category()),
} }
@ -133,13 +133,13 @@ func (suite *BackupUnitSuite) TestBackup_Bases() {
res.AssistBases = map[model.StableID][]string{} res.AssistBases = map[model.StableID][]string{}
res.MergeBases[mergeID] = []string{ res.MergeBases[mergeID] = []string{
serviceCatString( ServiceCatString(
defaultEmailReason.Service(), defaultEmailReason.Service(),
defaultEmailReason.Category()), defaultEmailReason.Category()),
} }
res.AssistBases[assistID] = []string{ res.AssistBases[assistID] = []string{
serviceCatString( ServiceCatString(
defaultContactsReason.Service(), defaultContactsReason.Service(),
defaultContactsReason.Category()), defaultContactsReason.Category()),
} }
@ -162,19 +162,19 @@ func (suite *BackupUnitSuite) TestBackup_Bases() {
res.AssistBases = map[model.StableID][]string{} res.AssistBases = map[model.StableID][]string{}
res.MergeBases[mergeID] = []string{ res.MergeBases[mergeID] = []string{
serviceCatString( ServiceCatString(
defaultEmailReason.Service(), defaultEmailReason.Service(),
defaultEmailReason.Category()), defaultEmailReason.Category()),
serviceCatString( ServiceCatString(
defaultContactsReason.Service(), defaultContactsReason.Service(),
defaultContactsReason.Category()), defaultContactsReason.Category()),
} }
res.AssistBases[assistID] = []string{ res.AssistBases[assistID] = []string{
serviceCatString( ServiceCatString(
defaultEmailReason.Service(), defaultEmailReason.Service(),
defaultEmailReason.Category()), defaultEmailReason.Category()),
serviceCatString( ServiceCatString(
defaultContactsReason.Service(), defaultContactsReason.Service(),
defaultContactsReason.Category()), defaultContactsReason.Category()),
} }
@ -202,7 +202,7 @@ func (suite *BackupUnitSuite) TestBackup_Bases() {
res.MergeBases = map[model.StableID][]string{} res.MergeBases = map[model.StableID][]string{}
res.MergeBases[mergeID] = []string{ res.MergeBases[mergeID] = []string{
serviceCatString( ServiceCatString(
defaultEmailReason.Service(), defaultEmailReason.Service(),
defaultEmailReason.Category()), defaultEmailReason.Category()),
} }
@ -221,7 +221,7 @@ func (suite *BackupUnitSuite) TestBackup_Bases() {
res.AssistBases = map[model.StableID][]string{} res.AssistBases = map[model.StableID][]string{}
res.AssistBases[mergeID] = []string{ res.AssistBases[mergeID] = []string{
serviceCatString( ServiceCatString(
defaultEmailReason.Service(), defaultEmailReason.Service(),
defaultEmailReason.Category()), defaultEmailReason.Category()),
} }
@ -298,7 +298,7 @@ func (suite *BackupUnitSuite) TestBackup_Tenant() {
}{ }{
{ {
name: "ProperlyFormatted", name: "ProperlyFormatted",
inputKey: tenantIDKey, inputKey: TenantIDKey,
inputValue: tenant, inputValue: tenant,
expectErr: assert.NoError, expectErr: assert.NoError,
expect: tenant, expect: tenant,
@ -311,7 +311,7 @@ func (suite *BackupUnitSuite) TestBackup_Tenant() {
}, },
{ {
name: "EmptyValue", name: "EmptyValue",
inputKey: tenantIDKey, inputKey: TenantIDKey,
inputValue: "", inputValue: "",
expectErr: assert.Error, expectErr: assert.Error,
}, },