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

Fix the misplaced response warning

Browse source
This commit is contained in:
vishalnayak 2016-09-28 14:20:03 -04:00
parent a2338f5970
commit 9eabf75f5f
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
builtin/credential/approle/path_role.go
View file

@ -901,9 +901,15 @@ func (b *backend) secretIDCommon(s logical.Storage, entryIndex, secretIDHMAC str
d["expiration_time"] = result.ExpirationTime.Format(time.RFC3339Nano)
d["last_updated_time"] = result.LastUpdatedTime.Format(time.RFC3339Nano)
return &logical.Response{
resp := &logical.Response{
Data: d,
}, nil
}
if _, ok := d["SecretIDNumUses"]; ok {
resp.AddWarning("The field SecretIDNumUses is deprecated and will be removed in a future release")
}
return resp, nil
}
func (b *backend) pathRoleSecretIDSecretIDDelete(req *logical.Request, data *framework.FieldData) (*logical.Response, error) {
@ -1767,16 +1773,12 @@ func (b *backend) handleRoleSecretIDCommon(req *logical.Request, data *framework
return nil, fmt.Errorf("failed to store SecretID: %s", err)
}
resp := &logical.Response{
return &logical.Response{
Data: map[string]interface{}{
"secret_id": secretID,
"secret_id_accessor": secretIDStorage.SecretIDAccessor,
},
}
resp.AddWarning("The field SecretIDNumUses is deprecated and will be removed in a future release")
return resp, nil
}, nil
}
// roleIDLock is used to get a lock from the pre-initialized map