Change credential_types output to credential_type

Fixes #5972
hashicorp · Dec 18, 2018 · 9532ac3 · 9532ac3
1 parent fb35119
commit 9532ac3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)
 
 SECURITY:

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