healthcheck url

f0ssel · f0ssel · commit 11ed7fdc7a32 · 2022-09-19T21:57:40.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -415,7 +415,7 @@ func New(options *Options) *API {
 				r.Use(httpmw.ExtractWorkspaceAgent(options.Database))
 				r.Get("/metadata", api.workspaceAgentMetadata)
 				r.Post("/version", api.postWorkspaceAgentVersion)
-				r.Post("/app-healths", api.postWorkspaceAppHealths)
+				r.Post("/app-health", api.postWorkspaceAppHealth)
 				r.Get("/listen", api.workspaceAgentListen)
 
 				r.Get("/gitsshkey", api.agentGitSSHKey)
diff --git a/coderd/coderdtest/authtest.go b/coderd/coderdtest/authtest.go
@@ -198,7 +198,7 @@ func AGPLRoutes(a *AuthTester) (map[string]string, map[string]RouteCheck) {
 		"GET:/api/v2/workspaceagents/me/turn":                     {NoAuthorize: true},
 		"GET:/api/v2/workspaceagents/me/coordinate":               {NoAuthorize: true},
 		"POST:/api/v2/workspaceagents/me/version":                 {NoAuthorize: true},
-		"POST:/api/v2/workspaceagents/me/app-healths":             {NoAuthorize: true},
+		"POST:/api/v2/workspaceagents/me/app-health":              {NoAuthorize: true},
 		"GET:/api/v2/workspaceagents/me/report-stats":             {NoAuthorize: true},
 		"GET:/api/v2/workspaceagents/{workspaceagent}/iceservers": {NoAuthorize: true},
 
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -2028,6 +2028,7 @@ func (q *fakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW
 		Url:                  arg.Url,
 		RelativePath:         arg.RelativePath,
 		HealthcheckEnabled:   arg.HealthcheckEnabled,
+		HealthcheckUrl:       arg.HealthcheckUrl,
 		HealthcheckPeriod:    arg.HealthcheckPeriod,
 		HealthcheckThreshold: arg.HealthcheckThreshold,
 		Health:               arg.Health,
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000051_workspace_app_health.up.sql b/coderd/database/migrations/000051_workspace_app_health.up.sql
@@ -3,6 +3,7 @@ CREATE TYPE workspace_app_health AS ENUM ('disabled', 'initializing', 'healthy',
 ALTER TABLE ONLY workspace_apps
 	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_url text NOT NULL DEFAULT '',
 	ADD COLUMN IF NOT EXISTS healthcheck_period int NOT NULL DEFAULT 0,
 	ADD COLUMN IF NOT EXISTS healthcheck_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/database/queries/workspaceapps.sql b/coderd/database/queries/workspaceapps.sql
@@ -22,12 +22,13 @@ INSERT INTO
         url,
         relative_path,
         healthcheck_enabled,
+        healthcheck_url,
         healthcheck_period,
         healthcheck_threshold,
         health
     )
 VALUES
-    ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) RETURNING *;
+    ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13) RETURNING *;
 
 -- name: UpdateWorkspaceAppHealthByID :exec
 UPDATE
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -825,8 +825,10 @@ func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 					String: app.Url,
 					Valid:  app.Url != "",
 				},
-				RelativePath:         app.RelativePath,
+				RelativePath: app.RelativePath,
+				// default to disabled until we tie up the terraform
 				HealthcheckEnabled:   false,
+				HealthcheckUrl:       "",
 				HealthcheckPeriod:    0,
 				HealthcheckThreshold: 0,
 				Health:               database.WorkspaceAppHealthDisabled,
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -658,7 +658,8 @@ func convertApps(dbApps []database.WorkspaceApp) []codersdk.WorkspaceApp {
 			Command:              dbApp.Command.String,
 			Icon:                 dbApp.Icon,
 			HealthcheckEnabled:   dbApp.HealthcheckEnabled,
-			HealthcheckPeriod:    dbApp.HealthcheckPeriod,
+			HealthcheckURL:       dbApp.HealthcheckUrl,
+			HealthcheckInterval:  dbApp.HealthcheckPeriod,
 			HealthcheckThreshold: dbApp.HealthcheckThreshold,
 			Health:               codersdk.WorkspaceAppHealth(dbApp.Health),
 		})
diff --git a/coderd/workspaceapps.go b/coderd/workspaceapps.go
@@ -257,7 +257,7 @@ func (api *API) applicationCookie(authCookie *http.Cookie) *http.Cookie {
 	return &appCookie
 }
 
-func (api *API) postWorkspaceAppHealths(rw http.ResponseWriter, r *http.Request) {
+func (api *API) postWorkspaceAppHealth(rw http.ResponseWriter, r *http.Request) {
 	workspaceAgent := httpmw.WorkspaceAgent(r)
 	var req codersdk.PostWorkspaceAppHealthsRequest
 	if !httpapi.Read(rw, r, &req) {
diff --git a/coderd/workspaceresources_test.go b/coderd/workspaceresources_test.go
@@ -121,7 +121,8 @@ func TestWorkspaceResource(t *testing.T) {
 		// ensure these are returned as disabled until we enable on the terraform side
 		require.EqualValues(t, codersdk.WorkspaceAppHealthDisabled, got.Health)
 		require.EqualValues(t, false, got.HealthcheckEnabled)
-		require.EqualValues(t, 0, got.HealthcheckPeriod)
+		require.EqualValues(t, "", got.HealthcheckURL)
+		require.EqualValues(t, 0, got.HealthcheckInterval)
 		require.EqualValues(t, 0, got.HealthcheckThreshold)
 	})
 
diff --git a/codersdk/workspaceapps.go b/codersdk/workspaceapps.go
@@ -20,9 +20,12 @@ type WorkspaceApp struct {
 	Command string `json:"command,omitempty"`
 	// Icon is a relative path or external URL that specifies
 	// an icon to be displayed in the dashboard.
-	Icon                 string             `json:"icon,omitempty"`
-	HealthcheckEnabled   bool               `json:"healthcheck_enabled"`
-	HealthcheckPeriod    int32              `json:"healthcheck_period"`
+	Icon               string `json:"icon,omitempty"`
+	HealthcheckEnabled bool   `json:"healthcheck_enabled"`
+	HealthcheckURL     string `json:"healthcheck_url"`
+	// HealthcheckInterval specifies the seconds between each health check.
+	HealthcheckInterval int32 `json:"healthcheck_period"`
+	// HealthcheckThreshold specifies the number of consecutive failed health checks before returning "unhealthy".
 	HealthcheckThreshold int32              `json:"healthcheck_threshold"`
 	Health               WorkspaceAppHealth `json:"health"`
 }
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -621,6 +621,7 @@ export interface WorkspaceApp {
   readonly command?: string
   readonly icon?: string
   readonly healthcheck_enabled: boolean
+  readonly healthcheck_url: string
   readonly healthcheck_period: number
   readonly healthcheck_threshold: number
   readonly health: WorkspaceAppHealth
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -326,6 +326,7 @@ export const MockWorkspaceApp: TypesGen.WorkspaceApp = {
   icon: "",
   health: "disabled",
   healthcheck_enabled: false,
+  healthcheck_url: "",
   healthcheck_period: 0,
   healthcheck_threshold: 0,
 }
