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

Change credential_types output to credential_type (#5975) 

Fixes #5972
This commit is contained in:
Jeff Mitchell 2019-01-04 14:49:53 -05:00 committed by GitHub
parent 347d481930
commit e11c7966fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -1,3 +1,11 @@
## 1.0.2 (Unreleased)
CHANGES:
* secret/aws: Role now returns `credential_type` instead of `credential_types`
to match role input. If a legacy role that can supply more than one
credential type, they will be concatenated with a `,`.
## 1.0.1 (December 14th, 2018) ## 1.0.1 (December 14th, 2018)
SECURITY: SECURITY:

12
builtin/logical/aws/path_roles.go
View File

@ -429,12 +429,12 @@ type awsRoleEntry struct {
func (r *awsRoleEntry) toResponseData() map[string]interface{} { func (r *awsRoleEntry) toResponseData() map[string]interface{} {
respData := map[string]interface{}{ respData := map[string]interface{}{
"credential_types": r.CredentialTypes, "credential_type": strings.Join(r.CredentialTypes, ","),
"policy_arns": r.PolicyArns, "policy_arns": r.PolicyArns,
"role_arns": r.RoleArns, "role_arns": r.RoleArns,
"policy_document": r.PolicyDocument, "policy_document": r.PolicyDocument,
"default_sts_ttl": int64(r.DefaultSTSTTL.Seconds()), "default_sts_ttl": int64(r.DefaultSTSTTL.Seconds()),
"max_sts_ttl": int64(r.MaxSTSTTL.Seconds()), "max_sts_ttl": int64(r.MaxSTSTTL.Seconds()),
} }
if r.InvalidData != "" { if r.InvalidData != "" {
respData["invalid_data"] = r.InvalidData respData["invalid_data"] = r.InvalidData