Skip to content

Commit fb546df

Browse files
committed
make gen
1 parent 52e7ea5 commit fb546df

File tree

6 files changed

+359
-110
lines changed

6 files changed

+359
-110
lines changed

coderd/apidoc/docs.go

Lines changed: 79 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/apidoc/swagger.json

Lines changed: 73 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

coderd/rbac/policy/policy.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,16 @@ var RBACPermissions = map[string]PermissionDefinition{
227227
ActionRead: actDef("view what roles are assignable"),
228228
ActionDelete: actDef("ability to unassign roles"),
229229
ActionCreate: actDef("ability to create/delete/edit custom roles"),
230+
ActionUpdate: actDef("ability to edit custom roles"),
230231
},
231232
},
232233
"assign_org_role": {
233234
Actions: map[Action]ActionDefinition{
234235
ActionAssign: actDef("ability to assign org scoped roles"),
235236
ActionRead: actDef("view what roles are assignable"),
236237
ActionDelete: actDef("ability to delete org scoped roles"),
237-
ActionCreate: actDef("ability to create/delete/edit custom roles within an organization"),
238+
ActionCreate: actDef("ability to create/delete custom roles within an organization"),
239+
ActionUpdate: actDef("ability to edit custom roles within an organization"),
238240
},
239241
},
240242
"oauth2_app": {

coderd/rbac/roles.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,10 +342,10 @@ func ReloadBuiltinRoles(opts *RoleOptions) {
342342
Identifier: RoleUserAdmin(),
343343
DisplayName: "User Admin",
344344
Site: Permissions(map[string][]policy.Action{
345-
ResourceAssignRole.Type: {policy.ActionAssign, policy.ActionDelete, policy.ActionRead},
345+
ResourceAssignRole.Type: {policy.ActionAssign, policy.ActionDelete, policy.ActionRead, policy.ActionUpdate},
346346
// Need organization assign as well to create users. At present, creating a user
347347
// will always assign them to some organization.
348-
ResourceAssignOrgRole.Type: {policy.ActionAssign, policy.ActionDelete, policy.ActionRead},
348+
ResourceAssignOrgRole.Type: {policy.ActionAssign, policy.ActionDelete, policy.ActionRead, policy.ActionUpdate},
349349
ResourceUser.Type: {
350350
policy.ActionCreate, policy.ActionRead, policy.ActionUpdate, policy.ActionDelete,
351351
policy.ActionUpdatePersonal, policy.ActionReadPersonal,
@@ -461,7 +461,7 @@ func ReloadBuiltinRoles(opts *RoleOptions) {
461461
Org: map[string][]Permission{
462462
organizationID.String(): Permissions(map[string][]policy.Action{
463463
// Assign, remove, and read roles in the organization.
464-
ResourceAssignOrgRole.Type: {policy.ActionAssign, policy.ActionDelete, policy.ActionRead},
464+
ResourceAssignOrgRole.Type: {policy.ActionAssign, policy.ActionDelete, policy.ActionRead, policy.ActionUpdate},
465465
ResourceOrganizationMember.Type: {policy.ActionCreate, policy.ActionRead, policy.ActionUpdate, policy.ActionDelete},
466466
ResourceGroup.Type: ResourceGroup.AvailableActions(),
467467
ResourceGroupMember.Type: ResourceGroupMember.AvailableActions(),

0 commit comments

Comments
 (0)