From cc6b4dae70ac66f5b05c1912a95b2e13667f573c Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Wed, 23 Jan 2019 08:03:11 -0500 Subject: [PATCH] server/vault: tweak error messages Closes #5139 --- nomad/vault.go | 5 +++-- nomad/vault_test.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nomad/vault.go b/nomad/vault.go index ebf4bced284d..add44d9c3ec6 100644 --- a/nomad/vault.go +++ b/nomad/vault.go @@ -438,7 +438,7 @@ OUTER: retryTimer.Reset(v.config.ConnectionRetryIntv) v.l.Lock() v.connEstablished = true - v.connEstablishedErr = fmt.Errorf("Nomad Server failed to establish connections to Vault: %v", err) + v.connEstablishedErr = fmt.Errorf("failed to establish connection to Vault: %v", err) v.l.Unlock() continue OUTER } @@ -517,7 +517,8 @@ func (v *vaultClient) renewalLoop() { if backoff < 0 { // We have failed to renew the token past its expiration. Stop // renewing with Vault. - v.logger.Error("failed to renew Vault token before lease expiration. Shutting down Vault client") + v.logger.Error("failed to renew Vault token before lease expiration. Shutting down Vault client", + "error", err) v.l.Lock() v.connEstablished = false v.connEstablishedErr = err diff --git a/nomad/vault_test.go b/nomad/vault_test.go index 089efca3e8db..0e977c5408fd 100644 --- a/nomad/vault_test.go +++ b/nomad/vault_test.go @@ -1119,7 +1119,7 @@ func TestVaultClient_CreateToken_Role_InvalidToken(t *testing.T) { task.Vault = &structs.Vault{Policies: []string{"default"}} _, err = client.CreateToken(context.Background(), a, task.Name) - if err == nil || !strings.Contains(err.Error(), "Nomad Server failed to establish connections to Vault") { + if err == nil || !strings.Contains(err.Error(), "failed to establish connection to Vault") { t.Fatalf("CreateToken should have failed: %v", err) } }