fix insert

f0ssel · f0ssel · commit 342cbb049faa · 2022-09-22T15:21:46.000Z
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -2019,14 +2019,18 @@ func (q *fakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW
 
 	// nolint:gosimple
 	workspaceApp := database.WorkspaceApp{
-		ID:           arg.ID,
-		AgentID:      arg.AgentID,
-		CreatedAt:    arg.CreatedAt,
-		Name:         arg.Name,
-		Icon:         arg.Icon,
-		Command:      arg.Command,
-		Url:          arg.Url,
-		RelativePath: arg.RelativePath,
+		ID:                   arg.ID,
+		AgentID:              arg.AgentID,
+		CreatedAt:            arg.CreatedAt,
+		Name:                 arg.Name,
+		Icon:                 arg.Icon,
+		Command:              arg.Command,
+		Url:                  arg.Url,
+		RelativePath:         arg.RelativePath,
+		HealthcheckEnabled:   arg.HealthcheckEnabled,
+		HealthcheckPeriod:    arg.HealthcheckPeriod,
+		HealthcheckThreshold: arg.HealthcheckThreshold,
+		Health:               arg.Health,
 	}
 	q.workspaceApps = append(q.workspaceApps, workspaceApp)
 	return workspaceApp, nil
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
@@ -20,10 +20,14 @@ INSERT INTO
         icon,
         command,
         url,
-        relative_path
+        relative_path,
+		healthcheck_enabled,
+		healthcheck_period,
+		healthcheck_threshold,
+		health
     )
 VALUES
-    ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING *;
+    ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) RETURNING *;
 
 -- name: UpdateWorkspaceAppHealthByID :exec
 UPDATE
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -826,7 +826,11 @@ func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 					String: app.Url,
 					Valid:  app.Url != "",
 				},
-				RelativePath: app.RelativePath,
+				RelativePath:         app.RelativePath,
+				HealthcheckEnabled:   false,
+				HealthcheckPeriod:    0,
+				HealthcheckThreshold: 0,
+				Health:               database.WorkspaceAppHealthDisabled,
 			})
 			if err != nil {
 				return xerrors.Errorf("insert app: %w", err)
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -435,10 +435,14 @@ func convertApps(dbApps []database.WorkspaceApp) []codersdk.WorkspaceApp {
 	apps := make([]codersdk.WorkspaceApp, 0)
 	for _, dbApp := range dbApps {
 		apps = append(apps, codersdk.WorkspaceApp{
-			ID:      dbApp.ID,
-			Name:    dbApp.Name,
-			Command: dbApp.Command.String,
-			Icon:    dbApp.Icon,
+			ID:                   dbApp.ID,
+			Name:                 dbApp.Name,
+			Command:              dbApp.Command.String,
+			Icon:                 dbApp.Icon,
+			HealthcheckEnabled:   dbApp.HealthcheckEnabled,
+			HealthcheckPeriod:    dbApp.HealthcheckPeriod,
+			HealthcheckThreshold: dbApp.HealthcheckThreshold,
+			Health:               codersdk.WorkspaceAppHealth(dbApp.Health),
 		})
 	}
 	return apps
diff --git a/coderd/workspaceresources_test.go b/coderd/workspaceresources_test.go
@@ -117,6 +117,12 @@ func TestWorkspaceResource(t *testing.T) {
 		require.Equal(t, app.Command, got.Command)
 		require.Equal(t, app.Icon, got.Icon)
 		require.Equal(t, app.Name, got.Name)
+
+		// 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, 0, got.HealthcheckThreshold)
 	})
 
 	t.Run("Metadata", func(t *testing.T) {
