mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-04 20:06:27 +02:00
Code Issues Projects Releases Wiki Activity

vault: allow increment to be duration string. Fixes #340

Browse Source
This commit is contained in:
Armon Dadgar 2015-06-17 15:58:20 -07:00
parent dcb45874bf
commit 81df0d6e49
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vault/logical_system.go
View File

@ -110,7 +110,7 @@ func NewSystemBackend(core *Core) logical.Backend {
Description: strings.TrimSpace(sysHelp["lease_id"][0]),
},
"increment": &framework.FieldSchema{
Type: framework.TypeInt,
Type: framework.TypeDurationSecond,
Description: strings.TrimSpace(sysHelp["increment"][0]),
},
},

2
vault/logical_system_test.go
View File

@ -181,7 +181,7 @@ func TestSystemBackend_renew(t *testing.T) {
// Attempt renew
req2 := logical.TestRequest(t, logical.WriteOperation, "renew/"+resp.Secret.LeaseID)
req2.Data["increment"] = 100
req2.Data["increment"] = "100s"
resp2, err := b.HandleRequest(req2)
if err != logical.ErrInvalidRequest {
t.Fatalf("err: %v", err)

2
vault/token_store.go
View File

@ -211,7 +211,7 @@ func NewTokenStore(c *Core) (*TokenStore, error) {
Description: "Token to renew",
},
"increment": &framework.FieldSchema{
Type: framework.TypeInt,
Type: framework.TypeDurationSecond,
Description: "The desired increment in seconds to the token expiration",
},
},

2
vault/token_store_test.go
View File

@ -822,7 +822,7 @@ func TestTokenStore_HandleRequest_Renew(t *testing.T) {
beforeRenew := time.Now().UTC()
req := logical.TestRequest(t, logical.WriteOperation, "renew/"+root.ID)
req.Data["increment"] = "3600"
req.Data["increment"] = "3600s"
resp, err := ts.HandleRequest(req)
if err != nil {
t.Fatalf("err: %v %v", err, resp)