Skip to content

Commit e73d7b5

Browse files
jkellererjkellerer
committed
Added missing cmds that filter by host, tag & path
1 parent ce27e1f commit e73d7b5

File tree

3 files changed

+175
-61
lines changed

3 files changed

+175
-61
lines changed

‎config/profile.go‎

Lines changed: 78 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ type Profile struct {
4545
Forget *OtherSectionWithSchedule `mapstructure:"forget"`
4646
Mount map[string]interface{} `mapstructure:"mount"`
4747
Copy *CopySection `mapstructure:"copy"`
48+
Dump map[string]interface{} `mapstructure:"dump"`
49+
Find map[string]interface{} `mapstructure:"find"`
50+
Ls map[string]interface{} `mapstructure:"ls"`
51+
Restore map[string]interface{} `mapstructure:"restore"`
52+
Stats map[string]interface{} `mapstructure:"stats"`
53+
Tag map[string]interface{} `mapstructure:"tag"`
4854
}
4955

5056
// BackupSection contains the specific configuration to the 'backup' command
@@ -156,25 +162,65 @@ func (p *Profile) SetRootPath(rootPath string) {
156162
p.Copy.PasswordFile = fixPath(p.Copy.PasswordFile, expandEnv, absolutePrefix(rootPath))
157163
p.Copy.RepositoryFile = fixPath(p.Copy.RepositoryFile, expandEnv, absolutePrefix(rootPath))
158164
}
165+
166+
// Handle dynamic flags dealing with paths
167+
pathFlags := []string{
168+
"cacert",
169+
"tls-client-cert",
170+
"cache-dir",
171+
"repository-file",
172+
"password-file",
173+
}
174+
for _, section := range p.allFlagsSections() {
175+
if section == nil {
176+
continue
177+
}
178+
for _, flag := range pathFlags {
179+
if paths, ok := stringifyValueOf(section[flag]); ok && len(paths) > 0 {
180+
for i, path := range paths {
181+
if len(path) > 0 {
182+
paths[i] = fixPath(path, expandEnv, absolutePrefix(rootPath))
183+
}
184+
}
185+
section[flag] = paths
186+
}
187+
}
188+
}
159189
}
160190

161191
// SetHost will replace any host value from a boolean to the hostname
162192
func (p *Profile) SetHost(hostname string) {
163-
if p.Backup != nil && p.Backup.OtherFlags != nil {
164-
replaceTrueValue(p.Backup.OtherFlags, constants.ParameterHost, hostname)
193+
for _, section := range p.allFlagsSections() {
194+
if section != nil {
195+
replaceTrueValue(section, constants.ParameterHost, hostname)
196+
}
165197
}
166-
if p.Retention != nil && p.Retention.OtherFlags != nil {
167-
replaceTrueValue(p.Retention.OtherFlags, constants.ParameterHost, hostname)
198+
}
199+
200+
func (p *Profile) allFlagsSections() (sections []map[string]interface{}) {
201+
sections = append(sections,
202+
p.Dump,
203+
p.Find,
204+
p.Ls,
205+
p.Mount,
206+
p.Restore,
207+
p.Snapshots,
208+
p.Stats,
209+
p.Tag,
210+
)
211+
if p.Backup != nil {
212+
sections = append(sections, p.Backup.OtherFlags)
168213
}
169-
if p.Snapshots != nil {
170-
replaceTrueValue(p.Snapshots, constants.ParameterHost, hostname)
214+
if p.Copy != nil {
215+
sections = append(sections, p.Copy.OtherFlags)
171216
}
172217
if p.Forget != nil {
173-
replaceTrueValue(p.Forget.OtherFlags, constants.ParameterHost, hostname)
218+
sections = append(sections, p.Forget.OtherFlags)
174219
}
175-
if p.Mount != nil {
176-
replaceTrueValue(p.Mount, constants.ParameterHost, hostname)
220+
if p.Retention != nil {
221+
sections = append(sections, p.Retention.OtherFlags)
177222
}
223+
return
178224
}
179225

180226
// GetCommonFlags returns the flags common to all commands
@@ -201,17 +247,15 @@ func (p *Profile) GetCommandFlags(command string) *shell.Args {
201247
flags = addOtherArgs(flags, p.Backup.OtherFlags)
202248

203249
case constants.CommandSnapshots:
204-
if p.Snapshots != nil {
205-
flags = addOtherArgs(flags, p.Snapshots)
206-
}
250+
flags = addOtherArgs(flags, p.Snapshots)
207251

208252
case constants.CommandCheck:
209-
if p.Check != nil && p.Check.OtherFlags != nil {
253+
if p.Check != nil {
210254
flags = addOtherArgs(flags, p.Check.OtherFlags)
211255
}
212256

213257
case constants.CommandPrune:
214-
if p.Prune != nil && p.Prune.OtherFlags != nil {
258+
if p.Prune != nil {
215259
flags = addOtherArgs(flags, p.Prune.OtherFlags)
216260
}
217261

@@ -221,17 +265,31 @@ func (p *Profile) GetCommandFlags(command string) *shell.Args {
221265
}
222266

223267
case constants.CommandMount:
224-
if p.Mount != nil {
225-
flags = addOtherArgs(flags, p.Mount)
226-
}
268+
flags = addOtherArgs(flags, p.Mount)
227269

228270
case constants.CommandCopy:
229271
if p.Copy != nil {
230272
flags = convertStructToArgs(*p.Copy, flags)
231-
if p.Copy.OtherFlags != nil {
232-
flags = addOtherArgs(flags, p.Copy.OtherFlags)
233-
}
273+
flags = addOtherArgs(flags, p.Copy.OtherFlags)
234274
}
275+
276+
case constants.CommandDump:
277+
flags = addOtherArgs(flags, p.Dump)
278+
279+
case constants.CommandFind:
280+
flags = addOtherArgs(flags, p.Find)
281+
282+
case constants.CommandLs:
283+
flags = addOtherArgs(flags, p.Ls)
284+
285+
case constants.CommandRestore:
286+
flags = addOtherArgs(flags, p.Restore)
287+
288+
case constants.CommandStats:
289+
flags = addOtherArgs(flags, p.Stats)
290+
291+
case constants.CommandTag:
292+
flags = addOtherArgs(flags, p.Tag)
235293
}
236294

237295
return flags

‎config/profile_test.go‎

Lines changed: 91 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,8 @@ exclude = "exclude"
225225
iexclude = "iexclude"
226226
[profile.copy]
227227
password-file = "key"
228+
[profile.dump]
229+
password-file = "key"
228230
`
229231
profile, err := getProfile("toml", testConfig, "profile", "")
230232
if err != nil {
@@ -243,6 +245,7 @@ password-file = "key"
243245
assert.ElementsMatch(t, []string{"exclude"}, profile.Backup.Exclude)
244246
assert.ElementsMatch(t, []string{"iexclude"}, profile.Backup.Iexclude)
245247
assert.Equal(t, "/wd/key", profile.Copy.PasswordFile)
248+
assert.Equal(t, []string{"/wd/key"}, profile.Dump["password-file"])
246249
}
247250

248251
func TestHostInProfile(t *testing.T) {
@@ -284,6 +287,13 @@ func TestHostInAllSupportedSections(t *testing.T) {
284287
constants.CommandSnapshots,
285288
constants.CommandMount,
286289
constants.SectionConfigurationRetention,
290+
constants.CommandCopy,
291+
constants.CommandDump,
292+
constants.CommandFind,
293+
constants.CommandLs,
294+
constants.CommandRestore,
295+
constants.CommandStats,
296+
constants.CommandTag,
287297
}
288298

289299
assertHostIs := func(expectedHost []string, profile *Profile, section string) {
@@ -712,6 +722,18 @@ other-flag-prune = true
712722
other-flag-mount = true
713723
[profile.copy]
714724
other-flag-copy = true
725+
[profile.dump]
726+
other-flag-dump = true
727+
[profile.find]
728+
other-flag-find = true
729+
[profile.ls]
730+
other-flag-ls = true
731+
[profile.restore]
732+
other-flag-restore = true
733+
[profile.stats]
734+
other-flag-stats = true
735+
[profile.tag]
736+
other-flag-tag = true
715737
`},
716738
{"json", `
717739
{
@@ -724,7 +746,13 @@ other-flag-copy = true
724746
"forget": {"other-flag-forget": true},
725747
"prune": {"other-flag-prune": true},
726748
"mount": {"other-flag-mount": true},
727-
"copy": {"other-flag-copy": true}
749+
"copy": {"other-flag-copy": true},
750+
"dump": {"other-flag-dump": true},
751+
"find": {"other-flag-find": true},
752+
"ls": {"other-flag-ls": true},
753+
"restore": {"other-flag-restore": true},
754+
"stats": {"other-flag-stats": true},
755+
"tag": {"other-flag-tag": true}
728756
}
729757
}`},
730758
{"yaml", `---
@@ -746,6 +774,18 @@ profile:
746774
other-flag-mount: true
747775
copy:
748776
other-flag-copy: true
777+
dump:
778+
other-flag-dump: true
779+
find:
780+
other-flag-find: true
781+
ls:
782+
other-flag-ls: true
783+
restore:
784+
other-flag-restore: true
785+
stats:
786+
other-flag-stats: true
787+
tag:
788+
other-flag-tag: true
749789
`},
750790
{"hcl", `
751791
"profile" = {
@@ -774,6 +814,24 @@ profile:
774814
copy = {
775815
other-flag-copy = true
776816
}
817+
dump = {
818+
other-flag-dump = true
819+
}
820+
find = {
821+
other-flag-find = true
822+
}
823+
ls = {
824+
other-flag-ls = true
825+
}
826+
restore = {
827+
other-flag-restore = true
828+
}
829+
stats = {
830+
other-flag-stats = true
831+
}
832+
tag = {
833+
other-flag-tag = true
834+
}
777835
}
778836
`},
779837
}
@@ -794,57 +852,49 @@ profile:
794852
require.NotNil(t, profile.Prune)
795853
require.NotNil(t, profile.Snapshots)
796854
require.NotNil(t, profile.Copy)
855+
require.NotNil(t, profile.Dump)
856+
require.NotNil(t, profile.Find)
857+
require.NotNil(t, profile.Ls)
858+
require.NotNil(t, profile.Restore)
859+
require.NotNil(t, profile.Stats)
860+
require.NotNil(t, profile.Tag)
797861

798862
flags := profile.GetCommonFlags()
799863
assert.Equal(t, 1, len(flags.ToMap()))
800864
assert.ElementsMatch(t, []string{"1"}, flags.ToMap()["other-flag"])
801865

802-
flags = profile.GetCommandFlags("backup")
803-
assert.Equal(t, 2, len(flags.ToMap()))
804-
assert.ElementsMatch(t, []string{"1"}, flags.ToMap()["other-flag"])
805-
assert.ElementsMatch(t, []string{"backup"}, flags.ToMap()["other-flag-backup"])
806-
807866
flags = profile.GetRetentionFlags()
808867
assert.Equal(t, 2, len(flags.ToMap()))
809868
assert.ElementsMatch(t, []string{"1"}, flags.ToMap()["other-flag"])
810869
_, found := flags.ToMap()["other-flag-retention"]
811870
assert.True(t, found)
812871

813-
flags = profile.GetCommandFlags("snapshots")
814-
assert.Equal(t, 2, len(flags.ToMap()))
815-
assert.ElementsMatch(t, []string{"1"}, flags.ToMap()["other-flag"])
816-
_, found = flags.ToMap()["other-flag-snapshots"]
817-
assert.True(t, found)
818-
819-
flags = profile.GetCommandFlags("check")
820-
assert.Equal(t, 2, len(flags.ToMap()))
821-
assert.ElementsMatch(t, []string{"1"}, flags.ToMap()["other-flag"])
822-
_, found = flags.ToMap()["other-flag-check"]
823-
assert.True(t, found)
824-
825-
flags = profile.GetCommandFlags("forget")
826-
assert.Equal(t, 2, len(flags.ToMap()))
827-
assert.ElementsMatch(t, []string{"1"}, flags.ToMap()["other-flag"])
828-
_, found = flags.ToMap()["other-flag-forget"]
829-
assert.True(t, found)
830-
831-
flags = profile.GetCommandFlags("prune")
832-
assert.Equal(t, 2, len(flags.ToMap()))
833-
assert.ElementsMatch(t, []string{"1"}, flags.ToMap()["other-flag"])
834-
_, found = flags.ToMap()["other-flag-prune"]
835-
assert.True(t, found)
836-
837-
flags = profile.GetCommandFlags("mount")
838-
assert.Equal(t, 2, len(flags.ToMap()))
839-
assert.ElementsMatch(t, []string{"1"}, flags.ToMap()["other-flag"])
840-
_, found = flags.ToMap()["other-flag-mount"]
841-
assert.True(t, found)
842-
843-
flags = profile.GetCommandFlags("copy")
844-
assert.Equal(t, 2, len(flags.ToMap()))
845-
assert.ElementsMatch(t, []string{"1"}, flags.ToMap()["other-flag"])
846-
_, found = flags.ToMap()["other-flag-copy"]
847-
assert.True(t, found)
872+
commands := []string{
873+
"backup",
874+
"check",
875+
"copy",
876+
"dump",
877+
"find",
878+
"forget",
879+
"ls",
880+
"prune",
881+
"mount",
882+
"restore",
883+
"snapshots",
884+
"stats",
885+
"tag",
886+
}
887+
888+
for _, command := range commands {
889+
t.Run(command, func(t *testing.T) {
890+
flags = profile.GetCommandFlags(command)
891+
commandFlagName := "other-flag-" + command
892+
assert.Equal(t, 2, len(flags.ToMap()))
893+
assert.ElementsMatch(t, []string{"1"}, flags.ToMap()["other-flag"])
894+
_, found = flags.ToMap()[commandFlagName]
895+
assert.True(t, found, commandFlagName)
896+
})
897+
}
848898
})
849899
}
850900
}

‎constants/command.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,10 @@ const (
1111
CommandUnlock = "unlock"
1212
CommandMount = "mount"
1313
CommandCopy = "copy"
14+
CommandDump = "dump"
15+
CommandFind = "find"
16+
CommandLs = "ls"
17+
CommandRestore = "restore"
18+
CommandStats = "stats"
19+
CommandTag = "tag"
1420
)

0 commit comments

Comments
 (0)