diff --git a/crates/node_executor/src/executor.rs b/crates/node_executor/src/executor.rs index 38fa7c74..d14e6470 100644 --- a/crates/node_executor/src/executor.rs +++ b/crates/node_executor/src/executor.rs @@ -519,10 +519,9 @@ impl TryFrom for JsonValue { "userIdentity": r.user_identity.map(JsonValue::try_from).transpose()?, "environmentVariables": JsonValue::Array(environment_variables), "npmVersion": npm_version.map(|v| v.to_string()), - // TODO(CX-5733): Migrate and remove. - "parentScheduledJob": r.context.parent_scheduled_job.map(|id| id.to_string()), - // TODO(presley): Rename this to executionContext - "requestContext": JsonValue::from(r.context), + // TODO(presley): Remove `requestContext` after a backend push. + "requestContext": JsonValue::from(r.context.clone()), + "executionContext": JsonValue::from(r.context), }) }, ExecutorRequest::Analyze(r) => { diff --git a/npm-packages/node-executor/src/executor.ts b/npm-packages/node-executor/src/executor.ts index 3d19cd46..5099fb6f 100644 --- a/npm-packages/node-executor/src/executor.ts +++ b/npm-packages/node-executor/src/executor.ts @@ -116,8 +116,9 @@ export type ExecuteRequest = { environmentVariables: EnvironmentVariable[]; timeoutSecs: number; npmVersion: string | null; - // TODO(presley): Rename this to executionContext + // TODO(presley): Remove requestContext and make executionContext non-optional. requestContext: ExecutionContext; + executionContext: ExecutionContext | null; }; export type ExecutionContext = { @@ -182,7 +183,7 @@ export async function execute( request.backendCallbackToken, request.authHeader, request.userIdentity, - request.requestContext, + request.executionContext ?? request.requestContext, ); let innerResult: ExecuteResponseInner;