Skip to content

Commit 50c256f

Browse files
adityachoudhari26adityachoudhari26
authored
refactor: drop old deployment agent table (#943)
1 parent 9a2a5ae commit 50c256f

28 files changed

Lines changed: 6497 additions & 514 deletions

File tree

‎apps/api/openapi/openapi.json‎

Lines changed: 2 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,10 @@
5151
"additionalProperties": true,
5252
"type": "object"
5353
},
54-
"jobAgentId": {
55-
"type": "string"
56-
},
5754
"jobAgentSelector": {
58-
"description": "CEL expression to match job agents. Defaults to jobAgent.id == \"<jobAgentId>\" if not provided.",
55+
"description": "CEL expression to match job agents",
5956
"type": "string"
6057
},
61-
"jobAgents": {
62-
"items": {
63-
"$ref": "#/components/schemas/DeploymentJobAgent"
64-
},
65-
"type": "array"
66-
},
6758
"metadata": {
6859
"additionalProperties": {
6960
"type": "string"
@@ -456,19 +447,10 @@
456447
"additionalProperties": true,
457448
"type": "object"
458449
},
459-
"jobAgentId": {
460-
"type": "string"
461-
},
462450
"jobAgentSelector": {
463451
"description": "CEL expression to match job agents",
464452
"type": "string"
465453
},
466-
"jobAgents": {
467-
"items": {
468-
"$ref": "#/components/schemas/DeploymentJobAgent"
469-
},
470-
"type": "array"
471-
},
472454
"metadata": {
473455
"additionalProperties": {
474456
"type": "string"
@@ -525,26 +507,6 @@
525507
],
526508
"type": "object"
527509
},
528-
"DeploymentJobAgent": {
529-
"properties": {
530-
"config": {
531-
"$ref": "#/components/schemas/JobAgentConfig"
532-
},
533-
"ref": {
534-
"type": "string"
535-
},
536-
"selector": {
537-
"description": "CEL expression to determine if the job agent should be used",
538-
"type": "string"
539-
}
540-
},
541-
"required": [
542-
"ref",
543-
"config",
544-
"selector"
545-
],
546-
"type": "object"
547-
},
548510
"DeploymentPlan": {
549511
"properties": {
550512
"id": {
@@ -2593,19 +2555,10 @@
25932555
"additionalProperties": true,
25942556
"type": "object"
25952557
},
2596-
"jobAgentId": {
2597-
"type": "string"
2598-
},
25992558
"jobAgentSelector": {
2600-
"description": "CEL expression to match job agents. Defaults to jobAgent.id == \"<jobAgentId>\" if not provided.",
2559+
"description": "CEL expression to match job agents",
26012560
"type": "string"
26022561
},
2603-
"jobAgents": {
2604-
"items": {
2605-
"$ref": "#/components/schemas/DeploymentJobAgent"
2606-
},
2607-
"type": "array"
2608-
},
26092562
"metadata": {
26102563
"additionalProperties": {
26112564
"type": "string"

‎apps/api/openapi/schemas/deployments.jsonnet‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@ local jobAgentConfig = {
66
};
77

88
{
9-
DeploymentJobAgent: {
10-
type: 'object',
11-
required: ['ref', 'config', 'selector'],
12-
properties: {
13-
ref: { type: 'string' },
14-
config: openapi.schemaRef('JobAgentConfig'),
15-
selector: { type: 'string', description: 'CEL expression to determine if the job agent should be used' },
16-
},
17-
},
189

1910
CreateDeploymentRequest: {
2011
type: 'object',
@@ -23,10 +14,8 @@ local jobAgentConfig = {
2314
name: { type: 'string' },
2415
slug: { type: 'string' },
2516
description: { type: 'string' },
26-
jobAgentId: { type: 'string' },
27-
jobAgentSelector: { type: 'string', description: 'CEL expression to match job agents. Defaults to jobAgent.id == "<jobAgentId>" if not provided.' },
17+
jobAgentSelector: { type: 'string', description: 'CEL expression to match job agents' },
2818
jobAgentConfig: jobAgentConfig,
29-
jobAgents: { type: 'array', items: openapi.schemaRef('DeploymentJobAgent') },
3019
resourceSelector: { type: 'string', description: 'CEL expression to determine if the deployment should be used' },
3120
metadata: { type: 'object', additionalProperties: { type: 'string' } },
3221
},
@@ -39,10 +28,8 @@ local jobAgentConfig = {
3928
name: { type: 'string' },
4029
slug: { type: 'string' },
4130
description: { type: 'string' },
42-
jobAgentId: { type: 'string' },
43-
jobAgentSelector: { type: 'string', description: 'CEL expression to match job agents. Defaults to jobAgent.id == "<jobAgentId>" if not provided.' },
31+
jobAgentSelector: { type: 'string', description: 'CEL expression to match job agents' },
4432
jobAgentConfig: jobAgentConfig,
45-
jobAgents: { type: 'array', items: openapi.schemaRef('DeploymentJobAgent') },
4633
resourceSelector: { type: 'string', description: 'CEL expression to determine if the deployment should be used' },
4734
metadata: { type: 'object', additionalProperties: { type: 'string' } },
4835
},
@@ -65,10 +52,8 @@ local jobAgentConfig = {
6552
name: { type: 'string' },
6653
slug: { type: 'string' },
6754
description: { type: 'string' },
68-
jobAgentId: { type: 'string' },
6955
jobAgentSelector: { type: 'string', description: 'CEL expression to match job agents' },
7056
jobAgentConfig: jobAgentConfig,
71-
jobAgents: { type: 'array', items: openapi.schemaRef('DeploymentJobAgent') },
7257
resourceSelector: { type: 'string', description: 'CEL expression to determine if the deployment should be used' },
7358
metadata: { type: 'object', additionalProperties: { type: 'string' } },
7459
},

‎apps/api/src/routes/v1/workspaces/deployments.ts‎

Lines changed: 7 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import type { AsyncTypedHandler } from "@/types/api.js";
22
import { ApiError, asyncHandler } from "@/types/api.js";
33
import { Router } from "express";
4-
import _ from "lodash";
54
import { v4 as uuidv4 } from "uuid";
6-
import { z } from "zod";
75

86
import { and, asc, count, desc, eq, inArray, takeFirst } from "@ctrlplane/db";
97
import { db } from "@ctrlplane/db/client";
@@ -21,22 +19,6 @@ import { listDeploymentVariablesByDeploymentRouter } from "./deployment-variable
2119

2220
const PLAN_TTL_MS = 60 * 60 * 1000;
2321

24-
const getJobAgentsByDeploymentId = async (
25-
deploymentIds: string[],
26-
): Promise<Record<string, { ref: string; config: Record<string, any> }[]>> => {
27-
if (deploymentIds.length === 0) return {};
28-
const links = await db
29-
.select()
30-
.from(schema.deploymentJobAgent)
31-
.where(inArray(schema.deploymentJobAgent.deploymentId, deploymentIds));
32-
return _.chain(links)
33-
.groupBy((l) => l.deploymentId)
34-
.mapValues((group) =>
35-
group.map((l) => ({ ref: l.jobAgentId, config: l.config })),
36-
)
37-
.value();
38-
};
39-
4022
const parseSelector = (raw: string | null | undefined): string | undefined => {
4123
if (raw == null || raw === "false") return undefined;
4224
return raw;
@@ -126,14 +108,8 @@ const listDeployments: AsyncTypedHandler<
126108
systemsByDeploymentId.set(link.deploymentId, arr);
127109
}
128110

129-
const agentsByDeploymentId = await getJobAgentsByDeploymentId(deploymentIds);
130111
const items = deployments.map((dep) => ({
131-
deployment: {
132-
...formatDeployment(dep),
133-
jobAgents: (agentsByDeploymentId[dep.id] ?? []).map(
134-
({ ref, config }) => ({ ref, config }),
135-
),
136-
},
112+
deployment: formatDeployment(dep),
137113
systems: (systemsByDeploymentId.get(dep.id) ?? []).map(formatSystem),
138114
}));
139115

@@ -155,8 +131,6 @@ const getDeployment: AsyncTypedHandler<
155131

156132
if (dep == null) throw new ApiError("Deployment not found", 404);
157133

158-
const agentsByDeploymentId = await getJobAgentsByDeploymentId([deploymentId]);
159-
160134
const systemRows = await db
161135
.select({ system: schema.system })
162136
.from(schema.systemDeployment)
@@ -196,12 +170,7 @@ const getDeployment: AsyncTypedHandler<
196170
}
197171

198172
res.status(200).json({
199-
deployment: {
200-
...formatDeployment(dep),
201-
jobAgents: (agentsByDeploymentId[dep.id] ?? []).map(
202-
({ ref, config }) => ({ ref, config }),
203-
),
204-
},
173+
deployment: formatDeployment(dep),
205174
systems: systemRows.map((r) => formatSystem(r.system)),
206175
variables: variables.map((v) => ({
207176
variable: {
@@ -234,48 +203,17 @@ const postDeployment: AsyncTypedHandler<
234203

235204
const id = uuidv4();
236205

237-
const jobAgentId = body.jobAgentId ?? body.jobAgents?.[0]?.ref;
238-
if (jobAgentId != null && !z.string().uuid().safeParse(jobAgentId).success)
239-
throw new ApiError("Invalid job agent ID", 400);
240-
241-
const jobAgentConfig =
242-
body.jobAgentConfig ?? body.jobAgents?.[0]?.config ?? {};
243-
244206
await db.insert(schema.deployment).values({
245207
id,
246208
name: body.name,
247209
description: body.description ?? "",
248210
resourceSelector: body.resourceSelector ?? "false",
249-
jobAgentSelector:
250-
body.jobAgentSelector ??
251-
(jobAgentId ? `jobAgent.id == "${jobAgentId}"` : "false"),
252-
jobAgentConfig,
211+
jobAgentSelector: body.jobAgentSelector ?? "false",
212+
jobAgentConfig: body.jobAgentConfig ?? {},
253213
metadata: body.metadata ?? {},
254214
workspaceId,
255215
});
256216

257-
if (jobAgentId)
258-
await db
259-
.insert(schema.deploymentJobAgent)
260-
.values({
261-
deploymentId: id,
262-
jobAgentId,
263-
config: jobAgentConfig,
264-
})
265-
.onConflictDoNothing();
266-
267-
if (body.jobAgents != null && body.jobAgents.length > 0)
268-
await db
269-
.insert(schema.deploymentJobAgent)
270-
.values(
271-
body.jobAgents.map((agent) => ({
272-
deploymentId: id,
273-
jobAgentId: agent.ref,
274-
config: agent.config,
275-
})),
276-
)
277-
.onConflictDoNothing();
278-
279217
enqueueReleaseTargetsForDeployment(db, workspaceId, id);
280218

281219
res.status(202).json({ id, message: "Deployment creation requested" });
@@ -291,12 +229,7 @@ const upsertDeployment: AsyncTypedHandler<
291229
const isValid = validResourceSelector(body.resourceSelector);
292230
if (!isValid) throw new ApiError("Invalid resource selector", 400);
293231

294-
const jobAgentId = body.jobAgentId ?? body.jobAgents?.[0]?.ref;
295-
if (jobAgentId != null && !z.string().uuid().safeParse(jobAgentId).success)
296-
throw new ApiError("Invalid job agent ID", 400);
297-
298-
const jobAgentConfig =
299-
body.jobAgentConfig ?? body.jobAgents?.[0]?.config ?? {};
232+
const jobAgentConfig = body.jobAgentConfig ?? {};
300233

301234
await db
302235
.insert(schema.deployment)
@@ -305,9 +238,7 @@ const upsertDeployment: AsyncTypedHandler<
305238
name: body.name,
306239
description: body.description ?? "",
307240
resourceSelector: body.resourceSelector ?? "false",
308-
jobAgentSelector:
309-
body.jobAgentSelector ??
310-
(jobAgentId ? `jobAgent.id == "${jobAgentId}"` : "false"),
241+
jobAgentSelector: body.jobAgentSelector ?? "false",
311242
jobAgentConfig,
312243
metadata: body.metadata ?? {},
313244
workspaceId,
@@ -321,50 +252,10 @@ const upsertDeployment: AsyncTypedHandler<
321252
metadata: body.metadata ?? {},
322253
...(body.jobAgentSelector != null
323254
? { jobAgentSelector: body.jobAgentSelector, jobAgentConfig }
324-
: jobAgentId != null
325-
? {
326-
jobAgentSelector: `jobAgent.id == "${jobAgentId}"`,
327-
jobAgentConfig,
328-
}
329-
: {}),
255+
: {}),
330256
},
331257
});
332258

333-
if (jobAgentId)
334-
await db
335-
.insert(schema.deploymentJobAgent)
336-
.values({
337-
deploymentId,
338-
jobAgentId,
339-
config: jobAgentConfig,
340-
})
341-
.onConflictDoUpdate({
342-
target: [
343-
schema.deploymentJobAgent.deploymentId,
344-
schema.deploymentJobAgent.jobAgentId,
345-
],
346-
set: { config: jobAgentConfig },
347-
});
348-
349-
if (body.jobAgents != null)
350-
await db.transaction(async (tx) => {
351-
await tx
352-
.delete(schema.deploymentJobAgent)
353-
.where(eq(schema.deploymentJobAgent.deploymentId, deploymentId));
354-
355-
if (body.jobAgents!.length > 0)
356-
await tx
357-
.insert(schema.deploymentJobAgent)
358-
.values(
359-
body.jobAgents!.map((agent) => ({
360-
deploymentId,
361-
jobAgentId: agent.ref,
362-
config: agent.config,
363-
})),
364-
)
365-
.onConflictDoNothing();
366-
});
367-
368259
enqueueReleaseTargetsForDeployment(db, workspaceId, deploymentId);
369260

370261
res

‎apps/api/src/types/openapi.ts‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,10 +1063,8 @@ export interface components {
10631063
jobAgentConfig?: {
10641064
[key: string]: unknown;
10651065
};
1066-
jobAgentId?: string;
1067-
/** @description CEL expression to match job agents. Defaults to jobAgent.id == "<jobAgentId>" if not provided. */
1066+
/** @description CEL expression to match job agents */
10681067
jobAgentSelector?: string;
1069-
jobAgents?: components["schemas"]["DeploymentJobAgent"][];
10701068
metadata?: {
10711069
[key: string]: string;
10721070
};
@@ -1223,10 +1221,8 @@ export interface components {
12231221
jobAgentConfig: {
12241222
[key: string]: unknown;
12251223
};
1226-
jobAgentId?: string;
12271224
/** @description CEL expression to match job agents */
12281225
jobAgentSelector: string;
1229-
jobAgents?: components["schemas"]["DeploymentJobAgent"][];
12301226
metadata?: {
12311227
[key: string]: string;
12321228
};
@@ -1243,12 +1239,6 @@ export interface components {
12431239
/** @description CEL expression to match upstream deployment(s) that must have a successful release before this deployment can proceed. */
12441240
dependsOn: string;
12451241
};
1246-
DeploymentJobAgent: {
1247-
config: components["schemas"]["JobAgentConfig"];
1248-
ref: string;
1249-
/** @description CEL expression to determine if the job agent should be used */
1250-
selector: string;
1251-
};
12521242
DeploymentPlan: {
12531243
id: string;
12541244
/** @enum {string} */
@@ -1961,10 +1951,8 @@ export interface components {
19611951
jobAgentConfig?: {
19621952
[key: string]: unknown;
19631953
};
1964-
jobAgentId?: string;
1965-
/** @description CEL expression to match job agents. Defaults to jobAgent.id == "<jobAgentId>" if not provided. */
1954+
/** @description CEL expression to match job agents */
19661955
jobAgentSelector?: string;
1967-
jobAgents?: components["schemas"]["DeploymentJobAgent"][];
19681956
metadata?: {
19691957
[key: string]: string;
19701958
};

0 commit comments

Comments
 (0)