Skip to content

chore: add template_with_user view to include user contextual data #8568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jul 19, 2023
Merged

chore: add template_with_user view to include user contextual data #8568

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
229d770
WIP
Emyrk Jul 17, 2023
3f2a8dd
chore: Refactor template sql queries to use new view
Emyrk Jul 17, 2023
b3d5199
Template -> TemplateWithUser
Emyrk Jul 17, 2023
1eaa49f
TemplateWithUser -> Template
Emyrk Jul 18, 2023
ca1a3bb
Fix dbfake
Emyrk Jul 18, 2023
cffbb61
Cleanup
Emyrk Jul 18, 2023
1219f2a
Add unit test to enforce good view
Emyrk Jul 18, 2023
5b6d046
Fix insert template
Emyrk Jul 18, 2023
664a81a
Fix typo
Emyrk Jul 18, 2023
457322a
Fix dbfkaE
Emyrk Jul 18, 2023
c2aa8c4
Fix unit tests
Emyrk Jul 18, 2023
72097c5
Linting
Emyrk Jul 18, 2023
5225991
Merge remote-tracking branch 'origin/main' into stevenmasley/table_vi…
Emyrk Jul 18, 2023
4715f52
Move to in tx and ignore new fields in audit diff
Emyrk Jul 19, 2023
d115920
Make gen
Emyrk Jul 19, 2023
fc4a400
Use right ID
Emyrk Jul 19, 2023
107bb45
clarify function name, wrap an error
Emyrk Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix dbfake
  • Loading branch information
@Emyrk
Emyrk committed Jul 18, 2023
commit ca1a3bb12224f625868152a26e3ad7ec3bd12863
25 changes: 13 additions & 12 deletions coderd/database/dbfake/dbfake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func New() database.Store {
workspaceResourceMetadata: make([]database.WorkspaceResourceMetadatum, 0),
provisionerJobs: make([]database.ProvisionerJob, 0),
templateVersions: make([]database.TemplateVersion, 0),
templates: make([]database.Template, 0),
templates: make([]database.TemplateTable, 0),
workspaceAgentStats: make([]database.WorkspaceAgentStat, 0),
workspaceAgentLogs: make([]database.WorkspaceAgentStartupLog, 0),
workspaceBuilds: make([]database.WorkspaceBuild, 0),
Expand Down Expand Up @@ -130,7 +130,7 @@ type data struct {
templateVersions []database.TemplateVersion
templateVersionParameters []database.TemplateVersionParameter
templateVersionVariables []database.TemplateVersionVariable
templates []database.Template
templates []database.TemplateTable
workspaceAgents []database.WorkspaceAgent
workspaceAgentMetadata []database.WorkspaceAgentMetadatum
workspaceAgentLogs []database.WorkspaceAgentStartupLog
Expand Down Expand Up @@ -452,15 +452,15 @@ func (q *FakeQuerier) getTemplateByIDNoLock(_ context.Context, id uuid.UUID) (da
return database.Template{}, sql.ErrNoRows
}

func (q *FakeQuerier) templatesWithUser(tpl []database.Template) []database.Template {
func (q *FakeQuerier) templatesWithUser(tpl []database.TemplateTable) []database.Template {
cpy := make([]database.Template, 0, len(tpl))
for _, t := range tpl {
cpy = append(cpy, q.templateWithUser(t))
}
return cpy
}

func (q *FakeQuerier) templateWithUser(tpl database.Template) database.Template {
func (q *FakeQuerier) templateWithUser(tpl database.TemplateTable) database.Template {
var user database.User
for _, _user := range q.users {
if _user.ID == tpl.CreatedBy {
Expand Down Expand Up @@ -2118,9 +2118,9 @@ func (q *FakeQuerier) GetTemplates(_ context.Context) ([]database.Template, erro

templates := slices.Clone(q.templates)
for i := range templates {
templates[i] = templates[i].DeepCopy()
templates[i] = templates[i]
}
slices.SortFunc(templates, func(i, j database.Template) bool {
slices.SortFunc(templates, func(i, j database.TemplateTable) bool {
if i.Name != j.Name {
return i.Name < j.Name
}
Expand Down Expand Up @@ -3470,7 +3470,7 @@ func (q *FakeQuerier) InsertTemplate(_ context.Context, arg database.InsertTempl
defer q.mutex.Unlock()

//nolint:gosimple
template := database.Template{
template := database.TemplateTable{
ID: arg.ID,
CreatedAt: arg.CreatedAt,
UpdatedAt: arg.UpdatedAt,
Expand Down Expand Up @@ -5009,7 +5009,8 @@ func (q *FakeQuerier) GetAuthorizedTemplates(ctx context.Context, arg database.G
}

var templates []database.Template
for _, template := range q.templates {
for _, templateTable := range q.templates {
template := q.templateWithUser(templateTable)
if prepared != nil && prepared.Authorize(ctx, template.RBACObject()) != nil {
continue
}
Expand Down Expand Up @@ -5037,7 +5038,7 @@ func (q *FakeQuerier) GetAuthorizedTemplates(ctx context.Context, arg database.G
continue
}
}
templates = append(templates, template.DeepCopy())
templates = append(templates)
}
if len(templates) > 0 {
slices.SortFunc(templates, func(i, j database.Template) bool {
Expand All @@ -5046,7 +5047,7 @@ func (q *FakeQuerier) GetAuthorizedTemplates(ctx context.Context, arg database.G
}
return i.ID.String() < j.ID.String()
})
return q.templatesWithUser(templates), nil
return templates, nil
}

return nil, sql.ErrNoRows
Expand All @@ -5056,7 +5057,7 @@ func (q *FakeQuerier) GetTemplateGroupRoles(_ context.Context, id uuid.UUID) ([]
q.mutex.RLock()
defer q.mutex.RUnlock()

var template database.Template
var template database.TemplateTable
for _, t := range q.templates {
if t.ID == id {
template = t
Expand Down Expand Up @@ -5093,7 +5094,7 @@ func (q *FakeQuerier) GetTemplateUserRoles(_ context.Context, id uuid.UUID) ([]d
q.mutex.RLock()
defer q.mutex.RUnlock()

var template database.Template
var template database.TemplateTable
for _, t := range q.templates {
if t.ID == id {
template = t
Expand Down
7 changes: 0 additions & 7 deletions coderd/database/modelmethods.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,6 @@ func (t Template) RBACObject() rbac.Object {
WithGroupACL(t.GroupACL)
}

func (t Template) RBACObject() rbac.Object {
return rbac.ResourceTemplate.WithID(t.ID).
InOrg(t.OrganizationID).
WithACLUserList(t.UserACL).
WithGroupACL(t.GroupACL)
}

func (t GetFileTemplatesRow) RBACObject() rbac.Object {
return rbac.ResourceTemplate.WithID(t.TemplateID).
InOrg(t.TemplateOrganizationID).
Expand Down
1 change: 0 additions & 1 deletion coderd/database/sqlc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,5 @@ sql:
emit_db_tags: true
emit_enum_valid_method: true
emit_all_enum_values: true
omit_unused_structs: true
rename:
template_with_users: TemplateTest