Skip to content

Commit 3d21147

Browse files
committed
refactor run controller env schema
1 parent 927edea commit 3d21147

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

packages/cli-v3/src/entryPoints/managed-run-controller.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { logger } from "../utilities/logger.js";
22
import { OnWaitMessage, TaskRunProcess } from "../executions/taskRunProcess.js";
33
import { env as stdEnv } from "std-env";
44
import { z } from "zod";
5-
import { CLOUD_API_URL } from "../consts.js";
65
import { randomUUID } from "crypto";
76
import { readJSONFile } from "../utilities/fileSystem.js";
87
import {
@@ -24,20 +23,22 @@ import { io, Socket } from "socket.io-client";
2423

2524
// All IDs are friendly IDs
2625
const Env = z.object({
27-
TRIGGER_API_URL: z.string().url().default(CLOUD_API_URL),
26+
// Set at build time
2827
TRIGGER_CONTENT_HASH: z.string(),
29-
TRIGGER_WORKER_API_URL: z.string().url(),
30-
TRIGGER_WORKLOAD_CONTROLLER_ID: z.string().default(`controller_${randomUUID()}`),
3128
TRIGGER_DEPLOYMENT_ID: z.string(),
3229
TRIGGER_DEPLOYMENT_VERSION: z.string(),
33-
TRIGGER_ENV_ID: z.string(),
34-
// This is only useful for cold starts
35-
TRIGGER_RUN_ID: z.string().optional(),
36-
// This is only useful for cold starts
37-
TRIGGER_SNAPSHOT_ID: z.string().optional(),
30+
TRIGGER_PROJECT_ID: z.string(),
31+
TRIGGER_PROJECT_REF: z.string(),
3832
NODE_ENV: z.string().default("production"),
3933
NODE_EXTRA_CA_CERTS: z.string().optional(),
40-
OTEL_EXPORTER_OTLP_ENDPOINT: z.string().default("http://0.0.0.0:3030/otel"),
34+
35+
// Set at runtime
36+
TRIGGER_WORKER_API_URL: z.string().url(),
37+
TRIGGER_WORKLOAD_CONTROLLER_ID: z.string().default(`controller_${randomUUID()}`),
38+
TRIGGER_ENV_ID: z.string(),
39+
TRIGGER_RUN_ID: z.string().optional(), // This is only useful for cold starts
40+
TRIGGER_SNAPSHOT_ID: z.string().optional(), // This is only useful for cold starts
41+
OTEL_EXPORTER_OTLP_ENDPOINT: z.string().url(),
4142
TRIGGER_WARM_START_URL: z.string().optional(),
4243
TRIGGER_MACHINE_CPU: z.string().default("0"),
4344
TRIGGER_MACHINE_MEMORY: z.string().default("0"),

packages/cli-v3/src/entryPoints/unmanaged-run-controller.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ import { WorkerManifest } from "@trigger.dev/core/v3";
99
import { SupervisorSession } from "@trigger.dev/worker";
1010

1111
const Env = z.object({
12-
TRIGGER_API_URL: z.string().default(CLOUD_API_URL),
12+
TRIGGER_API_URL: z.string().url().default(CLOUD_API_URL),
1313
TRIGGER_CONTENT_HASH: z.string(),
1414
TRIGGER_WORKER_TOKEN: z.string(),
1515
TRIGGER_WORKER_INSTANCE_NAME: z.string().default(randomUUID()),
1616
TRIGGER_DEPLOYMENT_ID: z.string(),
1717
TRIGGER_DEPLOYMENT_VERSION: z.string(),
1818
NODE_ENV: z.string().default("production"),
1919
NODE_EXTRA_CA_CERTS: z.string().optional(),
20-
OTEL_EXPORTER_OTLP_ENDPOINT: z.string().default("http://0.0.0.0:3030/otel"),
20+
OTEL_EXPORTER_OTLP_ENDPOINT: z.string().url(),
2121
});
2222

2323
const env = Env.parse(stdEnv);

0 commit comments

Comments
 (0)