webapp-driven deploys, multi-platform support, lots of fixes

Author: nicktrn

.env.example

@@ -80,8 +80,8 @@ CLOUD_SLACK_CLIENT_SECRET=
 PROVIDER_SECRET=provider-secret # generate the actual secret with `openssl rand -hex 32`
 COORDINATOR_SECRET=coordinator-secret # generate the actual secret with `openssl rand -hex 32`
 
+# DEPOT_ORG_ID=<Depot org id>
 # DEPOT_TOKEN=<Depot org token>
-# DEPOT_PROJECT_ID=<Depot project id>
 # DEPLOY_REGISTRY_HOST=${APP_ORIGIN} # This is the host that the deploy CLI will use to push images to the registry
 # DEV_OTEL_EXPORTER_OTLP_ENDPOINT="http://0.0.0.0:4318"
 # These are needed for the object store (for handling large payloads/outputs)

apps/webapp/app/entry.server.tsx

@@ -221,7 +221,14 @@ import { env } from "./env.server";
 import { logger } from "./services/logger.server";
 import { Prisma } from "./db.server";
 import { registerRunEngineEventBusHandlers } from "./v3/runEngineHandlers.server";
+import { remoteBuildsEnabled } from "./v3/remoteImageBuilder.server";
 
 if (env.EVENT_LOOP_MONITOR_ENABLED === "1") {
   eventLoopMonitor.enable();
 }
+
+if (remoteBuildsEnabled()) {
+  console.log("🏗️  Remote builds enabled");
+} else {
+  console.log("🏗️  Local builds enabled");
+}

apps/webapp/app/env.server.ts

@@ -264,13 +264,13 @@ const EnvironmentSchema = z.object({
   PROVIDER_SECRET: z.string().default("provider-secret"),
   COORDINATOR_SECRET: z.string().default("coordinator-secret"),
   DEPOT_TOKEN: z.string().optional(),
-  DEPOT_PROJECT_ID: z.string().optional(),
   DEPOT_ORG_ID: z.string().optional(),
   DEPOT_REGION: z.string().default("us-east-1"),
-  DEPLOY_REGISTRY_HOST: z.string().optional(),
+  DEPLOY_REGISTRY_HOST: z.string(),
   DEPLOY_REGISTRY_USERNAME: z.string().optional(),
   DEPLOY_REGISTRY_PASSWORD: z.string().optional(),
   DEPLOY_REGISTRY_NAMESPACE: z.string().default("trigger"),
+  DEPLOY_BUILD_PLATFORM: z.string().default("linux/amd64"),
   DEPLOY_TIMEOUT_MS: z.coerce
     .number()
     .int()

apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts

@@ -74,6 +74,7 @@ export class DeploymentPresenter {
         version: true,
         errorData: true,
         imageReference: true,
+        imagePlatform: true,
         externalBuildData: true,
         projectId: true,
         type: true,
@@ -157,6 +158,7 @@ export class DeploymentPresenter {
         sdkVersion: deployment.worker?.sdkVersion,
         cliVersion: deployment.worker?.cliVersion,
         imageReference: deployment.imageReference,
+        imagePlatform: deployment.imagePlatform,
         externalBuildData:
           externalBuildData && externalBuildData.success ? externalBuildData.data : undefined,
         projectId: deployment.projectId,

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam/route.tsx

@@ -91,6 +91,10 @@ export default function Page() {
                 <Property.Value>{deployment.imageReference}</Property.Value>
               </Property.Item>
             )}
+            <Property.Item>
+              <Property.Label>Platform</Property.Label>
+              <Property.Value>{deployment.imagePlatform}</Property.Value>
+            </Property.Item>
             {deployment.externalBuildData && (
               <Property.Item>
                 <Property.Label>Build Server</Property.Label>

apps/webapp/app/routes/api.v1.deployments.$deploymentId.background-workers.ts

@@ -5,7 +5,7 @@ import { authenticateApiRequest } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
 import { ServiceValidationError } from "~/v3/services/baseService.server";
 import { CreateDeclarativeScheduleError } from "~/v3/services/createBackgroundWorker.server";
-import { CreateDeploymentBackgroundWorkerService } from "~/v3/services/createDeploymentBackgroundWorker.server";
+import { CreateDeploymentBackgroundWorkerServiceV4 } from "~/v3/services/createDeploymentBackgroundWorkerV4.server";
 
 const ParamsSchema = z.object({
   deploymentId: z.string(),
@@ -42,7 +42,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
     return json({ error: "Invalid body", issues: body.error.issues }, { status: 400 });
   }
 
-  const service = new CreateDeploymentBackgroundWorkerService();
+  const service = new CreateDeploymentBackgroundWorkerServiceV4();
 
   try {
     const backgroundWorker = await service.call(authenticatedEnv, deploymentId, body.data);
@@ -63,7 +63,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
     logger.error("Failed to create background worker", { error: e });
 
     if (e instanceof ServiceValidationError) {
-      return json({ error: e.message }, { status: 400 });
+      return json({ error: e.message }, { status: e.status ?? 400 });
     } else if (e instanceof CreateDeclarativeScheduleError) {
       return json({ error: e.message }, { status: 400 });
     }

apps/webapp/app/routes/api.v1.deployments.ts

@@ -3,7 +3,6 @@ import {
   InitializeDeploymentRequestBody,
   InitializeDeploymentResponseBody,
 } from "@trigger.dev/core/v3";
-import { env } from "~/env.server";
 import { authenticateApiRequest } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
 import { ServiceValidationError } from "~/v3/services/baseService.server";
@@ -35,7 +34,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
   const service = new InitializeDeploymentService();
 
   try {
-    const { deployment, imageTag } = await service.call(authenticatedEnv, body.data);
+    const { deployment, imageRef } = await service.call(authenticatedEnv, body.data);
 
     const responseBody: InitializeDeploymentResponseBody = {
       id: deployment.friendlyId,
@@ -44,8 +43,8 @@ export async function action({ request, params }: ActionFunctionArgs) {
       version: deployment.version,
       externalBuildData:
         deployment.externalBuildData as InitializeDeploymentResponseBody["externalBuildData"],
-      imageTag,
-      registryHost: body.data.registryHost ?? env.DEPLOY_REGISTRY_HOST,
+      imageTag: imageRef,
+      imagePlatform: deployment.imagePlatform,
     };
 
     return json(responseBody, { status: 200 });

apps/webapp/app/services/runsReplicationInstance.server.ts

@@ -16,11 +16,11 @@ function initializeRunsReplicationInstance() {
   invariant(typeof DATABASE_URL === "string", "DATABASE_URL env var not set");
 
   if (!env.RUN_REPLICATION_CLICKHOUSE_URL) {
-    console.log("🗃️ Runs replication service not enabled");
+    console.log("🗃️  Runs replication service not enabled");
     return;
   }
 
-  console.log("🗃️ Runs replication service enabled");
+  console.log("🗃️  Runs replication service enabled");
 
   const clickhouse = new ClickHouse({
     url: env.RUN_REPLICATION_CLICKHOUSE_URL,

apps/webapp/app/v3/handleSocketIo.server.ts

@@ -28,7 +28,7 @@ import { engine } from "./runEngine.server";
 import { CompleteAttemptService } from "./services/completeAttempt.server";
 import { CrashTaskRunService } from "./services/crashTaskRun.server";
 import { CreateCheckpointService } from "./services/createCheckpoint.server";
-import { CreateDeployedBackgroundWorkerService } from "./services/createDeployedBackgroundWorker.server";
+import { CreateDeploymentBackgroundWorkerServiceV3 } from "./services/createDeploymentBackgroundWorkerV3.server";
 import { CreateTaskRunAttemptService } from "./services/createTaskRunAttempt.server";
 import { DeploymentIndexFailed } from "./services/deploymentIndexFailed.server";
 import { ResumeAttemptService } from "./services/resumeAttempt.server";
@@ -245,7 +245,7 @@ function createCoordinatorNamespace(io: Server) {
             return { success: false };
           }
 
-          const service = new CreateDeployedBackgroundWorkerService();
+          const service = new CreateDeploymentBackgroundWorkerServiceV3();
           const worker = await service.call(message.projectRef, environment, message.deploymentId, {
             localOnly: false,
             metadata: message.metadata,

apps/webapp/app/v3/remoteImageBuilder.server.ts

@@ -59,5 +59,5 @@ async function createBuilderProjectIfNotExists(project: Project) {
 }
 
 export function remoteBuildsEnabled() {
-  return env.DEPOT_TOKEN && env.DEPOT_PROJECT_ID && env.DEPOT_ORG_ID && env.DEPOT_REGION;
+  return env.DEPOT_TOKEN && env.DEPOT_ORG_ID && env.DEPOT_REGION;
 }