gered/vault-sidekick
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #49 from krazik/master

Browse source 
fix for kubernetes-vault method being unset
This commit is contained in:
Rohith Jayawardene 2017-08-24 00:02:12 +01:00 committed by GitHub
parent 12208bcad4 e3470ec706
commit 6f9107baa0
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main.go
View file

@ -28,7 +28,7 @@ import (
var ( var (
prog = "vault-sidekick" prog = "vault-sidekick"
release = "v0.3.2" release = "v0.3.3"
gitsha = "" gitsha = ""
) )

9
utils.go
View file

@ -103,13 +103,12 @@ func readJSONFile(filename, format string) (*vaultAuthOptions, error) {
if err != nil && format == "default" { if err != nil && format == "default" {
return nil, err return nil, err
} }
if err != nil && format == "kubernetes-vault" { if err != nil {
if opts.ClientToken != "" { return nil, err
}
if format == "kubernetes-vault" && opts.ClientToken != "" {
opts.Method = "token" opts.Method = "token"
opts.Token = opts.ClientToken opts.Token = opts.ClientToken
return opts, nil
}
return nil, err
} }
return opts, nil return opts, nil