Skip to content

Commit 1b998d0

Browse files
committed
fixup unit test listing roles
1 parent 36d9f5d commit 1b998d0

File tree

3 files changed

+22
-17
lines changed

3 files changed

+22
-17
lines changed

coderd/rbac/roles_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -951,6 +951,7 @@ func TestListRoles(t *testing.T) {
951951
fmt.Sprintf("organization-auditor:%s", orgID.String()),
952952
fmt.Sprintf("organization-user-admin:%s", orgID.String()),
953953
fmt.Sprintf("organization-template-admin:%s", orgID.String()),
954+
fmt.Sprintf("organization-workspace-creation-ban:%s", orgID.String()),
954955
},
955956
orgRoleNames)
956957
}

codersdk/rbacroles.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ const (
88
RoleUserAdmin string = "user-admin"
99
RoleAuditor string = "auditor"
1010

11-
RoleOrganizationAdmin string = "organization-admin"
12-
RoleOrganizationMember string = "organization-member"
13-
RoleOrganizationAuditor string = "organization-auditor"
14-
RoleOrganizationTemplateAdmin string = "organization-template-admin"
15-
RoleOrganizationUserAdmin string = "organization-user-admin"
11+
RoleOrganizationAdmin string = "organization-admin"
12+
RoleOrganizationMember string = "organization-member"
13+
RoleOrganizationAuditor string = "organization-auditor"
14+
RoleOrganizationTemplateAdmin string = "organization-template-admin"
15+
RoleOrganizationUserAdmin string = "organization-user-admin"
16+
RoleOrganizationWorkspaceCreationBan string = "organization-workspace-creation-ban"
1617
)

enterprise/coderd/roles_test.go

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -441,10 +441,11 @@ func TestListRoles(t *testing.T) {
441441
return member.ListOrganizationRoles(ctx, owner.OrganizationID)
442442
},
443443
ExpectedRoles: convertRoles(map[rbac.RoleIdentifier]bool{
444-
{Name: codersdk.RoleOrganizationAdmin, OrganizationID: owner.OrganizationID}: false,
445-
{Name: codersdk.RoleOrganizationAuditor, OrganizationID: owner.OrganizationID}: false,
446-
{Name: codersdk.RoleOrganizationTemplateAdmin, OrganizationID: owner.OrganizationID}: false,
447-
{Name: codersdk.RoleOrganizationUserAdmin, OrganizationID: owner.OrganizationID}: false,
444+
{Name: codersdk.RoleOrganizationAdmin, OrganizationID: owner.OrganizationID}: false,
445+
{Name: codersdk.RoleOrganizationAuditor, OrganizationID: owner.OrganizationID}: false,
446+
{Name: codersdk.RoleOrganizationTemplateAdmin, OrganizationID: owner.OrganizationID}: false,
447+
{Name: codersdk.RoleOrganizationUserAdmin, OrganizationID: owner.OrganizationID}: false,
448+
{Name: codersdk.RoleOrganizationWorkspaceCreationBan, OrganizationID: owner.OrganizationID}: false,
448449
}),
449450
},
450451
{
@@ -473,10 +474,11 @@ func TestListRoles(t *testing.T) {
473474
return orgAdmin.ListOrganizationRoles(ctx, owner.OrganizationID)
474475
},
475476
ExpectedRoles: convertRoles(map[rbac.RoleIdentifier]bool{
476-
{Name: codersdk.RoleOrganizationAdmin, OrganizationID: owner.OrganizationID}: true,
477-
{Name: codersdk.RoleOrganizationAuditor, OrganizationID: owner.OrganizationID}: true,
478-
{Name: codersdk.RoleOrganizationTemplateAdmin, OrganizationID: owner.OrganizationID}: true,
479-
{Name: codersdk.RoleOrganizationUserAdmin, OrganizationID: owner.OrganizationID}: true,
477+
{Name: codersdk.RoleOrganizationAdmin, OrganizationID: owner.OrganizationID}: true,
478+
{Name: codersdk.RoleOrganizationAuditor, OrganizationID: owner.OrganizationID}: true,
479+
{Name: codersdk.RoleOrganizationTemplateAdmin, OrganizationID: owner.OrganizationID}: true,
480+
{Name: codersdk.RoleOrganizationUserAdmin, OrganizationID: owner.OrganizationID}: true,
481+
{Name: codersdk.RoleOrganizationWorkspaceCreationBan, OrganizationID: owner.OrganizationID}: true,
480482
}),
481483
},
482484
{
@@ -505,10 +507,11 @@ func TestListRoles(t *testing.T) {
505507
return client.ListOrganizationRoles(ctx, owner.OrganizationID)
506508
},
507509
ExpectedRoles: convertRoles(map[rbac.RoleIdentifier]bool{
508-
{Name: codersdk.RoleOrganizationAdmin, OrganizationID: owner.OrganizationID}: true,
509-
{Name: codersdk.RoleOrganizationAuditor, OrganizationID: owner.OrganizationID}: true,
510-
{Name: codersdk.RoleOrganizationTemplateAdmin, OrganizationID: owner.OrganizationID}: true,
511-
{Name: codersdk.RoleOrganizationUserAdmin, OrganizationID: owner.OrganizationID}: true,
510+
{Name: codersdk.RoleOrganizationAdmin, OrganizationID: owner.OrganizationID}: true,
511+
{Name: codersdk.RoleOrganizationAuditor, OrganizationID: owner.OrganizationID}: true,
512+
{Name: codersdk.RoleOrganizationTemplateAdmin, OrganizationID: owner.OrganizationID}: true,
513+
{Name: codersdk.RoleOrganizationUserAdmin, OrganizationID: owner.OrganizationID}: true,
514+
{Name: codersdk.RoleOrganizationWorkspaceCreationBan, OrganizationID: owner.OrganizationID}: true,
512515
}),
513516
},
514517
}

0 commit comments

Comments
 (0)