opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-10-16 14:48:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: address PR review feedback from Emyrk

Browse Source 
- Add CreateWorkspaceForMembers RBAC test case to roles_test.go
  verifying only owner and orgAdmin can create workspaces for any owner
- Change OwnerCanListUsers test to OrgAdminCanListUsers, using an org
  admin client instead of owner (owners can do everything anyway)
- Remove unnecessary IncludeProvisionerDaemon from both test sub-tests
This commit is contained in:
Garrett Delfosse
2026-02-12 14:55:03 +00:00
parent 9699383af9
commit 75113edc1d
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coderd/rbac/roles_test.go
+10
View File
@@ -265,6 +265,16 @@ func TestRolePermissions(t *testing.T) {
false: {setOtherOrg, memberMe, userAdmin, templateAdmin, orgTemplateAdmin, orgUserAdmin, orgAuditor, orgAdminBanWorkspace},
},
},
{
Name: "CreateWorkspaceForMembers",
// When creating the WithID won't be set, but it does not change the result.
Actions: []policy.Action{policy.ActionCreate},
Resource: rbac.ResourceWorkspace.InOrg(orgID).WithOwner(policy.WildcardSymbol),
AuthorizeMap: map[bool][]hasAuthSubjects{
true: {owner, orgAdmin},
false: {setOtherOrg, orgUserAdmin, orgAuditor, memberMe, userAdmin, templateAdmin, orgTemplateAdmin},
},
},
{
Name: "MyWorkspaceInOrgExecution",
// When creating the WithID won't be set, but it does not change the result.
coderd/workspaces_test.go
+8 -7
View File
@@ -5623,21 +5623,22 @@ func TestWorkspaceSharingDisabled(t *testing.T) {
func TestWorkspaceAvailableUsers(t *testing.T) {
t.Parallel()
t.Run("OwnerCanListUsers", func(t *testing.T) {
t.Run("OrgAdminCanListUsers", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
client := coderdtest.New(t, nil)
owner := coderdtest.CreateFirstUser(t, client)
ctx := testutil.Context(t, testutil.WaitMedium)
// Create additional users
// Create an org admin and additional users
orgAdminClient, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.ScopedRoleOrgAdmin(owner.OrganizationID))
_, user1 := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
_, user2 := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
// Owner should be able to list available users
users, err := client.WorkspaceAvailableUsers(ctx, owner.OrganizationID, "me")
// Org admin should be able to list available users
users, err := orgAdminClient.WorkspaceAvailableUsers(ctx, owner.OrganizationID, "me")
require.NoError(t, err)
require.GreaterOrEqual(t, len(users), 3) // owner + 2 users
require.GreaterOrEqual(t, len(users), 4) // owner + orgAdmin + 2 users
// Verify the users we created are in the list
usernames := make([]string, 0, len(users))
@@ -5650,7 +5651,7 @@ func TestWorkspaceAvailableUsers(t *testing.T) {
t.Run("MemberCannotListUsers", func(t *testing.T) {
t.Parallel()
client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
client := coderdtest.New(t, nil)
owner := coderdtest.CreateFirstUser(t, client)
ctx := testutil.Context(t, testutil.WaitMedium)