From 2d0cde4ccc0323591d9414342cb15f5cb70271d7 Mon Sep 17 00:00:00 2001
From: Armon Dadgar <armon.dadgar@gmail.com>
Date: Thu, 18 Jun 2015 15:37:08 -0700
Subject: [PATCH] vault: improve lease error message. Fixes #338

---
 vault/expiration.go          | 2 +-
 vault/expiration_test.go     | 2 +-
 vault/logical_system_test.go | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/vault/expiration.go b/vault/expiration.go
index 294624d6e0..3df1738ed2 100644
--- a/vault/expiration.go
+++ b/vault/expiration.go
@@ -635,7 +635,7 @@ func (l *leaseEntry) encode() ([]byte, error) {
 func (le *leaseEntry) renewable() error {
 	// If there is no entry, cannot review
 	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
diff --git a/vault/expiration_test.go b/vault/expiration_test.go
index f7b581be25..0fc4484bd8 100644
--- a/vault/expiration_test.go
+++ b/vault/expiration_test.go
@@ -152,7 +152,7 @@ func TestExpiration_RegisterAuth_NoLease(t *testing.T) {
 
 	// Should not be able to renew, no expiration
 	_, 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)
 	}
 
diff --git a/vault/logical_system_test.go b/vault/logical_system_test.go
index fd23f59aa4..33749ae14f 100644
--- a/vault/logical_system_test.go
+++ b/vault/logical_system_test.go
@@ -202,7 +202,7 @@ func TestSystemBackend_renew_invalidID(t *testing.T) {
 	if err != logical.ErrInvalidRequest {
 		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)
 	}
 }
@@ -250,7 +250,7 @@ func TestSystemBackend_revoke(t *testing.T) {
 	if err != logical.ErrInvalidRequest {
 		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)
 	}
 }
@@ -312,7 +312,7 @@ func TestSystemBackend_revokePrefix(t *testing.T) {
 	if err != logical.ErrInvalidRequest {
 		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)
 	}
 }