Skip to content

fix: list templates returns non-deprecated templates by default #17747

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 8 commits into from
May 13, 2025
Merged

fix: list templates returns non-deprecated templates by default #17747

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
79313cc
fix: list templates returns non-deprecated templates by default
ssncferreira May 9, 2025
db52150
docs: update method docstrings for fetching templates and organizatio…
ssncferreira May 12, 2025
3e5e40d
fix: comment in enterprise/coderd/templates_test.go
ssncferreira May 12, 2025
fa8f999
refactor: add comment to coderd/database/dbmem/dbmem.go
ssncferreira May 12, 2025
b344266
fix: move templates tests from enterprise/coderd/templates_test.go to…
ssncferreira May 12, 2025
12985c5
Merge remote-tracking branch 'origin/main' into ssncferreira/fix-depr…
ssncferreira May 12, 2025
06acc27
refactor(dbmem): improve deprecation filtering logic with a helper fu…
ssncferreira May 13, 2025
c88d4d2
Merge remote-tracking branch 'origin/main' into ssncferreira/fix-depr…
ssncferreira May 13, 2025
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
refactor(dbmem): improve deprecation filtering logic with a helper fu… 
…nction and improve comments by adding the matching SQL logic
  • Loading branch information
@ssncferreira
ssncferreira committed May 13, 2025
commit 06acc27e053b68f10450743de362fcefd32c5373
19 changes: 17 additions & 2 deletions coderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1380,6 +1380,12 @@ func (q *FakeQuerier) getProvisionerJobsByIDsWithQueuePositionLockedGlobalQueue(
return jobs, nil
}

// isDeprecated returns true if the template is deprecated.
// A template is considered deprecated when it has a deprecation message.
func isDeprecated(template database.Template) bool {
return template.Deprecated != ""
}

func (*FakeQuerier) AcquireLock(_ context.Context, _ int64) error {
return xerrors.New("AcquireLock must only be called within a transaction")
}
Expand Down Expand Up @@ -13021,8 +13027,17 @@ func (q *FakeQuerier) GetAuthorizedTemplates(ctx context.Context, arg database.G
if arg.ExactName != "" && !strings.EqualFold(template.Name, arg.ExactName) {
continue
}
// Check if the search query filter 'Deprecated' status matches the template's 'Deprecated' status
if arg.Deprecated.Valid && arg.Deprecated.Bool != (template.Deprecated != "") {
// Filters templates based on the search query filter 'Deprecated' status
// Matching SQL logic:
// -- Filter by deprecated
// AND CASE
// WHEN :deprecated IS NOT NULL THEN
// CASE
// WHEN :deprecated THEN deprecated != ''
// ELSE deprecated = ''
// END
// ELSE true
if arg.Deprecated.Valid && arg.Deprecated.Bool != isDeprecated(template) {
continue
}
if arg.FuzzyName != "" {
Expand Down