block some actions for projects on previous run engine

Author: nicktrn

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

@@ -6,6 +6,7 @@ import {
 import { env } from "~/env.server";
 import { authenticateApiRequest } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
+import { ServiceValidationError } from "~/v3/services/baseService.server";
 import { InitializeDeploymentService } from "~/v3/services/initializeDeployment.server";
 
 export async function action({ request, params }: ActionFunctionArgs) {
@@ -33,18 +34,30 @@ export async function action({ request, params }: ActionFunctionArgs) {
 
   const service = new InitializeDeploymentService();
 
-  const { deployment, imageTag } = await service.call(authenticatedEnv, body.data);
-
-  const responseBody: InitializeDeploymentResponseBody = {
-    id: deployment.friendlyId,
-    contentHash: deployment.contentHash,
-    shortCode: deployment.shortCode,
-    version: deployment.version,
-    externalBuildData:
-      deployment.externalBuildData as InitializeDeploymentResponseBody["externalBuildData"],
-    imageTag,
-    registryHost: body.data.registryHost ?? env.DEPLOY_REGISTRY_HOST,
-  };
-
-  return json(responseBody, { status: 200 });
+  try {
+    const { deployment, imageTag } = await service.call(authenticatedEnv, body.data);
+
+    const responseBody: InitializeDeploymentResponseBody = {
+      id: deployment.friendlyId,
+      contentHash: deployment.contentHash,
+      shortCode: deployment.shortCode,
+      version: deployment.version,
+      externalBuildData:
+        deployment.externalBuildData as InitializeDeploymentResponseBody["externalBuildData"],
+      imageTag,
+      registryHost: body.data.registryHost ?? env.DEPLOY_REGISTRY_HOST,
+    };
+
+    return json(responseBody, { status: 200 });
+  } catch (error) {
+    if (error instanceof ServiceValidationError) {
+      return json({ error: error.message }, { status: 400 });
+    } else if (error instanceof Error) {
+      logger.error("Error initializing deployment", { error: error.message });
+      return json({ error: `Internal server error: ${error.message}` }, { status: 500 });
+    } else {
+      logger.error("Error initializing deployment", { error: String(error) });
+      return json({ error: "Internal server error" }, { status: 500 });
+    }
+  }
 }

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

@@ -15,7 +15,13 @@ export const loader = createLoaderApiRoute(
     corsStrategy: "all",
     findResource: async () => 1, // This is a dummy function, we don't need to find a resource
   },
-  async ({ authentication }): Promise<TypedResponse<WorkersListResponseBody>> => {
+  async ({
+    authentication,
+  }): Promise<TypedResponse<WorkersListResponseBody | { error: string }>> => {
+    if (authentication.environment.project.engine !== "V2") {
+      return json({ error: "Not supported for V1 projects" }, { status: 400 });
+    }
+
     const service = new WorkerGroupService();
     const workers = await service.listWorkerGroups({
       projectId: authentication.environment.projectId,
@@ -33,12 +39,19 @@ export const loader = createLoaderApiRoute(
   }
 );
 
-export const action = createActionApiRoute(
+export const { action } = createActionApiRoute(
   {
     corsStrategy: "all",
     body: WorkersCreateRequestBody,
   },
-  async ({ authentication, body }): Promise<TypedResponse<WorkersCreateResponseBody>> => {
+  async ({
+    authentication,
+    body,
+  }): Promise<TypedResponse<WorkersCreateResponseBody | { error: string }>> => {
+    if (authentication.environment.project.engine !== "V2") {
+      return json({ error: "Not supported" }, { status: 400 });
+    }
+
     const service = new WorkerGroupService();
     const { workerGroup, token } = await service.createWorkerGroup({
       projectId: authentication.environment.projectId,

apps/webapp/app/v3/services/initializeDeployment.server.ts

@@ -4,7 +4,7 @@ import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { generateFriendlyId } from "../friendlyIdentifiers";
 import { createRemoteImageBuild } from "../remoteImageBuilder.server";
 import { calculateNextBuildVersion } from "../utils/calculateNextBuildVersion";
-import { BaseService } from "./baseService.server";
+import { BaseService, ServiceValidationError } from "./baseService.server";
 import { TimeoutDeploymentService } from "./timeoutDeployment.server";
 import { env } from "~/env.server";
 import { WorkerDeploymentType } from "@trigger.dev/database";
@@ -18,6 +18,10 @@ export class InitializeDeploymentService extends BaseService {
     payload: InitializeDeploymentRequestBody
   ) {
     return this.traceWithEnv("call", environment, async (span) => {
+      if (payload.type !== "V1" && environment.project.engine !== "V2") {
+        throw new ServiceValidationError("Only V1 deployments are supported for this project");
+      }
+
       const latestDeployment = await this._prisma.workerDeployment.findFirst({
         where: {
           environmentId: environment.id,

apps/webapp/app/v3/services/rollbackDeployment.server.ts

@@ -12,7 +12,7 @@ export class RollbackDeploymentService extends BaseService {
     }
 
     if (deployment.type !== WorkerInstanceGroupType.MANAGED) {
-      logger.error("Can only roll back shared deployments", {
+      logger.error("Can only roll back managed deployments", {
         id: deployment.id,
         type: deployment.type,
       });

packages/cli-v3/src/commands/workers/create.ts

@@ -126,7 +126,7 @@ async function _workersCreateCommand(dir: string, options: WorkersCreateCommandO
   });
 
   if (!newWorker.success) {
-    throw new Error("Failed to create worker");
+    throw new Error(`Failed to create worker: ${newWorker.error}`);
   }
 
   outro(

packages/cli-v3/src/commands/workers/list.ts

@@ -104,7 +104,7 @@ async function _workersListCommand(dir: string, options: WorkersListCommandOptio
   const workers = await projectClient.client.workers.list();
 
   if (!workers.success) {
-    throw new Error("Failed to list workers");
+    throw new Error(`Failed to list workers: ${workers.error}`);
   }
 
   logger.table(