Skip to content

feat: Add template-admin + user-admin role for managing templates + users #3490

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 11 commits into from
Aug 12, 2022
Merged

feat: Add template-admin + user-admin role for managing templates + users #3490

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7ce0b46
feat: Add template-manager role for managing templates site-wide
Emyrk Aug 12, 2022
e9e4a42
Fix unit tests
Emyrk Aug 12, 2022
6309ab8
Add user-admin role
Emyrk Aug 12, 2022
30338b4
Protect workspace execution
Emyrk Aug 12, 2022
99d6f50
Remove unused perm
Emyrk Aug 12, 2022
b91903e
Fix unit test
Emyrk Aug 12, 2022
21aed8a
Add provisioner daemon crud to template admin
Emyrk Aug 12, 2022
6791247
Add tooltip to user roles
Emyrk Aug 12, 2022
61df361
Make fmt
Emyrk Aug 12, 2022
beea2e0
Update coderd/rbac/builtin_test.go
Emyrk Aug 12, 2022
eb0e986
Add authorization check in /turn for users
Emyrk Aug 12, 2022
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
Update coderd/rbac/builtin_test.go 
Co-authored-by: Mathias Fredriksson <mafredri@gmail.com>
  • Loading branch information
@Emyrk @mafredri
Emyrk and mafredri authored Aug 12, 2022
commit beea2e0b49eca2bed0569d94e7d7c4fcc1a528d7
2 changes: 1 addition & 1 deletion coderd/rbac/builtin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func TestRolePermissions(t *testing.T) {
otherOrgAdmin := authSubject{Name: "org_admin_other", UserID: uuid.NewString(), Roles: []string{rbac.RoleMember(), rbac.RoleOrgMember(otherOrg), rbac.RoleOrgAdmin(otherOrg)}}

templateAdmin := authSubject{Name: "template-admin", UserID: templateAdminID.String(), Roles: []string{rbac.RoleMember(), rbac.RoleTemplateAdmin()}}
userAdmin := authSubject{Name: "template-admin", UserID: templateAdminID.String(), Roles: []string{rbac.RoleMember(), rbac.RoleUserAdmin()}}
userAdmin := authSubject{Name: "user-admin", UserID: templateAdminID.String(), Roles: []string{rbac.RoleMember(), rbac.RoleUserAdmin()}}

// requiredSubjects are required to be asserted in each test case. This is
// to make sure one is not forgotten.
Expand Down