Add num_member_entities and num_parent_groups to key_info in group li…

…sting (#4648)
hashicorp · May 29, 2018 · 5829f7e · 5829f7e
1 parent 5f8a476
commit 5829f7e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/vault/identity_store_groups.go b/vault/identity_store_groups.go
@@ -278,6 +278,7 @@ func (i *IdentityStore) handleGroupReadCommon(group *identity.Group) (*logical.R
 	respData["name"] = group.Name
 	respData["policies"] = group.Policies
 	respData["member_entity_ids"] = group.MemberEntityIDs
+	respData["parent_group_ids"] = group.ParentGroupIDs
 	respData["metadata"] = group.Metadata
 	respData["creation_time"] = ptypes.TimestampString(group.CreationTime)
 	respData["last_update_time"] = ptypes.TimestampString(group.LastUpdateTime)
@@ -347,7 +348,9 @@ func (i *IdentityStore) pathGroupIDList() framework.OperationFunc {
 			group := raw.(*identity.Group)
 			groupIDs = append(groupIDs, group.ID)
 			groupInfoEntry := map[string]interface{}{
-				"name": group.Name,
+				"name":                group.Name,
+				"num_member_entities": len(group.MemberEntityIDs),
+				"num_parent_groups":   len(group.ParentGroupIDs),
 			}
 			if group.Alias != nil {
 				entry := map[string]interface{}{

diff --git a/vault/identity_store_groups_test.go b/vault/identity_store_groups_test.go
@@ -6,6 +6,7 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/go-test/deep"
 	"github.com/hashicorp/vault/helper/identity"
 	"github.com/hashicorp/vault/logical"
 )
@@ -290,6 +291,7 @@ func TestIdentityStore_GroupsCreateUpdate(t *testing.T) {
 			"testkey1": "testvalue1",
 			"testkey2": "testvalue2",
 		},
+		"parent_group_ids": []string(nil),
 	}
 	expectedData["id"] = resp.Data["id"]
 	expectedData["type"] = resp.Data["type"]
@@ -301,8 +303,8 @@ func TestIdentityStore_GroupsCreateUpdate(t *testing.T) {
 	expectedData["modify_index"] = resp.Data["modify_index"]
 	expectedData["alias"] = resp.Data["alias"]
 
-	if !reflect.DeepEqual(expectedData, resp.Data) {
-		t.Fatalf("bad: group data;\nexpected: %#v\n actual: %#v\n", expectedData, resp.Data)
+	if diff := deep.Equal(expectedData, resp.Data); diff != nil {
+		t.Fatal(diff)
 	}
 
 	// Update the policies and metadata in the group
@@ -410,6 +412,7 @@ func TestIdentityStore_GroupsCRUD_ByID(t *testing.T) {
 			"testkey1": "testvalue1",
 			"testkey2": "testvalue2",
 		},
+		"parent_group_ids": []string(nil),
 	}
 	expectedData["id"] = resp.Data["id"]
 	expectedData["type"] = resp.Data["type"]
@@ -421,8 +424,8 @@ func TestIdentityStore_GroupsCRUD_ByID(t *testing.T) {
 	expectedData["modify_index"] = resp.Data["modify_index"]
 	expectedData["alias"] = resp.Data["alias"]
 
-	if !reflect.DeepEqual(expectedData, resp.Data) {
-		t.Fatalf("bad: group data;\nexpected: %#v\n actual: %#v\n", expectedData, resp.Data)
+	if diff := deep.Equal(expectedData, resp.Data); diff != nil {
+		t.Fatal(diff)
 	}
 
 	// Update the policies and metadata in the group