Skip to content

chore: implement deleting custom roles #14101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Aug 7, 2024
Merged

chore: implement deleting custom roles #14101

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6a140af
chore: implement deleting custom roles
Emyrk Aug 1, 2024
cff829b
add trigger to delete role from organization members on delete
Emyrk Aug 6, 2024
19ca988
update dbauthz test
Emyrk Aug 6, 2024
9063675
add to unit test
Emyrk Aug 6, 2024
6b0ac00
add pg comment
Emyrk Aug 6, 2024
817bb4b
typo
Emyrk Aug 6, 2024
5033ee8
add unit test for site wide custom role deletE
Emyrk Aug 7, 2024
3b9790a
chore: add comments to explain populated field
Emyrk Aug 7, 2024
e8f57fe
bump migration
Emyrk Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add to unit test
  • Loading branch information
@Emyrk
Emyrk committed Aug 7, 2024
commit 9063675f50bdd312f8637289956c5aca4e5744f9
3 changes: 0 additions & 3 deletions enterprise/coderd/roles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,6 @@ func (api *API) patchOrgRoles(rw http.ResponseWriter, r *http.Request) {
}

// deleteOrgRole will remove a custom role from an organization
// TODO: Deleting a custom role will remove permissions from any existing user
// with the role assigned. TBD if we want to also remove the roles from the
// user, or request the admin remove all the user roles first.
//
// @Summary Delete a custom organization role
// @ID delete-a-custom-organization-role
Expand Down
17 changes: 13 additions & 4 deletions enterprise/coderd/roles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,10 +403,10 @@ func TestCustomOrganizationRole(t *testing.T) {
coderdtest.CreateAnotherUser(t, owner, first.OrganizationID, rbac.ScopedRoleOrgTemplateAdmin(first.OrganizationID), rbac.ScopedRoleOrgAuditor(first.OrganizationID), customRoleIdentifier)

// Verify members have the custom role
members, err := orgAdmin.OrganizationMembers(ctx, first.OrganizationID)
originalMembers, err := orgAdmin.OrganizationMembers(ctx, first.OrganizationID)
require.NoError(t, err)
require.Len(t, members, 5) // 3 members + org admin + owner
for _, member := range members {
require.Len(t, originalMembers, 5) // 3 members + org admin + owner
for _, member := range originalMembers {
if member.UserID == orgAdminUser.ID || member.UserID == first.UserID {
continue
}
Expand All @@ -420,13 +420,22 @@ func TestCustomOrganizationRole(t *testing.T) {
require.NoError(t, err)

// Verify the role was removed from all members
members, err = orgAdmin.OrganizationMembers(ctx, first.OrganizationID)
members, err := orgAdmin.OrganizationMembers(ctx, first.OrganizationID)
require.NoError(t, err)
require.Len(t, members, 5) // 3 members + org admin + owner
for _, member := range members {
require.False(t, slices.ContainsFunc(member.Roles, func(role codersdk.SlimRole) bool {
return role.Name == customRoleIdentifier.Name
}), "role should be removed from all users")

// Verify the rest of the member's roles are unchanged
original := originalMembers[slices.IndexFunc(originalMembers, func(haystack codersdk.OrganizationMemberWithUserData) bool {
return haystack.UserID == member.UserID
})]
originalWithoutCustom := slices.DeleteFunc(original.Roles, func(role codersdk.SlimRole) bool {
return role.Name == customRoleIdentifier.Name
})
require.ElementsMatch(t, originalWithoutCustom, member.Roles, "original roles are unchanged")
}
})
}
Expand Down