Add more healthcheck fields to db schema

f0ssel · f0ssel · commit 419f8e71582d · 2022-09-22T15:21:45.000Z
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -2032,6 +2032,22 @@ func (q *fakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW
 	return workspaceApp, nil
 }
 
+func (q *fakeQuerier) UpdateWorkspaceAppHealthByID(_ context.Context, arg database.UpdateWorkspaceAppHealthByIDParams) error {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	for index, app := range q.workspaceApps {
+		if app.ID != arg.ID {
+			continue
+		}
+		app.UpdatedAt = arg.UpdatedAt
+		app.Health = arg.Health
+		q.workspaceApps[index] = app
+		return nil
+	}
+	return sql.ErrNoRows
+}
+
 func (q *fakeQuerier) UpdateAPIKeyByID(_ context.Context, arg database.UpdateAPIKeyByIDParams) error {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000050_workspace_app_health.down.sql b/coderd/database/migrations/000050_workspace_app_health.down.sql
@@ -1,4 +1,8 @@
 ALTER TABLE ONLY workspace_apps
-    DROP COLUMN IF EXISTS health;
+	DROP COLUMN IF EXISTS updated_at,
+	DROP COLUMN IF EXISTS healthcheck_enabled,
+	DROP COLUMN IF EXISTS healthcheck_period,
+	DROP COLUMN IF EXISTS unhealthy_threshold,
+	DROP COLUMN IF EXISTS health;
 
 DROP TYPE workspace_app_health;
diff --git a/coderd/database/migrations/000050_workspace_app_health.up.sql b/coderd/database/migrations/000050_workspace_app_health.up.sql
@@ -1,5 +1,8 @@
-CREATE TYPE workspace_app_health AS ENUM ('intializing', 'healthy', 'unhealthy');
+CREATE TYPE workspace_app_health AS ENUM ('disabled', 'intializing', 'healthy', 'unhealthy');
 
 ALTER TABLE ONLY workspace_apps
-    ADD COLUMN IF NOT EXISTS health workspace_app_health NOT NULL DEFAULT 'intializing',
-	ADD COLUMN IF NOT EXISTS updated_at timestamptz NOT NULL DEFAULT '-infinity';
+	ADD COLUMN IF NOT EXISTS updated_at timestamptz NOT NULL DEFAULT '-infinity',
+	ADD COLUMN IF NOT EXISTS healthcheck_enabled boolean NOT NULL DEFAULT FALSE,
+	ADD COLUMN IF NOT EXISTS healthcheck_period int NOT NULL DEFAULT 0,
+	ADD COLUMN IF NOT EXISTS unhealthy_threshold int NOT NULL DEFAULT 0,
+    ADD COLUMN IF NOT EXISTS health workspace_app_health NOT NULL DEFAULT 'disabled';
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/workspaceapps.go b/coderd/workspaceapps.go
@@ -289,12 +289,20 @@ func (api *API) postWorkspaceAppHealths(rw http.ResponseWriter, r *http.Request)
 			return
 		}
 
+		if !found.HealthcheckEnabled {
+			httpapi.Write(rw, http.StatusNotFound, codersdk.Response{
+				Message: "Error setting workspace app health",
+				Detail:  xerrors.Errorf("health checking is disabled for workspace app %s", name).Error(),
+			})
+			return
+		}
+
 		switch health {
-		case codersdk.WorkspaceAppInitializing:
+		case codersdk.WorkspaceAppHealthInitializing:
 			found.Health = database.WorkspaceAppHealthIntializing
-		case codersdk.WorkspaceAppHealthy:
+		case codersdk.WorkspaceAppHealthHealthy:
 			found.Health = database.WorkspaceAppHealthHealthy
-		case codersdk.WorkspaceAppUnhealthy:
+		case codersdk.WorkspaceAppHealthUnhealthy:
 			found.Health = database.WorkspaceAppHealthUnhealthy
 		default:
 			httpapi.Write(rw, http.StatusBadRequest, codersdk.Response{
diff --git a/codersdk/workspaceapps.go b/codersdk/workspaceapps.go
@@ -7,9 +7,10 @@ import (
 type WorkspaceAppHealth string
 
 const (
-	WorkspaceAppInitializing WorkspaceAppHealth = "initializing"
-	WorkspaceAppHealthy      WorkspaceAppHealth = "healthy"
-	WorkspaceAppUnhealthy    WorkspaceAppHealth = "unhealthy"
+	WorkspaceAppHealthDisabled     WorkspaceAppHealth = "disabled"
+	WorkspaceAppHealthInitializing WorkspaceAppHealth = "initializing"
+	WorkspaceAppHealthHealthy      WorkspaceAppHealth = "healthy"
+	WorkspaceAppHealthUnhealthy    WorkspaceAppHealth = "unhealthy"
 )
 
 type WorkspaceApp struct {
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -745,7 +745,7 @@ export type UserStatus = "active" | "suspended"
 export type WorkspaceAgentStatus = "connected" | "connecting" | "disconnected"
 
 // From codersdk/workspaceapps.go
-export type WorkspaceAppHealth = "healthy" | "initializing" | "unhealthy"
+export type WorkspaceAppHealth = "disabled" | "healthy" | "initializing" | "unhealthy"
 
 // From codersdk/workspacebuilds.go
 export type WorkspaceTransition = "delete" | "start" | "stop"
