Skip to content

Commit 244c79e

Browse files
committed
Add TRIGGER_ENV env var to runs
#1557
1 parent ca05a54 commit 244c79e

File tree

5 files changed

+9
-0
lines changed

5 files changed

+9
-0
lines changed

apps/coordinator/src/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@ class TaskCoordinator {
410410
setSocketDataFromHeader("runId", "x-trigger-run-id");
411411
setSocketDataFromHeader("attemptFriendlyId", "x-trigger-attempt-friendly-id", false);
412412
setSocketDataFromHeader("attemptNumber", "x-trigger-attempt-number", false);
413+
setSocketDataFromHeader("env", "x-trigger-env");
413414
setSocketDataFromHeader("envId", "x-trigger-env-id");
414415
setSocketDataFromHeader("deploymentId", "x-trigger-deployment-id");
415416
setSocketDataFromHeader("deploymentVersion", "x-trigger-deployment-version");

apps/docker-provider/src/index.ts

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ class DockerTaskOperations implements TaskOperations {
118118
"--detach",
119119
`--env=TRIGGER_ENV_ID=${opts.envId}`,
120120
`--env=TRIGGER_RUN_ID=${opts.runId}`,
121+
`--env=TRIGGER_ENV=${opts.envType}`,
121122
`--env=OTEL_EXPORTER_OTLP_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT}`,
122123
`--env=POD_NAME=${containerName}`,
123124
`--env=COORDINATOR_HOST=${COORDINATOR_HOST}`,

apps/kubernetes-provider/src/index.ts

+4
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,10 @@ class KubernetesTaskOperations implements TaskOperations {
202202
name: "TRIGGER_RUN_ID",
203203
value: opts.runId,
204204
},
205+
{
206+
name: "TRIGGER_ENV",
207+
value: opts.envType,
208+
},
205209
],
206210
volumeMounts: [
207211
{

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

+2
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ cliLogger.debug("Starting prod worker", {
5555
class ProdWorker {
5656
private contentHash = env.TRIGGER_CONTENT_HASH!;
5757
private projectRef = env.TRIGGER_PROJECT_REF!;
58+
private env = env.TRIGGER_ENV!;
5859
private envId = env.TRIGGER_ENV_ID!;
5960
private runId = env.TRIGGER_RUN_ID!;
6061
private deploymentId = env.TRIGGER_DEPLOYMENT_ID!;
@@ -661,6 +662,7 @@ class ProdWorker {
661662
"x-trigger-content-hash": this.contentHash,
662663
"x-trigger-project-ref": this.projectRef,
663664
"x-trigger-env-id": this.envId,
665+
"x-trigger-env": this.env,
664666
"x-trigger-deployment-id": this.deploymentId,
665667
"x-trigger-run-id": this.runId,
666668
"x-trigger-deployment-version": this.deploymentVersion,

packages/core/src/v3/schemas/messages.ts

+1
Original file line numberDiff line numberDiff line change
@@ -880,6 +880,7 @@ export const ProdWorkerSocketData = z.object({
880880
contentHash: z.string(),
881881
projectRef: z.string(),
882882
envId: z.string(),
883+
env: z.string(),
883884
runId: z.string(),
884885
attemptFriendlyId: z.string().optional(),
885886
attemptNumber: z.string().optional(),

0 commit comments

Comments
 (0)