diff options
Diffstat (limited to 'cli/tolerant_pflag.go')
-rw-r--r-- | cli/tolerant_pflag.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cli/tolerant_pflag.go b/cli/tolerant_pflag.go index b77939c..e9a1423 100644 --- a/cli/tolerant_pflag.go +++ b/cli/tolerant_pflag.go | |||
@@ -10,7 +10,7 @@ import ( | |||
10 | ) | 10 | ) |
11 | 11 | ||
12 | type VaultCredential struct { | 12 | type VaultCredential struct { |
13 | Username, Password string | 13 | Path, Username, Password string |
14 | } | 14 | } |
15 | 15 | ||
16 | type TolerantPflagSet struct { | 16 | type TolerantPflagSet struct { |
@@ -43,17 +43,19 @@ func (f *TolerantPflagSet) MayGetStringSlice(n string) []string { | |||
43 | } | 43 | } |
44 | 44 | ||
45 | func (f *TolerantPflagSet) MayGetVaultCredential(n string) VaultCredential { | 45 | func (f *TolerantPflagSet) MayGetVaultCredential(n string) VaultCredential { |
46 | vk, err := vault.GetVaultKey(f.MayGetString(n)) | 46 | p := f.MayGetString(n) |
47 | vk, err := vault.GetVaultKey(p) | ||
47 | if err != nil { | 48 | if err != nil { |
48 | return VaultCredential{} | 49 | return VaultCredential{} |
49 | } | 50 | } |
50 | return VaultCredential{vk.Username, vk.Password} | 51 | return VaultCredential{p, vk.Username, vk.Password} |
51 | } | 52 | } |
52 | 53 | ||
53 | func (f *TolerantPflagSet) MustGetVaultCredential(n string) VaultCredential { | 54 | func (f *TolerantPflagSet) MustGetVaultCredential(n string) VaultCredential { |
54 | vk, err := vault.GetVaultKey(f.MayGetString(n)) | 55 | p := f.MayGetString(n) |
56 | vk, err := vault.GetVaultKey(p) | ||
55 | if err != nil { | 57 | if err != nil { |
56 | log.Fatalf("Error getting %s from vault: %w", n, err) | 58 | log.Fatalf("Error getting %s from vault: %w", n, err) |
57 | } | 59 | } |
58 | return VaultCredential{vk.Username, vk.Password} | 60 | return VaultCredential{p, vk.Username, vk.Password} |
59 | } | 61 | } |