mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
feat(coderd/rbac): make organization-member a per-org system custom role (#21359)
Migrated the built-in organization-member role to DB storage so it can be customized per org. Closes https://github.com/coder/internal/issues/1073 (part 1)
This commit is contained in:
@@ -221,7 +221,7 @@ func TestSharingStatus(t *testing.T) {
|
||||
group, err := createGroupWithMembers(ctx, client, orgOwner.OrganizationID, "new-group", []uuid.UUID{orgMember.ID})
|
||||
require.NoError(t, err)
|
||||
|
||||
err = client.UpdateWorkspaceACL(ctx, workspace.ID, codersdk.UpdateWorkspaceACL{
|
||||
err = workspaceOwnerClient.UpdateWorkspaceACL(ctx, workspace.ID, codersdk.UpdateWorkspaceACL{
|
||||
GroupRoles: map[string]codersdk.WorkspaceRole{
|
||||
group.ID.String(): codersdk.WorkspaceRoleUse,
|
||||
},
|
||||
@@ -284,7 +284,7 @@ func TestSharingRemove(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
|
||||
// Share the workspace with a user to later remove
|
||||
err = client.UpdateWorkspaceACL(ctx, workspace.ID, codersdk.UpdateWorkspaceACL{
|
||||
err = workspaceOwnerClient.UpdateWorkspaceACL(ctx, workspace.ID, codersdk.UpdateWorkspaceACL{
|
||||
GroupRoles: map[string]codersdk.WorkspaceRole{
|
||||
group1.ID.String(): codersdk.WorkspaceRoleUse,
|
||||
group2.ID.String(): codersdk.WorkspaceRoleUse,
|
||||
@@ -357,7 +357,7 @@ func TestSharingRemove(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
|
||||
// Share the workspace with a user to later remove
|
||||
err = client.UpdateWorkspaceACL(ctx, workspace.ID, codersdk.UpdateWorkspaceACL{
|
||||
err = workspaceOwnerClient.UpdateWorkspaceACL(ctx, workspace.ID, codersdk.UpdateWorkspaceACL{
|
||||
GroupRoles: map[string]codersdk.WorkspaceRole{
|
||||
group1.ID.String(): codersdk.WorkspaceRoleUse,
|
||||
group2.ID.String(): codersdk.WorkspaceRoleUse,
|
||||
|
||||
Reference in New Issue
Block a user