scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-03 20:17:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

vault: improve lease error message. Fixes #338

Browse Source
This commit is contained in:
Armon Dadgar
2015-06-18 15:37:08 -07:00
parent 57c8e7cb25
commit 2d0cde4ccc
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vault/expiration.go
View File

@@ -635,7 +635,7 @@ func (l *leaseEntry) encode() ([]byte, error) {
func (le *leaseEntry) renewable() error { func (le *leaseEntry) renewable() error {
// If there is no entry, cannot review // If there is no entry, cannot review
if le == nil || le.ExpireTime.IsZero() { if le == nil || le.ExpireTime.IsZero() {
return fmt.Errorf("lease not found") return fmt.Errorf("lease not found or lease is not renewable")
} }
// Determine if the lease is expired // Determine if the lease is expired

2
vault/expiration_test.go
View File

@@ -152,7 +152,7 @@ func TestExpiration_RegisterAuth_NoLease(t *testing.T) {
// Should not be able to renew, no expiration // Should not be able to renew, no expiration
_, err = exp.RenewToken("auth/github/login", root.ID, 0) _, err = exp.RenewToken("auth/github/login", root.ID, 0)
if err.Error() != "lease not found" { if err.Error() != "lease not found or lease is not renewable" {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }

6
vault/logical_system_test.go
View File

@@ -202,7 +202,7 @@ func TestSystemBackend_renew_invalidID(t *testing.T) {
if err != logical.ErrInvalidRequest { if err != logical.ErrInvalidRequest {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
if resp.Data["error"] != "lease not found" { if resp.Data["error"] != "lease not found or lease is not renewable" {
t.Fatalf("bad: %v", resp) t.Fatalf("bad: %v", resp)
} }
} }
@@ -250,7 +250,7 @@ func TestSystemBackend_revoke(t *testing.T) {
if err != logical.ErrInvalidRequest { if err != logical.ErrInvalidRequest {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
if resp3.Data["error"] != "lease not found" { if resp3.Data["error"] != "lease not found or lease is not renewable" {
t.Fatalf("bad: %v", resp) t.Fatalf("bad: %v", resp)
} }
} }
@@ -312,7 +312,7 @@ func TestSystemBackend_revokePrefix(t *testing.T) {
if err != logical.ErrInvalidRequest { if err != logical.ErrInvalidRequest {
t.Fatalf("err: %v", err) t.Fatalf("err: %v", err)
} }
if resp3.Data["error"] != "lease not found" { if resp3.Data["error"] != "lease not found or lease is not renewable" {
t.Fatalf("bad: %v", resp) t.Fatalf("bad: %v", resp)
} }
} }