From 322b13ae98baf004274966a64fec7b260af95ea4 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Fri, 31 Jul 2020 17:46:04 -0400 Subject: [PATCH] Standardize static group -> group naming (#236) --- internal/iam/group.go | 2 +- internal/iam/group_test.go | 2 +- internal/perms/grants.go | 2 +- internal/perms/grants_test.go | 12 +-- internal/types/resource/resource.go | 96 ++++++++++++------------ internal/types/resource/resource_test.go | 16 ++-- 6 files changed, 63 insertions(+), 67 deletions(-) diff --git a/internal/iam/group.go b/internal/iam/group.go index eae7e9fe17..ea3fbb1a8f 100644 --- a/internal/iam/group.go +++ b/internal/iam/group.go @@ -80,7 +80,7 @@ func (g *Group) GetScope(ctx context.Context, r db.Reader) (*Scope, error) { } // ResourceType returns the type of the Group. -func (*Group) ResourceType() resource.Type { return resource.StaticGroup } +func (*Group) ResourceType() resource.Type { return resource.Group } // Actions returns the available actions for Group func (*Group) Actions() map[string]action.Type { diff --git a/internal/iam/group_test.go b/internal/iam/group_test.go index f60891fa14..0b91520584 100644 --- a/internal/iam/group_test.go +++ b/internal/iam/group_test.go @@ -438,7 +438,7 @@ func TestGroup_ResourceType(t *testing.T) { assert := assert.New(t) r := &Group{} ty := r.ResourceType() - assert.Equal(ty, resource.StaticGroup) + assert.Equal(ty, resource.Group) } func TestGroup_GetScope(t *testing.T) { diff --git a/internal/perms/grants.go b/internal/perms/grants.go index 7ab6d8db6c..9d1d55eec5 100644 --- a/internal/perms/grants.go +++ b/internal/perms/grants.go @@ -299,7 +299,7 @@ func (g Grant) validateType() error { case resource.Unknown, resource.All, resource.Role, - resource.StaticGroup, + resource.Group, resource.User, resource.AuthMethod, resource.HostCatalog, diff --git a/internal/perms/grants_test.go b/internal/perms/grants_test.go index 4e46af58fe..39188babef 100644 --- a/internal/perms/grants_test.go +++ b/internal/perms/grants_test.go @@ -160,10 +160,10 @@ func Test_MarshallingAndCloning(t *testing.T) { scope: Scope{ Type: scope.Project, }, - typ: resource.StaticGroup, + typ: resource.Group, }, - jsonOutput: `{"id":"baz","type":"static-group"}`, - canonicalString: `id=baz;type=static-group`, + jsonOutput: `{"id":"baz","type":"group"}`, + canonicalString: `id=baz;type=group`, }, { name: "everything", @@ -172,15 +172,15 @@ func Test_MarshallingAndCloning(t *testing.T) { scope: Scope{ Type: scope.Project, }, - typ: resource.StaticGroup, + typ: resource.Group, actions: map[action.Type]bool{ action.Create: true, action.Read: true, }, actionsBeingParsed: []string{"create", "read"}, }, - jsonOutput: `{"actions":["create","read"],"id":"baz","type":"static-group"}`, - canonicalString: `id=baz;type=static-group;actions=create,read`, + jsonOutput: `{"actions":["create","read"],"id":"baz","type":"group"}`, + canonicalString: `id=baz;type=group;actions=create,read`, }, } diff --git a/internal/types/resource/resource.go b/internal/types/resource/resource.go index 1a78a68570..928ce84082 100644 --- a/internal/types/resource/resource.go +++ b/internal/types/resource/resource.go @@ -4,30 +4,27 @@ package resource type Type int const ( - Unknown Type = 0 - Scope Type = 1 - User Type = 2 - StaticGroup Type = 3 - Role Type = 4 - Org Type = 5 - StaticGroupMember Type = 6 - StaticGroupUserMember Type = 7 - AssignedRole Type = 8 - AssignedUserRole Type = 9 - AssignedStaticGroupRole Type = 10 - RoleGrant Type = 11 - AuthMethod Type = 12 - Project Type = 13 - All Type = 14 - HostCatalog Type = 15 - HostSet Type = 16 - Host Type = 17 - Target Type = 18 - Global Type = 19 - - // TODO: remove this after demo - Group Type = 20 - AuthToken Type = 21 + Unknown Type = 0 + Scope Type = 1 + User Type = 2 + Group Type = 3 + Role Type = 4 + Org Type = 5 + GroupMember Type = 6 + GroupUserMember Type = 7 + AssignedRole Type = 8 + AssignedUserRole Type = 9 + AssignedGroupRole Type = 10 + RoleGrant Type = 11 + AuthMethod Type = 12 + Project Type = 13 + All Type = 14 + HostCatalog Type = 15 + HostSet Type = 16 + Host Type = 17 + Target Type = 18 + Global Type = 19 + AuthToken Type = 20 ) func (r Type) String() string { @@ -35,14 +32,14 @@ func (r Type) String() string { "unknown", "scope", "user", - "static-group", + "group", "role", "org", - "static-group-member", - "static-group-user-member", + "group-member", + "group-user-member", "assigned-role", "assigned-user-role", - "assigned-static-group-role", + "assigned-group-role", "role-grant", "auth-method", "project", @@ -52,31 +49,30 @@ func (r Type) String() string { "host", "target", "global", - "group", "auth-token", }[r] } var Map = map[string]Type{ - Scope.String(): Scope, - User.String(): User, - StaticGroup.String(): StaticGroup, - Role.String(): Role, - Org.String(): Org, - StaticGroupMember.String(): StaticGroupMember, - StaticGroupUserMember.String(): StaticGroupUserMember, - AssignedRole.String(): AssignedRole, - AssignedUserRole.String(): AssignedUserRole, - AssignedStaticGroupRole.String(): AssignedStaticGroupRole, - RoleGrant.String(): RoleGrant, - AuthMethod.String(): AuthMethod, - Project.String(): Project, - All.String(): All, - HostCatalog.String(): HostCatalog, - HostSet.String(): HostSet, - Host.String(): Host, - Target.String(): Target, - Global.String(): Global, - Group.String(): Group, - AuthToken.String(): AuthToken, + Scope.String(): Scope, + User.String(): User, + Group.String(): Group, + Role.String(): Role, + Org.String(): Org, + GroupMember.String(): GroupMember, + GroupUserMember.String(): GroupUserMember, + AssignedRole.String(): AssignedRole, + AssignedUserRole.String(): AssignedUserRole, + AssignedGroupRole.String(): AssignedGroupRole, + RoleGrant.String(): RoleGrant, + AuthMethod.String(): AuthMethod, + Project.String(): Project, + All.String(): All, + HostCatalog.String(): HostCatalog, + HostSet.String(): HostSet, + Host.String(): Host, + Target.String(): Target, + Global.String(): Global, + Group.String(): Group, + AuthToken.String(): AuthToken, } diff --git a/internal/types/resource/resource_test.go b/internal/types/resource/resource_test.go index 3402c0aed5..b820532c63 100644 --- a/internal/types/resource/resource_test.go +++ b/internal/types/resource/resource_test.go @@ -25,8 +25,8 @@ func Test_Resource(t *testing.T) { want: User, }, { - typeString: "static-group", - want: StaticGroup, + typeString: "group", + want: Group, }, { typeString: "role", @@ -37,12 +37,12 @@ func Test_Resource(t *testing.T) { want: Org, }, { - typeString: "static-group-member", - want: StaticGroupMember, + typeString: "group-member", + want: GroupMember, }, { - typeString: "static-group-user-member", - want: StaticGroupUserMember, + typeString: "group-user-member", + want: GroupUserMember, }, { typeString: "assigned-role", @@ -53,8 +53,8 @@ func Test_Resource(t *testing.T) { want: AssignedUserRole, }, { - typeString: "assigned-static-group-role", - want: AssignedStaticGroupRole, + typeString: "assigned-group-role", + want: AssignedGroupRole, }, { typeString: "role-grant",