Commit5f7e5d7

authored

feat: support prebuilt workspaces in non-default organizations (#18010)

1 parent4d0fe20 commit5f7e5d7Copy full SHA for 5f7e5d7

File tree

+576

-302

lines changed

+576

-302

lines changed

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -412,6 +412,21 @@ var (`
`412`	`412`	`policy.ActionCreate,policy.ActionDelete,policy.ActionRead,policy.ActionUpdate,`
`413`	`413`	`policy.ActionWorkspaceStart,policy.ActionWorkspaceStop,`
`414`	`414`	`},`
	`415`	`+// Should be able to add the prebuilds system user as a member to any organization that needs prebuilds.`
	`416`	`+rbac.ResourceOrganizationMember.Type: {`
	`417`	`+policy.ActionCreate,`
	`418`	`+},`
	`419`	`+// Needs to be able to assign roles to the system user in order to make it a member of an organization.`
	`420`	`+rbac.ResourceAssignOrgRole.Type: {`
	`421`	`+policy.ActionAssign,`
	`422`	`+},`
	`423`	`+// Needs to be able to read users to determine which organizations the prebuild system user is a member of.`
	`424`	`+rbac.ResourceUser.Type: {`
	`425`	`+policy.ActionRead,`
	`426`	`+},`
	`427`	`+rbac.ResourceOrganization.Type: {`
	`428`	`+policy.ActionRead,`
	`429`	`+},`
`415`	`430`	`}),`
`416`	`431`	`},`
`417`	`432`	`}),`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ const (`
`33`	`33`	`orgUserAdminstring="organization-user-admin"`
`34`	`34`	`orgTemplateAdminstring="organization-template-admin"`
`35`	`35`	`orgWorkspaceCreationBanstring="organization-workspace-creation-ban"`
	`36`	`+`
	`37`	`+prebuildsOrchestratorstring="prebuilds-orchestrator"`
`36`	`38`	`)`
`37`	`39`
`38`	`40`	`funcinit() {`
`@@ -599,6 +601,9 @@ var assignRoles = map[string]map[string]bool{`
`599`	`601`	`orgUserAdmin: {`
`600`	`602`	`orgMember:true,`
`601`	`603`	`},`
	`604`	`+prebuildsOrchestrator: {`
	`605`	`+orgMember:true,`
	`606`	`+},`
`602`	`607`	`}`
`603`	`608`
`604`	`609`	`// ExpandableRoles is any type that can be expanded into a []Role. This is implemented`

Comments

(0)