Skip to content

feat: add endpoint for retrieving workspace acl #19375

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
Emyrk merged 12 commits into from
Aug 25, 2025
Merged

feat: add endpoint for retrieving workspace acl #19375

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b15bace
feat: add endpoint for retrieving workspace acl
aslilac Aug 15, 2025
60d81d1
finished implementation
aslilac Aug 15, 2025
f8ac700
🧹
aslilac Aug 15, 2025
21da925
😬
aslilac Aug 15, 2025
08cac65
oops
aslilac Aug 15, 2025
1764225
actually return the error
aslilac Aug 15, 2025
109861a
more tests and cleanup
aslilac Aug 15, 2025
7460cbc
pedantry
aslilac Aug 15, 2025
344ef54
Merge branch 'main' into lilac/get-workspace-acl
aslilac Aug 22, 2025
365f616
use codersdk.MinimalUser instead
aslilac Aug 22, 2025
ed1054e
update dbauthz tests
aslilac Aug 22, 2025
36d5b1c
make gen
aslilac Aug 22, 2025
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
more tests and cleanup
  • Loading branch information
@aslilac
aslilac committed Aug 15, 2025
commit 109861a63bb3efd2f6fb0576dbbc5b4e257d4496
20 changes: 16 additions & 4 deletions coderd/workspaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2148,7 +2148,7 @@
workspace = httpmw.WorkspaceParam(r)
)

// Fetch the ACL data
// Fetch the ACL data.
workspaceACL, err := api.Database.GetWorkspaceACLByID(ctx, workspace.ID)
if err != nil {
httpapi.InternalServerError(rw, err)
Expand All @@ -2167,7 +2167,12 @@
// Fetch all of the users and their organization memberships
userIDs := make([]uuid.UUID, 0, len(workspaceACL.Users))
for userID := range workspaceACL.Users {
userIDs = append(userIDs, uuid.MustParse(userID))
id, err := uuid.Parse(userID)
if err != nil {
api.Logger.Warn(ctx, "found invalid user uuid in workspace acl", slog.Error(err), slog.F("workspace", workspace.ID))

Check failure on line 2172 in coderd/workspaces.go

View workflow job for this annotation

GitHub Actions / lint 

ruleguard: uuid.UUID field "workspace" must have "_id" suffix. (gocritic)
continue
}
userIDs = append(userIDs, id)
}
// For context see https://github.com/coder/coder/pull/19375
// nolint:gocritic
Expand Down Expand Up @@ -2201,9 +2206,16 @@
// Fetch all of the groups
groupIDs := make([]uuid.UUID, 0, len(workspaceACL.Groups))
for groupID := range workspaceACL.Groups {
groupIDs = append(groupIDs, uuid.MustParse(groupID))
id, err := uuid.Parse(groupID)
if err != nil {
api.Logger.Warn(ctx, "found invalid group uuid in workspace acl", slog.Error(err), slog.F("workspace", workspace.ID))

Check failure on line 2211 in coderd/workspaces.go

View workflow job for this annotation

GitHub Actions / lint 

ruleguard: uuid.UUID field "workspace" must have "_id" suffix. (gocritic)
continue
}
groupIDs = append(groupIDs, id)
}
dbGroups, err := api.Database.GetGroups(ctx, database.GetGroupsParams{GroupIds: groupIDs})
// For context see https://github.com/coder/coder/pull/19375
// nolint:gocritic
dbGroups, err := api.Database.GetGroups(dbauthz.AsSystemRestricted(ctx), database.GetGroupsParams{GroupIds: groupIDs})
if err != nil && !xerrors.Is(err, sql.ErrNoRows) {
httpapi.InternalServerError(rw, err)
return
Expand Down
11 changes: 10 additions & 1 deletion enterprise/coderd/workspaces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3811,13 +3811,22 @@ func TestUpdateWorkspaceACL(t *testing.T) {
ctx := testutil.Context(t, testutil.WaitMedium)
err := client.UpdateWorkspaceACL(ctx, ws.ID, codersdk.UpdateWorkspaceACL{
UserRoles: map[string]codersdk.WorkspaceRole{
friend.ID.String(): codersdk.WorkspaceRoleAdmin,
friend.ID.String(): codersdk.WorkspaceRoleUse,
},
GroupRoles: map[string]codersdk.WorkspaceRole{
group.ID.String(): codersdk.WorkspaceRoleAdmin,
},
})
require.NoError(t, err)

workspaceACL, err := client.WorkspaceACL(ctx, ws.ID)
require.NoError(t, err)
require.Len(t, workspaceACL.Users, 1)
require.Equal(t, workspaceACL.Users[0].ID, friend.ID)
require.Equal(t, workspaceACL.Users[0].Role, codersdk.WorkspaceRoleUse)
require.Len(t, workspaceACL.Groups, 1)
require.Equal(t, workspaceACL.Groups[0].ID, group.ID)
require.Equal(t, workspaceACL.Groups[0].Role, codersdk.WorkspaceRoleAdmin)
})

t.Run("UnknownIDs", func(t *testing.T) {
Expand Down
Loading