-
Notifications
You must be signed in to change notification settings - Fork 18
refactor: drop old deployment agent table #943
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+6,497
−514
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
082bb5e
refactor: drop old deployment agent table
adityachoudhari26 8a285c7
fix build
adityachoudhari26 7b0fe2c
more fix
adityachoudhari26 65b5a2f
update tests
adityachoudhari26 fa14018
fmt
adityachoudhari26 faf85a4
litn
adityachoudhari26 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,7 @@ | ||
| import type { AsyncTypedHandler } from "@/types/api.js"; | ||
| import { ApiError, asyncHandler } from "@/types/api.js"; | ||
| import { Router } from "express"; | ||
| import _ from "lodash"; | ||
| import { v4 as uuidv4 } from "uuid"; | ||
| import { z } from "zod"; | ||
|
|
||
| import { and, asc, count, desc, eq, inArray, takeFirst } from "@ctrlplane/db"; | ||
| import { db } from "@ctrlplane/db/client"; | ||
|
|
@@ -21,22 +19,6 @@ import { listDeploymentVariablesByDeploymentRouter } from "./deployment-variable | |
|
|
||
| const PLAN_TTL_MS = 60 * 60 * 1000; | ||
|
|
||
| const getJobAgentsByDeploymentId = async ( | ||
| deploymentIds: string[], | ||
| ): Promise<Record<string, { ref: string; config: Record<string, any> }[]>> => { | ||
| if (deploymentIds.length === 0) return {}; | ||
| const links = await db | ||
| .select() | ||
| .from(schema.deploymentJobAgent) | ||
| .where(inArray(schema.deploymentJobAgent.deploymentId, deploymentIds)); | ||
| return _.chain(links) | ||
| .groupBy((l) => l.deploymentId) | ||
| .mapValues((group) => | ||
| group.map((l) => ({ ref: l.jobAgentId, config: l.config })), | ||
| ) | ||
| .value(); | ||
| }; | ||
|
|
||
| const parseSelector = (raw: string | null | undefined): string | undefined => { | ||
| if (raw == null || raw === "false") return undefined; | ||
| return raw; | ||
|
|
@@ -126,14 +108,8 @@ const listDeployments: AsyncTypedHandler< | |
| systemsByDeploymentId.set(link.deploymentId, arr); | ||
| } | ||
|
|
||
| const agentsByDeploymentId = await getJobAgentsByDeploymentId(deploymentIds); | ||
| const items = deployments.map((dep) => ({ | ||
| deployment: { | ||
| ...formatDeployment(dep), | ||
| jobAgents: (agentsByDeploymentId[dep.id] ?? []).map( | ||
| ({ ref, config }) => ({ ref, config }), | ||
| ), | ||
| }, | ||
| deployment: formatDeployment(dep), | ||
| systems: (systemsByDeploymentId.get(dep.id) ?? []).map(formatSystem), | ||
| })); | ||
|
Comment on lines
108
to
114
|
||
|
|
||
|
|
@@ -155,8 +131,6 @@ const getDeployment: AsyncTypedHandler< | |
|
|
||
| if (dep == null) throw new ApiError("Deployment not found", 404); | ||
|
|
||
| const agentsByDeploymentId = await getJobAgentsByDeploymentId([deploymentId]); | ||
|
|
||
| const systemRows = await db | ||
| .select({ system: schema.system }) | ||
| .from(schema.systemDeployment) | ||
|
|
@@ -196,12 +170,7 @@ const getDeployment: AsyncTypedHandler< | |
| } | ||
|
|
||
| res.status(200).json({ | ||
| deployment: { | ||
| ...formatDeployment(dep), | ||
| jobAgents: (agentsByDeploymentId[dep.id] ?? []).map( | ||
| ({ ref, config }) => ({ ref, config }), | ||
| ), | ||
| }, | ||
| deployment: formatDeployment(dep), | ||
| systems: systemRows.map((r) => formatSystem(r.system)), | ||
| variables: variables.map((v) => ({ | ||
| variable: { | ||
|
|
@@ -234,48 +203,17 @@ const postDeployment: AsyncTypedHandler< | |
|
|
||
| const id = uuidv4(); | ||
|
|
||
| const jobAgentId = body.jobAgentId ?? body.jobAgents?.[0]?.ref; | ||
| if (jobAgentId != null && !z.string().uuid().safeParse(jobAgentId).success) | ||
| throw new ApiError("Invalid job agent ID", 400); | ||
|
|
||
| const jobAgentConfig = | ||
| body.jobAgentConfig ?? body.jobAgents?.[0]?.config ?? {}; | ||
|
|
||
| await db.insert(schema.deployment).values({ | ||
| id, | ||
| name: body.name, | ||
| description: body.description ?? "", | ||
| resourceSelector: body.resourceSelector ?? "false", | ||
| jobAgentSelector: | ||
| body.jobAgentSelector ?? | ||
| (jobAgentId ? `jobAgent.id == "${jobAgentId}"` : "false"), | ||
| jobAgentConfig, | ||
| jobAgentSelector: body.jobAgentSelector ?? "false", | ||
| jobAgentConfig: body.jobAgentConfig ?? {}, | ||
| metadata: body.metadata ?? {}, | ||
| workspaceId, | ||
| }); | ||
|
|
||
| if (jobAgentId) | ||
| await db | ||
| .insert(schema.deploymentJobAgent) | ||
| .values({ | ||
| deploymentId: id, | ||
| jobAgentId, | ||
| config: jobAgentConfig, | ||
| }) | ||
| .onConflictDoNothing(); | ||
|
|
||
| if (body.jobAgents != null && body.jobAgents.length > 0) | ||
| await db | ||
| .insert(schema.deploymentJobAgent) | ||
| .values( | ||
| body.jobAgents.map((agent) => ({ | ||
| deploymentId: id, | ||
| jobAgentId: agent.ref, | ||
| config: agent.config, | ||
| })), | ||
| ) | ||
| .onConflictDoNothing(); | ||
|
|
||
| enqueueReleaseTargetsForDeployment(db, workspaceId, id); | ||
|
|
||
| res.status(202).json({ id, message: "Deployment creation requested" }); | ||
|
|
@@ -291,12 +229,7 @@ const upsertDeployment: AsyncTypedHandler< | |
| const isValid = validResourceSelector(body.resourceSelector); | ||
| if (!isValid) throw new ApiError("Invalid resource selector", 400); | ||
|
|
||
| const jobAgentId = body.jobAgentId ?? body.jobAgents?.[0]?.ref; | ||
| if (jobAgentId != null && !z.string().uuid().safeParse(jobAgentId).success) | ||
| throw new ApiError("Invalid job agent ID", 400); | ||
|
|
||
| const jobAgentConfig = | ||
| body.jobAgentConfig ?? body.jobAgents?.[0]?.config ?? {}; | ||
| const jobAgentConfig = body.jobAgentConfig ?? {}; | ||
|
|
||
| await db | ||
| .insert(schema.deployment) | ||
|
|
@@ -305,9 +238,7 @@ const upsertDeployment: AsyncTypedHandler< | |
| name: body.name, | ||
| description: body.description ?? "", | ||
| resourceSelector: body.resourceSelector ?? "false", | ||
| jobAgentSelector: | ||
| body.jobAgentSelector ?? | ||
| (jobAgentId ? `jobAgent.id == "${jobAgentId}"` : "false"), | ||
| jobAgentSelector: body.jobAgentSelector ?? "false", | ||
| jobAgentConfig, | ||
| metadata: body.metadata ?? {}, | ||
| workspaceId, | ||
|
|
@@ -321,50 +252,10 @@ const upsertDeployment: AsyncTypedHandler< | |
| metadata: body.metadata ?? {}, | ||
| ...(body.jobAgentSelector != null | ||
| ? { jobAgentSelector: body.jobAgentSelector, jobAgentConfig } | ||
| : jobAgentId != null | ||
| ? { | ||
| jobAgentSelector: `jobAgent.id == "${jobAgentId}"`, | ||
| jobAgentConfig, | ||
| } | ||
| : {}), | ||
| : {}), | ||
| }, | ||
| }); | ||
|
|
||
| if (jobAgentId) | ||
| await db | ||
| .insert(schema.deploymentJobAgent) | ||
| .values({ | ||
| deploymentId, | ||
| jobAgentId, | ||
| config: jobAgentConfig, | ||
| }) | ||
| .onConflictDoUpdate({ | ||
| target: [ | ||
| schema.deploymentJobAgent.deploymentId, | ||
| schema.deploymentJobAgent.jobAgentId, | ||
| ], | ||
| set: { config: jobAgentConfig }, | ||
| }); | ||
|
|
||
| if (body.jobAgents != null) | ||
| await db.transaction(async (tx) => { | ||
| await tx | ||
| .delete(schema.deploymentJobAgent) | ||
| .where(eq(schema.deploymentJobAgent.deploymentId, deploymentId)); | ||
|
|
||
| if (body.jobAgents!.length > 0) | ||
| await tx | ||
| .insert(schema.deploymentJobAgent) | ||
| .values( | ||
| body.jobAgents!.map((agent) => ({ | ||
| deploymentId, | ||
| jobAgentId: agent.ref, | ||
| config: agent.config, | ||
| })), | ||
| ) | ||
| .onConflictDoNothing(); | ||
| }); | ||
|
|
||
| enqueueReleaseTargetsForDeployment(db, workspaceId, deploymentId); | ||
|
|
||
| res | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This OpenAPI change removes
jobAgentId/jobAgentsfrom deployment requests/responses. Please ensure any generated clients/schemas are regenerated and any tests updated accordingly (e.g. the generated TS client types and e2e tests that still referenceDeploymentJobAgent/jobAgents).