refactor(control-plane): migrate workspace DTO schemas (#24056)

This commit is contained in:
Kit Langton
2026-04-23 16:48:56 -04:00
committed by GitHub
parent 814e83ffec
commit 31d01d404a
6 changed files with 67 additions and 65 deletions

View File

@@ -3,6 +3,7 @@ import { describeRoute, resolver, validator } from "hono-openapi"
import z from "zod"
import { listAdaptors } from "@/control-plane/adaptors"
import { Workspace } from "@/control-plane/workspace"
import { WorkspaceAdaptorEntry } from "@/control-plane/types"
import { zodObject } from "@/util/effect-zod"
import { Instance } from "@/project/instance"
import { errors } from "../../error"
@@ -26,13 +27,7 @@ export const WorkspaceRoutes = lazy(() =>
content: {
"application/json": {
schema: resolver(
z.array(
z.object({
type: z.string(),
name: z.string(),
description: z.string(),
}),
),
z.array(zodObject(WorkspaceAdaptorEntry)),
),
},
},
@@ -54,7 +49,7 @@ export const WorkspaceRoutes = lazy(() =>
description: "Workspace created",
content: {
"application/json": {
schema: resolver(Workspace.Info),
schema: resolver(Workspace.Info.zod),
},
},
},
@@ -63,12 +58,12 @@ export const WorkspaceRoutes = lazy(() =>
}),
validator(
"json",
Workspace.create.schema.omit({
Workspace.CreateInput.zodObject.omit({
projectID: true,
}),
),
async (c) => {
const body = c.req.valid("json")
const body = c.req.valid("json") as Omit<Workspace.CreateInput, "projectID">
const workspace = await Workspace.create({
projectID: Instance.project.id,
...body,
@@ -87,7 +82,7 @@ export const WorkspaceRoutes = lazy(() =>
description: "Workspaces",
content: {
"application/json": {
schema: resolver(z.array(Workspace.Info)),
schema: resolver(z.array(Workspace.Info.zod)),
},
},
},
@@ -130,7 +125,7 @@ export const WorkspaceRoutes = lazy(() =>
description: "Workspace removed",
content: {
"application/json": {
schema: resolver(Workspace.Info.optional()),
schema: resolver(Workspace.Info.zod.optional()),
},
},
},
@@ -140,7 +135,7 @@ export const WorkspaceRoutes = lazy(() =>
validator(
"param",
z.object({
id: Workspace.Info.shape.id,
id: zodObject(Workspace.Info).shape.id,
}),
),
async (c) => {
@@ -170,11 +165,11 @@ export const WorkspaceRoutes = lazy(() =>
...errors(400),
},
}),
validator("param", z.object({ id: Workspace.Info.shape.id })),
validator("json", Workspace.sessionRestore.schema.omit({ workspaceID: true })),
validator("param", z.object({ id: zodObject(Workspace.Info).shape.id })),
validator("json", Workspace.SessionRestoreInput.zodObject.omit({ workspaceID: true })),
async (c) => {
const { id } = c.req.valid("param")
const body = c.req.valid("json")
const body = c.req.valid("json") as Omit<Workspace.SessionRestoreInput, "workspaceID">
log.info("session restore route requested", {
workspaceID: id,
sessionID: body.sessionID,