Skip to content

Commit ad88189

Browse files
committed
make gen
1 parent dcc5023 commit ad88189

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
@@ -222,14 +222,16 @@ var RBACPermissions = map[string]PermissionDefinition{
222222
ActionRead: actDef("view what roles are assignable"),
223223
ActionDelete: actDef("ability to unassign roles"),
224224
ActionCreate: actDef("ability to create/delete/edit custom roles"),
225+
ActionUpdate: actDef("ability to edit custom roles"),
225226
},
226227
},
227228
"assign_org_role": {
228229
Actions: map[Action]ActionDefinition{
229230
ActionAssign: actDef("ability to assign org scoped roles"),
230231
ActionRead: actDef("view what roles are assignable"),
231232
ActionDelete: actDef("ability to delete org scoped roles"),
232-
ActionCreate: actDef("ability to create/delete/edit custom roles within an organization"),
233+
ActionCreate: actDef("ability to create/delete custom roles within an organization"),
234+
ActionUpdate: actDef("ability to edit custom roles within an organization"),
233235
},
234236
},
235237
"oauth2_app": {

coderd/rbac/roles.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,10 +340,10 @@ func ReloadBuiltinRoles(opts *RoleOptions) {
340340
Identifier: RoleUserAdmin(),
341341
DisplayName: "User Admin",
342342
Site: Permissions(map[string][]policy.Action{
343-
ResourceAssignRole.Type: {policy.ActionAssign, policy.ActionDelete, policy.ActionRead},
343+
ResourceAssignRole.Type: {policy.ActionAssign, policy.ActionDelete, policy.ActionRead, policy.ActionUpdate},
344344
// Need organization assign as well to create users. At present, creating a user
345345
// will always assign them to some organization.
346-
ResourceAssignOrgRole.Type: {policy.ActionAssign, policy.ActionDelete, policy.ActionRead},
346+
ResourceAssignOrgRole.Type: {policy.ActionAssign, policy.ActionDelete, policy.ActionRead, policy.ActionUpdate},
347347
ResourceUser.Type: {
348348
policy.ActionCreate, policy.ActionRead, policy.ActionUpdate, policy.ActionDelete,
349349
policy.ActionUpdatePersonal, policy.ActionReadPersonal,
@@ -458,7 +458,7 @@ func ReloadBuiltinRoles(opts *RoleOptions) {
458458
Org: map[string][]Permission{
459459
organizationID.String(): Permissions(map[string][]policy.Action{
460460
// Assign, remove, and read roles in the organization.
461-
ResourceAssignOrgRole.Type: {policy.ActionAssign, policy.ActionDelete, policy.ActionRead},
461+
ResourceAssignOrgRole.Type: {policy.ActionAssign, policy.ActionDelete, policy.ActionRead, policy.ActionUpdate},
462462
ResourceOrganizationMember.Type: {policy.ActionCreate, policy.ActionRead, policy.ActionUpdate, policy.ActionDelete},
463463
ResourceGroup.Type: ResourceGroup.AvailableActions(),
464464
}),

0 commit comments

Comments
 (0)