Skip to content

feat: add database support for dismissed healthchecks #10845

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 9 commits into from
Nov 23, 2023
Merged

feat: add database support for dismissed healthchecks #10845

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
78e6c4d
db: dismissed healthchecks
mtojek Nov 23, 2023
7c024f6
Upsert and Get
mtojek Nov 23, 2023
c4829fb
dbmem
mtojek Nov 23, 2023
13dc374
fix: Upsert
mtojek Nov 23, 2023
57977d8
fix: ctx
mtojek Nov 23, 2023
47aad8f
Merge branch 'main' into 10712-dismiss-warning
mtojek Nov 23, 2023
502dbc8
Dismissed into Health
mtojek Nov 23, 2023
8990cb0
Rename to health_settings
mtojek Nov 23, 2023
e87215b
Merge branch 'main' into 10712-dismiss-warning
mtojek Nov 23, 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
Rename to health_settings
  • Loading branch information
@mtojek
mtojek committed Nov 23, 2023
commit 8990cb0d432a3cbdff112ea9f069204336bc76eb
2 changes: 1 addition & 1 deletion coderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1777,7 +1777,7 @@ func (q *FakeQuerier) GetHealthSettings(_ context.Context) (string, error) {
defer q.mutex.RUnlock()

if q.healthSettings == nil {
return "", sql.ErrNoRows
return "{}", nil
}

return string(q.healthSettings), nil
Expand Down
9 changes: 5 additions & 4 deletions coderd/database/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion coderd/database/queries/siteconfig.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ INSERT INTO site_configs (key, value) VALUES ('oauth_signing_key', $1)
ON CONFLICT (key) DO UPDATE set value = $1 WHERE site_configs.key = 'oauth_signing_key';

-- name: GetHealthSettings :one
SELECT COALESCE(value, '{}') FROM site_configs WHERE key = 'health_settings';
SELECT
COALESCE((SELECT value FROM site_configs WHERE key = 'health_settings'), '{}') :: text AS health_settings
;

-- name: UpsertHealthSettings :exec
INSERT INTO site_configs (key, value) VALUES ('health_settings', $1)
Expand Down