fixup! Handle missing env variables

hairyhenderson · Nov 22, 2016 · b826f5e · b826f5e
1 parent 3e775e9
commit b826f5e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/vault/client.go b/vault/client.go
@@ -59,6 +59,7 @@ func getAuthStrategy() AuthStrategy {
 	if auth := NewTokenAuthStrategy(); auth != nil {
 		return auth
 	}
+	logFatal("No vault auth strategy configured")
 	return nil
 }
 
@@ -89,10 +90,6 @@ func (c *Client) Do(req *http.Request) (*http.Response, error) {
 
 // Login - log in to Vault with the discovered auth backend and save the token
 func (c *Client) Login() error {
-	if c.Auth == nil {
-		logFatal("No vault auth strategy configured")
-		return nil
-	}
 	token, err := c.Auth.GetToken(c.Addr)
 	if err != nil {
 		logFatal(err)

diff --git a/vault/client_test.go b/vault/client_test.go
@@ -39,9 +39,7 @@ func TestLogin_NoAuthStrategy(t *testing.T) {
 	os.Setenv("HOME", "/tmp")
 	defer restoreLogFatal()
 	setupMockLogFatal()
-	c := NewClient()
-	assert.Nil(t, c.Auth)
-	c.Login()
+	_ = NewClient()
 	assert.Equal(t, "No vault auth strategy configured", spyLogFatalMsg)
 }