Skip to content

Commit f9c84c1

Browse files
author
deepshekhardas
committed
fix: resolve deployment resource exhaustion and improve attribute flattening
1 parent ba320a4 commit f9c84c1

13 files changed

Lines changed: 571 additions & 64 deletions

File tree

‎apps/webapp/app/components/runs/v3/RunFilters.tsx‎

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ function TasksDropdown({
635635
<SelectProvider value={values("tasks")} setValue={handleChange} virtualFocus={true}>
636636
{trigger}
637637
<SelectPopover
638-
className="min-w-0 max-w-[min(360px,var(--popover-available-width))]"
638+
className="min-w-0 max-w-[min(500px,var(--popover-available-width))]"
639639
hideOnEscape={() => {
640640
if (onClose) {
641641
onClose();
@@ -655,7 +655,7 @@ function TasksDropdown({
655655
<TaskTriggerSourceIcon source={item.triggerSource} className="size-4 flex-none" />
656656
}
657657
>
658-
<MiddleTruncate text={item.slug}/>
658+
<MiddleTruncate text={item.slug} />
659659
</SelectItem>
660660
))}
661661
</SelectList>
@@ -896,10 +896,10 @@ function TagsDropdown({
896896
<SelectList>
897897
{filtered.length > 0
898898
? filtered.map((tag, index) => (
899-
<SelectItem key={tag} value={tag}>
900-
{tag}
901-
</SelectItem>
902-
))
899+
<SelectItem key={tag} value={tag}>
900+
{tag}
901+
</SelectItem>
902+
))
903903
: null}
904904
{filtered.length === 0 && fetcher.state !== "loading" && (
905905
<SelectItem disabled>No tags found</SelectItem>
@@ -981,8 +981,7 @@ function QueuesDropdown({
981981
searchParams.set("query", s);
982982
}
983983
fetcher.load(
984-
`/resources/orgs/${organization.slug}/projects/${project.slug}/env/${
985-
environment.slug
984+
`/resources/orgs/${organization.slug}/projects/${project.slug}/env/${environment.slug
986985
}/queues?${searchParams.toString()}`
987986
);
988987
},
@@ -1054,20 +1053,20 @@ function QueuesDropdown({
10541053
<SelectList>
10551054
{filtered.length > 0
10561055
? filtered.map((queue) => (
1057-
<SelectItem
1058-
key={queue.value}
1059-
value={queue.value}
1060-
icon={
1061-
queue.type === "task" ? (
1062-
<TaskIcon className="size-4 shrink-0 text-blue-500" />
1063-
) : (
1064-
<RectangleStackIcon className="size-4 shrink-0 text-purple-500" />
1065-
)
1066-
}
1067-
>
1068-
{queue.name}
1069-
</SelectItem>
1070-
))
1056+
<SelectItem
1057+
key={queue.value}
1058+
value={queue.value}
1059+
icon={
1060+
queue.type === "task" ? (
1061+
<TaskIcon className="size-4 shrink-0 text-blue-500" />
1062+
) : (
1063+
<RectangleStackIcon className="size-4 shrink-0 text-purple-500" />
1064+
)
1065+
}
1066+
>
1067+
{queue.name}
1068+
</SelectItem>
1069+
))
10711070
: null}
10721071
{filtered.length === 0 && fetcher.state !== "loading" && (
10731072
<SelectItem disabled>No queues found</SelectItem>
@@ -1243,8 +1242,7 @@ function VersionsDropdown({
12431242
searchParams.set("query", s);
12441243
}
12451244
fetcher.load(
1246-
`/resources/orgs/${organization.slug}/projects/${project.slug}/env/${
1247-
environment.slug
1245+
`/resources/orgs/${organization.slug}/projects/${project.slug}/env/${environment.slug
12481246
}/versions?${searchParams.toString()}`
12491247
);
12501248
},
@@ -1305,13 +1303,13 @@ function VersionsDropdown({
13051303
<SelectList>
13061304
{filtered.length > 0
13071305
? filtered.map((version) => (
1308-
<SelectItem key={version.version} value={version.version}>
1309-
<span className="flex items-center gap-2">
1310-
<span className="grow truncate">{version.version}</span>
1311-
{version.isCurrent ? <Badge variant="extra-small">Current</Badge> : null}
1312-
</span>
1313-
</SelectItem>
1314-
))
1306+
<SelectItem key={version.version} value={version.version}>
1307+
<span className="flex items-center gap-2">
1308+
<span className="grow truncate">{version.version}</span>
1309+
{version.isCurrent ? <Badge variant="extra-small">Current</Badge> : null}
1310+
</span>
1311+
</SelectItem>
1312+
))
13151313
: null}
13161314
{filtered.length === 0 && fetcher.state !== "loading" && (
13171315
<SelectItem disabled>No versions found</SelectItem>

‎apps/webapp/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@codemirror/view": "6.7.2",
5050
"@conform-to/react": "0.9.2",
5151
"@conform-to/zod": "0.9.2",
52-
"@depot/cli": "0.0.1-cli.2.80.0",
52+
"@depot/cli": "0.0.1-cli.2.101.3",
5353
"@depot/sdk-node": "^1.0.0",
5454
"@electric-sql/react": "^0.3.5",
5555
"@headlessui/react": "^1.7.8",
@@ -298,4 +298,4 @@
298298
"engines": {
299299
"node": ">=18.19.0 || >=20.6.0"
300300
}
301-
}
301+
}

‎packages/cli-v3/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
},
8383
"dependencies": {
8484
"@clack/prompts": "0.11.0",
85-
"@depot/cli": "0.0.1-cli.2.80.0",
85+
"@depot/cli": "0.0.1-cli.2.101.3",
8686
"@modelcontextprotocol/sdk": "^1.25.2",
8787
"@opentelemetry/api": "1.9.0",
8888
"@opentelemetry/api-logs": "0.203.0",
@@ -159,4 +159,4 @@
159159
}
160160
}
161161
}
162-
}
162+
}

‎packages/cli-v3/src/build/buildWorker.ts‎

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ import {
88
resolvePluginsForContext,
99
} from "./extensions.js";
1010
import { createExternalsBuildExtension } from "./externals.js";
11-
import { join, relative, sep } from "node:path";
11+
import { join, relative, sep, basename } from "node:path";
1212
import { generateContainerfile } from "../deploy/buildImage.js";
1313
import { writeFile } from "node:fs/promises";
14+
import fsModule from "node:fs/promises";
1415
import { buildManifestToJSON } from "../utilities/buildManifest.js";
1516
import { readPackageJSON } from "pkg-types";
1617
import { writeJSONFile } from "../utilities/fileSystem.js";
@@ -53,16 +54,16 @@ export async function buildWorker(options: BuildWorkerOptions) {
5354
const buildContext = createBuildContext(options.target, resolvedConfig, {
5455
logger: options.plain
5556
? {
56-
debug: (...args) => console.log(...args),
57-
log: (...args) => console.log(...args),
58-
warn: (...args) => console.log(...args),
59-
progress: (message) => console.log(message),
60-
spinner: (message) => {
61-
const $spinner = spinner({ plain: true });
62-
$spinner.start(message);
63-
return $spinner;
64-
},
65-
}
57+
debug: (...args) => console.log(...args),
58+
log: (...args) => console.log(...args),
59+
warn: (...args) => console.log(...args),
60+
progress: (message) => console.log(message),
61+
spinner: (message) => {
62+
const $spinner = spinner({ plain: true });
63+
$spinner.start(message);
64+
return $spinner;
65+
},
66+
}
6667
: undefined,
6768
});
6869
buildContext.prependExtension(externalsExtension);
@@ -196,6 +197,7 @@ async function writeDeployFiles({
196197
join(outputPath, "package.json"),
197198
{
198199
...packageJson,
200+
version: "0.0.0", // Strip version for better docker caching
199201
name: packageJson.name ?? "trigger-project",
200202
dependencies: {
201203
...dependencies,
@@ -208,8 +210,13 @@ async function writeDeployFiles({
208210
true
209211
);
210212

213+
if (resolvedConfig.lockfilePath) {
214+
const lockfileName = basename(resolvedConfig.lockfilePath);
215+
await fsModule.copyFile(resolvedConfig.lockfilePath, join(outputPath, lockfileName));
216+
}
217+
211218
await writeJSONFile(join(outputPath, "build.json"), buildManifestToJSON(buildManifest));
212-
await writeContainerfile(outputPath, buildManifest);
219+
await writeContainerfile(outputPath, buildManifest, resolvedConfig.lockfilePath);
213220
}
214221

215222
async function readProjectPackageJson(packageJsonPath: string) {
@@ -218,17 +225,31 @@ async function readProjectPackageJson(packageJsonPath: string) {
218225
return packageJson;
219226
}
220227

221-
async function writeContainerfile(outputPath: string, buildManifest: BuildManifest) {
228+
async function writeContainerfile(
229+
outputPath: string,
230+
buildManifest: BuildManifest,
231+
lockfilePath?: string
232+
) {
222233
if (!buildManifest.runControllerEntryPoint || !buildManifest.indexControllerEntryPoint) {
223234
throw new Error("Something went wrong with the build. Aborting deployment. [code 7789]");
224235
}
225236

237+
const packageManager = lockfilePath
238+
? lockfilePath.endsWith("pnpm-lock.yaml")
239+
? ("pnpm" as const)
240+
: lockfilePath.endsWith("yarn.lock")
241+
? ("yarn" as const)
242+
: ("npm" as const)
243+
: undefined;
244+
226245
const containerfile = await generateContainerfile({
227246
runtime: buildManifest.runtime,
228247
entrypoint: buildManifest.runControllerEntryPoint,
229248
build: buildManifest.build,
230249
image: buildManifest.image,
231250
indexScript: buildManifest.indexControllerEntryPoint,
251+
packageManager,
252+
lockfile: lockfilePath ? basename(lockfilePath) : undefined,
232253
});
233254

234255
const containerfilePath = join(outputPath, "Containerfile");

‎packages/cli-v3/src/build/bundle.test.ts‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
import { expect, test, vi, describe, beforeEach, afterEach } from "vitest";
2+
import { bundleWorker } from "./bundle.js";
3+
import * as esbuild from "esbuild";
4+
import { copyFile, mkdir } from "node:fs/promises";
5+
import { shims } from "./packageModules.js";
6+
import { join } from "node:path";
7+
8+
vi.mock("esbuild", () => ({
9+
build: vi.fn(),
10+
context: vi.fn(() => ({
11+
watch: vi.fn(),
12+
dispose: vi.fn(),
13+
})),
14+
}));
15+
16+
vi.mock("node:fs/promises", () => ({
17+
copyFile: vi.fn(),
18+
mkdir: vi.fn(),
19+
writeFile: vi.fn(),
20+
readdir: vi.fn(() => []),
21+
readFile: vi.fn(),
22+
}));
23+
24+
vi.mock("../utilities/fileSystem.js", () => ({
25+
createFile: vi.fn(),
26+
createFileWithStore: vi.fn(),
27+
}));
28+
29+
vi.mock("./entryPoints.js", () => ({
30+
createEntryPointManager: vi.fn(() => ({
31+
entryPoints: ["src/trigger/task.ts"],
32+
patterns: [],
33+
stop: vi.fn(),
34+
})),
35+
}));
36+
37+
vi.mock("./plugins.js", () => ({
38+
buildPlugins: vi.fn(() => []),
39+
SdkVersionExtractor: vi.fn(() => ({
40+
plugin: { name: "sdk-version" },
41+
})),
42+
}));
43+
44+
vi.mock("./manifests.js", () => ({
45+
copyManifestToDir: vi.fn(),
46+
}));
47+
48+
vi.mock("../utilities/sourceFiles.js", () => ({
49+
resolveFileSources: vi.fn(),
50+
}));
51+
52+
vi.mock("../utilities/logger.js", () => ({
53+
logger: {
54+
debug: vi.fn(),
55+
info: vi.fn(),
56+
error: vi.fn(),
57+
warn: vi.fn(),
58+
},
59+
}));
60+
61+
vi.mock("../utilities/cliOutput.js", () => ({
62+
cliLink: vi.fn(),
63+
prettyError: vi.fn(),
64+
}));
65+
66+
vi.mock("../cli/common.js", () => ({
67+
SkipLoggingError: class extends Error { },
68+
}));
69+
70+
describe("bundleWorker with Yarn PnP support", () => {
71+
beforeEach(() => {
72+
vi.clearAllMocks();
73+
});
74+
75+
test("should copy shims to .trigger/shims and use them in inject", async () => {
76+
const workingDir = "/project";
77+
const options = {
78+
target: "deploy" as const,
79+
destination: "/dist",
80+
cwd: workingDir,
81+
resolvedConfig: {
82+
workingDir,
83+
dirs: ["src/trigger"],
84+
build: {
85+
jsx: { automatic: true }
86+
}
87+
} as any,
88+
};
89+
90+
vi.mocked(esbuild.build).mockResolvedValue({
91+
outputFiles: [],
92+
metafile: {
93+
outputs: {
94+
"dist/index.mjs": {
95+
entryPoint: "src/entryPoints/managed-run-worker.js",
96+
},
97+
"dist/controller.mjs": {
98+
entryPoint: "src/entryPoints/managed-run-controller.js",
99+
},
100+
"dist/index-worker.mjs": {
101+
entryPoint: "src/entryPoints/managed-index-worker.js",
102+
},
103+
"dist/index-controller.mjs": {
104+
entryPoint: "src/entryPoints/managed-index-controller.js",
105+
},
106+
"dist/config.mjs": {
107+
entryPoint: "trigger.config.ts",
108+
}
109+
}
110+
},
111+
errors: [],
112+
warnings: [],
113+
} as any);
114+
115+
await bundleWorker(options);
116+
117+
// Verify mkdir was called for .trigger/shims
118+
expect(mkdir).toHaveBeenCalledWith(join(workingDir, ".trigger", "shims"), { recursive: true });
119+
120+
// Verify copyFile was called for each shim
121+
for (const shim of shims) {
122+
expect(copyFile).toHaveBeenCalledWith(shim, expect.stringContaining(join(".trigger", "shims")));
123+
}
124+
125+
// Verify esbuild.build was called with local shim paths in inject
126+
expect(esbuild.build).toHaveBeenCalledWith(
127+
expect.objectContaining({
128+
inject: expect.arrayContaining([expect.stringContaining(join(".trigger", "shims"))]),
129+
})
130+
);
131+
});
132+
});

0 commit comments

Comments
 (0)