synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-03 16:13:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "chore: Implement joins with golang templates (#6429)" (#6560)

Browse Source 
This reverts commit 8b125d6c5d.
This commit is contained in:
Kyle Carberry
2023-03-10 10:39:02 -06:00
committed by GitHub
parent a8433b18e4
commit 7eb2c2ff6d
36 changed files with 660 additions and 894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
coderd/database/modelmethods.go
View File

@ -4,8 +4,6 @@ import (
"sort"
"strconv"
"github.com/google/uuid"
"github.com/coder/coder/coderd/rbac"
)
@ -103,12 +101,6 @@ func (g Group) RBACObject() rbac.Object {
InOrg(g.OrganizationID)
}
func (b WorkspaceBuildRBAC) RBACObject() rbac.Object {
return rbac.ResourceWorkspace.WithID(b.WorkspaceID).
InOrg(b.OrganizationID).
WithOwner(b.WorkspaceOwnerID.String())
}
func (w Workspace) RBACObject() rbac.Object {
return rbac.ResourceWorkspace.WithID(w.ID).
InOrg(w.OrganizationID).
@ -191,18 +183,6 @@ func (l License) RBACObject() rbac.Object {
return rbac.ResourceLicense.WithIDString(strconv.FormatInt(int64(l.ID), 10))
}
func (b WorkspaceBuild) WithWorkspace(workspace Workspace) WorkspaceBuildRBAC {
return b.Expand(workspace.OrganizationID, workspace.OwnerID)
}
func (b WorkspaceBuild) Expand(orgID, ownerID uuid.UUID) WorkspaceBuildRBAC {
return WorkspaceBuildRBAC{
WorkspaceBuild: b,
OrganizationID: orgID,
WorkspaceOwnerID: ownerID,
}
}
func ConvertUserRows(rows []GetUsersRow) []User {
users := make([]User, len(rows))
for i, r := range rows {