Commitf3f0183

committed

refactor: extract PrebuiltWorkspaceResource interface for prebuilt RBAC support

1 parent4b8775f commitf3f0183Copy full SHA for f3f0183

File tree

-4

lines changed

-4

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -199,6 +199,13 @@ func (gm GroupMember) RBACObject() rbac.Object {`
`199`	`199`	`returnrbac.ResourceGroupMember.WithID(gm.UserID).InOrg(gm.OrganizationID).WithOwner(gm.UserID.String())`
`200`	`200`	`}`
`201`	`201`
	`202`	`+// PrebuiltWorkspaceResource defines the interface for types that can be identified as prebuilt workspaces`
	`203`	`+// and converted to their corresponding prebuilt workspace RBAC object.`
	`204`	`+typePrebuiltWorkspaceResourceinterface {`
	`205`	`+IsPrebuild()bool`
	`206`	`+AsPrebuild() rbac.Object`
	`207`	`+}`
	`208`	`+`
`202`	`209`	`// WorkspaceTable converts a Workspace to it's reduced version.`
`203`	`210`	`// A more generalized solution is to use json marshaling to`
`204`	`211`	`// consistently keep these two structs in sync.`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -396,10 +396,7 @@ func (api API) postWorkspaceBuilds(rw http.ResponseWriter, r http.Request) {`
`396`	`396`	`}`
`397`	`397`	`// Special handling for prebuilt workspace deletion`
`398`	`398`	`ifaction==policy.ActionDelete {`
`399`		`-ifworkspaceObj,ok:=object.(interface {`
`400`		`-IsPrebuild()bool`
`401`		`-AsPrebuild() rbac.Object`
`402`		`-});ok&&workspaceObj.IsPrebuild() {`
	`399`	`+ifworkspaceObj,ok:=object.(database.PrebuiltWorkspaceResource);ok&&workspaceObj.IsPrebuild() {`
`403`	`400`	`returnapi.Authorize(r,action,workspaceObj.AsPrebuild())`
`404`	`401`	`}`
`405`	`402`	`}`

Comments

(0)