Skip to content

Commit 1947adc

Browse files
f0sself0ssel
committed
remove healthcheck_enabled
1 parent e6dc742 commit 1947adc

18 files changed

+141
-175
lines changed

‎agent/apphealth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func NewWorkspaceAppHealthReporter(logger slog.Logger, client *codersdk.Client)
139139
}
140140

141141
func shouldStartTicker(app codersdk.WorkspaceApp) bool {
142-
return app.HealthcheckEnabled && app.HealthcheckInterval > 0 && app.HealthcheckThreshold > 0 && app.HealthcheckURL != ""
142+
return app.HealthcheckURL != "" && app.HealthcheckInterval > 0 && app.HealthcheckThreshold > 0
143143
}
144144

145145
func healthChanged(old map[string]codersdk.WorkspaceAppHealth, new map[string]codersdk.WorkspaceAppHealth) bool {

‎coderd/database/databasefake/databasefake.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2027,7 +2027,6 @@ func (q *fakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW
20272027
Command: arg.Command,
20282028
Url: arg.Url,
20292029
RelativePath: arg.RelativePath,
2030-
HealthcheckEnabled: arg.HealthcheckEnabled,
20312030
HealthcheckUrl: arg.HealthcheckUrl,
20322031
HealthcheckInterval: arg.HealthcheckInterval,
20332032
HealthcheckThreshold: arg.HealthcheckThreshold,

‎coderd/database/dump.sql

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

‎coderd/database/migrations/000051_workspace_app_health.down.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ALTER TABLE ONLY workspace_apps
2-
DROP COLUMN IF EXISTS healthcheck_enabled,
2+
DROP COLUMN IF EXISTS healthcheck_url,
33
DROP COLUMN IF EXISTS healthcheck_interval,
44
DROP COLUMN IF EXISTS healthcheck_threshold,
55
DROP COLUMN IF EXISTS health;

‎coderd/database/migrations/000051_workspace_app_health.up.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
CREATE TYPE workspace_app_health AS ENUM ('disabled', 'initializing', 'healthy', 'unhealthy');
22

33
ALTER TABLE ONLY workspace_apps
4-
ADD COLUMN IF NOT EXISTS healthcheck_enabled boolean NOT NULL DEFAULT FALSE,
54
ADD COLUMN IF NOT EXISTS healthcheck_url text NOT NULL DEFAULT '',
65
ADD COLUMN IF NOT EXISTS healthcheck_interval int NOT NULL DEFAULT 0,
76
ADD COLUMN IF NOT EXISTS healthcheck_threshold int NOT NULL DEFAULT 0,

‎coderd/database/models.go

Lines changed: 0 additions & 1 deletion
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: 5 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/workspaceapps.sql

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ INSERT INTO
2121
command,
2222
url,
2323
relative_path,
24-
healthcheck_enabled,
2524
healthcheck_url,
2625
healthcheck_interval,
2726
healthcheck_threshold,
2827
health
2928
)
3029
VALUES
31-
($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13) RETURNING *;
30+
($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) RETURNING *;
3231

3332
-- name: UpdateWorkspaceAppHealthByID :exec
3433
UPDATE

‎coderd/provisionerdaemons.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
813813

814814
for _, app := range prAgent.Apps {
815815
health := database.WorkspaceAppHealthDisabled
816-
if app.HealthcheckEnabled {
816+
if app.HealthcheckUrl != "" {
817817
health = database.WorkspaceAppHealthInitializing
818818
}
819819

@@ -832,7 +832,6 @@ func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
832832
Valid: app.Url != "",
833833
},
834834
RelativePath: app.RelativePath,
835-
HealthcheckEnabled: app.HealthcheckEnabled,
836835
HealthcheckUrl: app.HealthcheckUrl,
837836
HealthcheckInterval: app.HealthcheckInterval,
838837
HealthcheckThreshold: app.HealthcheckThreshold,

‎coderd/workspaceagents.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,6 @@ func convertApps(dbApps []database.WorkspaceApp) []codersdk.WorkspaceApp {
452452
Name: dbApp.Name,
453453
Command: dbApp.Command.String,
454454
Icon: dbApp.Icon,
455-
HealthcheckEnabled: dbApp.HealthcheckEnabled,
456455
HealthcheckURL: dbApp.HealthcheckUrl,
457456
HealthcheckInterval: dbApp.HealthcheckInterval,
458457
HealthcheckThreshold: dbApp.HealthcheckThreshold,
@@ -736,7 +735,7 @@ func (api *API) postWorkspaceAppHealth(rw http.ResponseWriter, r *http.Request)
736735
return
737736
}
738737

739-
if !old.HealthcheckEnabled {
738+
if old.HealthcheckUrl == "" {
740739
httpapi.Write(rw, http.StatusNotFound, codersdk.Response{
741740
Message: "Error setting workspace app health",
742741
Detail: xerrors.Errorf("health checking is disabled for workspace app %s", name).Error(),

‎coderd/workspaceagents_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,6 @@ func TestWorkspaceAgentAppHealth(t *testing.T) {
383383
Command: "some-command",
384384
Url: "http://localhost:3000",
385385
Icon: "/code.svg",
386-
HealthcheckEnabled: true,
387386
HealthcheckUrl: "http://localhost:3000",
388387
HealthcheckInterval: 5,
389388
HealthcheckThreshold: 6,

‎coderd/workspaceresources_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ func TestWorkspaceResource(t *testing.T) {
8686
Command: "some-command",
8787
Url: "http://localhost:3000",
8888
Icon: "/code.svg",
89-
HealthcheckEnabled: true,
9089
HealthcheckUrl: "http://localhost:3000",
9190
HealthcheckInterval: 5,
9291
HealthcheckThreshold: 6,
@@ -131,7 +130,6 @@ func TestWorkspaceResource(t *testing.T) {
131130
require.EqualValues(t, app.Icon, got.Icon)
132131
require.EqualValues(t, app.Name, got.Name)
133132
require.EqualValues(t, codersdk.WorkspaceAppHealthDisabled, got.Health)
134-
require.EqualValues(t, app.HealthcheckEnabled, got.HealthcheckEnabled)
135133
require.EqualValues(t, app.HealthcheckUrl, got.HealthcheckURL)
136134
require.EqualValues(t, app.HealthcheckInterval, got.HealthcheckInterval)
137135
require.EqualValues(t, app.HealthcheckThreshold, got.HealthcheckThreshold)
@@ -141,7 +139,6 @@ func TestWorkspaceResource(t *testing.T) {
141139
require.EqualValues(t, app.Icon, got.Icon)
142140
require.EqualValues(t, app.Name, got.Name)
143141
require.EqualValues(t, codersdk.WorkspaceAppHealthInitializing, got.Health)
144-
require.EqualValues(t, app.HealthcheckEnabled, got.HealthcheckEnabled)
145142
require.EqualValues(t, app.HealthcheckUrl, got.HealthcheckURL)
146143
require.EqualValues(t, app.HealthcheckInterval, got.HealthcheckInterval)
147144
require.EqualValues(t, app.HealthcheckThreshold, got.HealthcheckThreshold)

‎codersdk/workspaceapps.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ type WorkspaceApp struct {
2020
Command string `json:"command,omitempty"`
2121
// Icon is a relative path or external URL that specifies
2222
// an icon to be displayed in the dashboard.
23-
Icon string `json:"icon,omitempty"`
24-
HealthcheckEnabled bool `json:"healthcheck_enabled"`
25-
HealthcheckURL string `json:"healthcheck_url"`
23+
Icon string `json:"icon,omitempty"`
24+
// HealthcheckURL specifies the url to check for the app health.
25+
HealthcheckURL string `json:"healthcheck_url"`
2626
// HealthcheckInterval specifies the seconds between each health check.
2727
HealthcheckInterval int32 `json:"healthcheck_interval"`
2828
// HealthcheckThreshold specifies the number of consecutive failed health checks before returning "unhealthy".
29-
HealthcheckThreshold int32 `json:"healthcheck_threshold"`
30-
Health WorkspaceAppHealth `json:"health"`
29+
HealthcheckThreshold int32 `json:"healthcheck_threshold"`
30+
// Health specifies the current status of the app's health.
31+
Health WorkspaceAppHealth `json:"health"`
3132
}
3233

3334
// @typescript-ignore PostWorkspaceAppHealthsRequest

‎provisioner/terraform/resources.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ type agentAppAttributes struct {
3131
URL string `mapstructure:"url"`
3232
Command string `mapstructure:"command"`
3333
RelativePath bool `mapstructure:"relative_path"`
34-
HealthcheckEnabled bool `mapstructure:"healthcheck_enabled"`
3534
HealthcheckURL string `mapstructure:"healthcheck_url"`
3635
HealthcheckInterval int32 `mapstructure:"healthcheck_interval"`
3736
HealthcheckThreshold int32 `mapstructure:"healthcheck_threshold"`
@@ -234,7 +233,6 @@ func ConvertResources(module *tfjson.StateModule, rawGraph string) ([]*proto.Res
234233
Url: attrs.URL,
235234
Icon: attrs.Icon,
236235
RelativePath: attrs.RelativePath,
237-
HealthcheckEnabled: attrs.HealthcheckEnabled,
238236
HealthcheckUrl: attrs.HealthcheckURL,
239237
HealthcheckInterval: attrs.HealthcheckInterval,
240238
HealthcheckThreshold: attrs.HealthcheckThreshold,

0 commit comments

Comments
 (0)