Skip to content

Commit 502dbc8

Browse files
mtojekmtojek
committed
Dismissed into Health
1 parent 47aad8f commit 502dbc8

File tree

7 files changed

+68
-68
lines changed

7 files changed

+68
-68
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -948,11 +948,6 @@ func (q *querier) GetDeploymentWorkspaceStats(ctx context.Context) (database.Get
948948
return q.db.GetDeploymentWorkspaceStats(ctx)
949949
}
950950

951-
func (q *querier) GetDismissedHealthchecks(ctx context.Context) (string, error) {
952-
// No authz checks
953-
return q.db.GetDismissedHealthchecks(ctx)
954-
}
955-
956951
func (q *querier) GetExternalAuthLink(ctx context.Context, arg database.GetExternalAuthLinkParams) (database.ExternalAuthLink, error) {
957952
return fetch(q.log, q.auth, q.db.GetExternalAuthLink)(ctx, arg)
958953
}
@@ -1026,6 +1021,11 @@ func (q *querier) GetGroupsByOrganizationID(ctx context.Context, organizationID
10261021
return fetchWithPostFilter(q.auth, q.db.GetGroupsByOrganizationID)(ctx, organizationID)
10271022
}
10281023

1024+
func (q *querier) GetHealthSettings(ctx context.Context) (string, error) {
1025+
// No authz checks
1026+
return q.db.GetHealthSettings(ctx)
1027+
}
1028+
10291029
// TODO: We need to create a ProvisionerJob resource type
10301030
func (q *querier) GetHungProvisionerJobs(ctx context.Context, hungSince time.Time) ([]database.ProvisionerJob, error) {
10311031
// if err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceSystem); err != nil {
@@ -2963,11 +2963,11 @@ func (q *querier) UpsertDefaultProxy(ctx context.Context, arg database.UpsertDef
29632963
return q.db.UpsertDefaultProxy(ctx, arg)
29642964
}
29652965

2966-
func (q *querier) UpsertDismissedHealthchecks(ctx context.Context, value string) error {
2966+
func (q *querier) UpsertHealthSettings(ctx context.Context, value string) error {
29672967
if err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceDeploymentValues); err != nil {
29682968
return err
29692969
}
2970-
return q.db.UpsertDismissedHealthchecks(ctx, value)
2970+
return q.db.UpsertHealthSettings(ctx, value)
29712971
}
29722972

29732973
func (q *querier) UpsertLastUpdateCheck(ctx context.Context, value string) error {

‎coderd/database/dbmem/dbmem.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ type data struct {
159159
derpMeshKey string
160160
lastUpdateCheck []byte
161161
serviceBanner []byte
162-
dismissedHealthchecks []byte
162+
healthSettings []byte
163163
applicationName string
164164
logoURL string
165165
appSecurityKey string
@@ -1592,17 +1592,6 @@ func (q *FakeQuerier) GetDeploymentWorkspaceStats(ctx context.Context) (database
15921592
return stat, nil
15931593
}
15941594

1595-
func (q *FakeQuerier) GetDismissedHealthchecks(_ context.Context) (string, error) {
1596-
q.mutex.RLock()
1597-
defer q.mutex.RUnlock()
1598-
1599-
if q.dismissedHealthchecks == nil {
1600-
return "", sql.ErrNoRows
1601-
}
1602-
1603-
return string(q.dismissedHealthchecks), nil
1604-
}
1605-
16061595
func (q *FakeQuerier) GetExternalAuthLink(_ context.Context, arg database.GetExternalAuthLinkParams) (database.ExternalAuthLink, error) {
16071596
if err := validateDatabaseType(arg); err != nil {
16081597
return database.ExternalAuthLink{}, err
@@ -1783,6 +1772,17 @@ func (q *FakeQuerier) GetGroupsByOrganizationID(_ context.Context, id uuid.UUID)
17831772
return groups, nil
17841773
}
17851774

1775+
func (q *FakeQuerier) GetHealthSettings(_ context.Context) (string, error) {
1776+
q.mutex.RLock()
1777+
defer q.mutex.RUnlock()
1778+
1779+
if q.healthSettings == nil {
1780+
return "", sql.ErrNoRows
1781+
}
1782+
1783+
return string(q.healthSettings), nil
1784+
}
1785+
17861786
func (q *FakeQuerier) GetHungProvisionerJobs(_ context.Context, hungSince time.Time) ([]database.ProvisionerJob, error) {
17871787
q.mutex.RLock()
17881788
defer q.mutex.RUnlock()
@@ -6802,11 +6802,11 @@ func (q *FakeQuerier) UpsertDefaultProxy(_ context.Context, arg database.UpsertD
68026802
return nil
68036803
}
68046804

6805-
func (q *FakeQuerier) UpsertDismissedHealthchecks(_ context.Context, data string) error {
6805+
func (q *FakeQuerier) UpsertHealthSettings(_ context.Context, data string) error {
68066806
q.mutex.RLock()
68076807
defer q.mutex.RUnlock()
68086808

6809-
q.dismissedHealthchecks = []byte(data)
6809+
q.healthSettings = []byte(data)
68106810
return nil
68116811
}
68126812

‎coderd/database/dbmetrics/dbmetrics.go

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbmock/dbmock.go

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/querier.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/siteconfig.sql

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ SELECT value FROM site_configs WHERE key = 'oauth_signing_key';
7171
INSERT INTO site_configs (key, value) VALUES ('oauth_signing_key', $1)
7272
ON CONFLICT (key) DO UPDATE set value = $1 WHERE site_configs.key = 'oauth_signing_key';
7373

74-
-- name: GetDismissedHealthchecks :one
75-
SELECT value FROM site_configs WHERE key = 'dismissed_healthchecks';
74+
-- name: GetHealthSettings :one
75+
SELECT COALESCE(value, '{}') FROM site_configs WHERE key = 'health_settings';
7676

77-
-- name: UpsertDismissedHealthchecks :exec
78-
INSERT INTO site_configs (key, value) VALUES ('dismissed_healthchecks', $1)
79-
ON CONFLICT (key) DO UPDATE SET value = $1 WHERE site_configs.key = 'dismissed_healthchecks';
77+
-- name: UpsertHealthSettings :exec
78+
INSERT INTO site_configs (key, value) VALUES ('health_settings', $1)
79+
ON CONFLICT (key) DO UPDATE SET value = $1 WHERE site_configs.key = 'health_settings';

0 commit comments

Comments
 (0)