unify the task executor across dev & prod

Author: ericallam

apps/webapp/app/v3/marqs/sharedQueueConsumer.server.ts

@@ -300,7 +300,10 @@ export class SharedQueueConsumer {
           return;
         }
 
-        if (existingTaskRun.status !== "PENDING") {
+        if (
+          existingTaskRun.status !== "PENDING" &&
+          existingTaskRun.status !== "RETRYING_AFTER_FAILURE"
+        ) {
           logger.debug("Task run is not pending, aborting", {
             queueMessage: message.data,
             messageId: message.messageId,

packages/cli-v3/src/commands/deploy.ts

@@ -144,17 +144,17 @@ export async function deployCommand(dir: string, anyOptions: unknown) {
 
   await printStandloneInitialBanner(true);
 
-  const { config } = await readConfig(dir, {
+  const resolvedConfig = await readConfig(dir, {
     configFile: options.data.config,
     projectRef: options.data.projectRef,
   });
 
-  logger.debug("Resolved config", { config });
+  logger.debug("Resolved config", { resolvedConfig });
 
   const apiClient = new CliApiClient(authorization.config.apiUrl, authorization.config.accessToken);
 
   const deploymentEnv = await apiClient.getProjectEnv({
-    projectRef: config.project,
+    projectRef: resolvedConfig.config.project,
     env: options.data.env,
   });
 
@@ -168,19 +168,25 @@ export async function deployCommand(dir: string, anyOptions: unknown) {
   );
 
   intro(
-    `Preparing to deploy "${deploymentEnv.data.name}" (${config.project}) to ${options.data.env}`
+    `Preparing to deploy "${deploymentEnv.data.name}" (${resolvedConfig.config.project}) to ${options.data.env}`
   );
 
   // Step 1: Build the project into a temporary directory
-  const compilation = await compileProject(config, options.data);
+  const compilation = await compileProject(
+    resolvedConfig.config,
+    options.data,
+    resolvedConfig.status === "file" ? resolvedConfig.path : undefined
+  );
 
   logger.debug("Compilation result", { compilation });
 
   const environmentVariablesSpinner = spinner();
 
   environmentVariablesSpinner.start("Checking environment variables");
 
-  const environmentVariables = await environmentClient.getEnvironmentVariables(config.project);
+  const environmentVariables = await environmentClient.getEnvironmentVariables(
+    resolvedConfig.config.project
+  );
 
   if (!environmentVariables.success) {
     environmentVariablesSpinner.stop(`Failed to fetch environment variables, skipping check`);
@@ -197,7 +203,7 @@ export async function deployCommand(dir: string, anyOptions: unknown) {
         )}. Aborting deployment. ${chalk.bgBlueBright(
           terminalLink(
             "Manage env vars",
-            `${authorization.config.apiUrl}/projects/v3/${config.project}/environment-variables`
+            `${authorization.config.apiUrl}/projects/v3/${resolvedConfig.config.project}/environment-variables`
           )
         )}`
       );
@@ -239,11 +245,11 @@ export async function deployCommand(dir: string, anyOptions: unknown) {
       return buildAndPushSelfHostedImage({
         imageTag: deploymentResponse.data.imageTag,
         cwd: compilation.path,
-        projectId: config.project,
+        projectId: resolvedConfig.config.project,
         deploymentId: deploymentResponse.data.id,
         deploymentVersion: version,
         contentHash: deploymentResponse.data.contentHash,
-        projectRef: config.project,
+        projectRef: resolvedConfig.config.project,
         buildPlatform: options.data.buildPlatform,
       });
     }
@@ -263,11 +269,11 @@ export async function deployCommand(dir: string, anyOptions: unknown) {
       buildToken: deploymentResponse.data.externalBuildData.buildToken,
       buildProjectId: deploymentResponse.data.externalBuildData.projectId,
       cwd: compilation.path,
-      projectId: config.project,
+      projectId: resolvedConfig.config.project,
       deploymentId: deploymentResponse.data.id,
       deploymentVersion: deploymentResponse.data.version,
       contentHash: deploymentResponse.data.contentHash,
-      projectRef: config.project,
+      projectRef: resolvedConfig.config.project,
       loadImage: options.data.loadImage,
       buildPlatform: options.data.buildPlatform,
     });
@@ -321,7 +327,7 @@ export async function deployCommand(dir: string, anyOptions: unknown) {
 
   const deploymentLink = terminalLink(
     "View deployment",
-    `${authorization.config.apiUrl}/projects/v3/${config.project}/deployments/${finishedDeployment.id}`
+    `${authorization.config.apiUrl}/projects/v3/${resolvedConfig.config.project}/deployments/${finishedDeployment.id}`
   );
 
   switch (finishedDeployment.status) {
@@ -584,7 +590,11 @@ function extractImageDigest(outputs: string[]) {
   }
 }
 
-async function compileProject(config: ResolvedConfig, options: DeployCommandOptions) {
+async function compileProject(
+  config: ResolvedConfig,
+  options: DeployCommandOptions,
+  configPath?: string
+) {
   if (!options.skipTypecheck) {
     await typecheckProject(config, options);
   }
@@ -605,10 +615,24 @@ async function compileProject(config: ResolvedConfig, options: DeployCommandOpti
     importResolve("./workers/prod/worker-setup.js", import.meta.url)
   ).href.replace("file://", "");
 
-  const workerContents = workerFacade
+  let workerContents = workerFacade
     .replace("__TASKS__", createTaskFileImports(taskFiles))
     .replace("__WORKER_SETUP__", `import { tracingSDK } from "${workerSetupPath}";`);
 
+  if (configPath) {
+    logger.debug("Importing project config from", { configPath });
+
+    workerContents = workerContents.replace(
+      "__IMPORTED_PROJECT_CONFIG__",
+      `import importedConfig from "${configPath}";`
+    );
+  } else {
+    workerContents = workerContents.replace(
+      "__IMPORTED_PROJECT_CONFIG__",
+      `const importedConfig = undefined;`
+    );
+  }
+
   const result = await build({
     stdin: {
       contents: workerContents,