luxolus/open-vault
2
0
Fork 0
Code Issues 1 Pull requests Releases Activity

Explicitly check for blank leases in AWS, and give a better error message if lease_max cannot be parsed. Fixes #569.

Browse source
This commit is contained in:
Jeff Mitchell 2015-08-26 09:04:47 -07:00
parent 8669a87fdd
commit 2d8bfff02b
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
builtin/logical/aws/path_config_lease.go
View file

@ -24,7 +24,7 @@ func pathConfigLease(b *backend) *framework.Path {
},
Callbacks: map[logical.Operation]framework.OperationFunc{
logical.ReadOperation: b.pathLeaseRead,
logical.ReadOperation: b.pathLeaseRead,
logical.WriteOperation: b.pathLeaseWrite,
},
@ -56,6 +56,13 @@ func (b *backend) pathLeaseWrite(
leaseRaw := d.Get("lease").(string)
leaseMaxRaw := d.Get("lease_max").(string)
if len(leaseRaw) == 0 {
return logical.ErrorResponse("'lease' is a required parameter"), nil
}
if len(leaseMaxRaw) == 0 {
return logical.ErrorResponse("'lease_max' is a required parameter"), nil
}
lease, err := time.ParseDuration(leaseRaw)
if err != nil {
return logical.ErrorResponse(fmt.Sprintf(
@ -64,7 +71,7 @@ func (b *backend) pathLeaseWrite(
leaseMax, err := time.ParseDuration(leaseMaxRaw)
if err != nil {
return logical.ErrorResponse(fmt.Sprintf(
"Invalid lease: %s", err)), nil
"Invalid lease_max: %s", err)), nil
}
// Store it