From 7959d40576e68c87caf50d9276aa9c666b4ff938 Mon Sep 17 00:00:00 2001 From: Rylan Hazelton Date: Wed, 16 Aug 2017 17:34:33 -0700 Subject: [PATCH 1/3] fix for kubernetes-vault --- utils.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/utils.go b/utils.go index 3b57c1e..91b7cc2 100644 --- a/utils.go +++ b/utils.go @@ -103,14 +103,13 @@ func readJSONFile(filename, format string) (*vaultAuthOptions, error) { if err != nil && format == "default" { return nil, err } - if err != nil && format == "kubernetes-vault" { - if opts.ClientToken != "" { - opts.Method = "token" - opts.Token = opts.ClientToken - return opts, nil - } + if (err != nil) { return nil, err } + if format == "kubernetes-vault" && opts.ClientToken != "" { + opts.Method = "token" + opts.Token = opts.ClientToken + } return opts, nil } From 8ef990361c3327b545d7d6c707e167c1b8b6f70c Mon Sep 17 00:00:00 2001 From: Rylan Hazelton Date: Wed, 16 Aug 2017 17:37:29 -0700 Subject: [PATCH 2/3] increment version --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 8a9065b..a8217cf 100644 --- a/main.go +++ b/main.go @@ -28,7 +28,7 @@ import ( var ( prog = "vault-sidekick" - release = "v0.3.2" + release = "v0.3.3" gitsha = "" ) From e3470ec706a8c28aacb5e7fed5176ab4796a76d2 Mon Sep 17 00:00:00 2001 From: Rylan Hazelton Date: Wed, 16 Aug 2017 17:40:11 -0700 Subject: [PATCH 3/3] fix formatting --- utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils.go b/utils.go index 91b7cc2..91a4736 100644 --- a/utils.go +++ b/utils.go @@ -103,7 +103,7 @@ func readJSONFile(filename, format string) (*vaultAuthOptions, error) { if err != nil && format == "default" { return nil, err } - if (err != nil) { + if err != nil { return nil, err } if format == "kubernetes-vault" && opts.ClientToken != "" {