Update to add suffix to version

Author: ConProgramming

apps/webapp/app/env.server.ts

@@ -239,6 +239,7 @@ const EnvironmentSchema = z.object({
   DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN: z.string().optional(),
   DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID: z.string().optional(),
   DEPLOY_IMAGE_PLATFORM: z.string().default("linux/amd64"),
+  DEPLOY_VERSION_SUFFIX: z.string().optional(), // Optional suffix for deployment versions, e.g., "hardened"
   DEPLOY_TIMEOUT_MS: z.coerce
     .number()
     .int()

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

@@ -137,7 +137,8 @@ WHERE
   wd."projectId" = ${project.id}
   AND wd."environmentId" = ${environment.id}
 ORDER BY
-  string_to_array(wd."version", '.')::int[] DESC
+  string_to_array(split_part(wd."version", '-', 1), '.')::int[] DESC,
+  split_part(wd."version", '-', 2) DESC
 LIMIT ${pageSize} OFFSET ${pageSize * (page - 1)};`;
 
     return {
@@ -224,7 +225,13 @@ LIMIT ${pageSize} OFFSET ${pageSize * (page - 1)};`;
       FROM ${sqlDatabaseSchema}."WorkerDeployment"
       WHERE "projectId" = ${project.id}
         AND "environmentId" = ${environment.id}
-        AND string_to_array(version, '.')::int[] > string_to_array(${version}, '.')::int[]
+        AND (
+          string_to_array(split_part(version, '-', 1), '.')::int[] > string_to_array(split_part(${version}, '-', 1), '.')::int[]
+          OR (
+            string_to_array(split_part(version, '-', 1), '.')::int[] = string_to_array(split_part(${version}, '-', 1), '.')::int[]
+            AND split_part(version, '-', 2) > split_part(${version}, '-', 2)
+          )
+        )
     `;
 
     const count = Number(deploymentsSinceVersion[0].count);

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

@@ -45,7 +45,11 @@ export class TestPresenter extends BasePresenter {
       >`WITH workers AS (
           SELECT
                 bw.*,
-                ROW_NUMBER() OVER(ORDER BY string_to_array(bw.version, '.')::int[] DESC) AS rn
+                ROW_NUMBER() OVER(
+                  ORDER BY 
+                    string_to_array(split_part(bw.version, '-', 1), '.')::int[] DESC,
+                    split_part(bw.version, '-', 2) DESC
+                ) AS rn
           FROM
                 ${sqlDatabaseSchema}."BackgroundWorker" bw
           WHERE "runtimeEnvironmentId" = ${envId}

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

@@ -22,6 +22,7 @@ import { FailedTaskRunService } from "../failedTaskRun.server";
 import { CancelDevSessionRunsService } from "../services/cancelDevSessionRuns.server";
 import { CompleteAttemptService } from "../services/completeAttempt.server";
 import { attributesFromAuthenticatedEnv, tracer } from "../tracer.server";
+import { compareDeploymentVersions } from "../utils/deploymentVersions";
 import { DevSubscriber, devPubSub } from "./devPubSub.server";
 
 const MessageBody = z.discriminatedUnion("type", [
@@ -589,7 +590,7 @@ export class DevQueueConsumer {
   }
 
   // Get the latest background worker based on the version.
-  // Versions are in the format of 20240101.1 and 20240101.2, or even 20240101.10, 20240101.11, etc.
+  // Versions are in the format of YYYYMMDD.N (e.g., 20240101.1) with optional suffix (e.g., 20240101.1-hardened)
   #getLatestBackgroundWorker() {
     const workers = Array.from(this._backgroundWorkers.values());
 
@@ -598,22 +599,10 @@ export class DevQueueConsumer {
     }
 
     return workers.reduce((acc, curr) => {
-      const accParts = acc.version.split(".").map(Number);
-      const currParts = curr.version.split(".").map(Number);
-
-      // Compare the major part
-      if (accParts[0] < currParts[0]) {
-        return curr;
-      } else if (accParts[0] > currParts[0]) {
-        return acc;
-      }
-
-      // Compare the minor part (assuming all versions have two parts)
-      if (accParts[1] < currParts[1]) {
-        return curr;
-      } else {
-        return acc;
-      }
+      // Use compareDeploymentVersions to properly handle versions with suffixes
+      const comparison = compareDeploymentVersions(acc.version, curr.version);
+      // If curr is newer (comparison returns -1), use curr, otherwise use acc
+      return comparison < 0 ? curr : acc;
     });
   }
 }

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

@@ -9,6 +9,7 @@ import { BackgroundWorkerId } from "@trigger.dev/core/v3/isomorphic";
 import type { BackgroundWorker, TaskQueue, TaskQueueType } from "@trigger.dev/database";
 import cronstrue from "cronstrue";
 import { Prisma, PrismaClientOrTransaction } from "~/db.server";
+import { env } from "~/env.server";
 import { sanitizeQueueName } from "~/models/taskQueue.server";
 import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
@@ -64,7 +65,7 @@ export class CreateBackgroundWorkerService extends BaseService {
         return latestBackgroundWorker;
       }
 
-      const nextVersion = calculateNextBuildVersion(project.backgroundWorkers[0]?.version);
+      const nextVersion = calculateNextBuildVersion(project.backgroundWorkers[0]?.version, env.DEPLOY_VERSION_SUFFIX);
 
       logger.debug(`Creating background worker`, {
         nextVersion,

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

@@ -45,7 +45,7 @@ export class InitializeDeploymentService extends BaseService {
         take: 1,
       });
 
-      const nextVersion = calculateNextBuildVersion(latestDeployment?.version);
+      const nextVersion = calculateNextBuildVersion(latestDeployment?.version, env.DEPLOY_VERSION_SUFFIX);
 
       if (payload.selfHosted && remoteBuildsEnabled()) {
         throw new ServiceValidationError(

apps/webapp/app/v3/utils/calculateNextBuildVersion.ts

@@ -1,23 +1,29 @@
 // Calculate next build version based on the previous version
 // Version formats are YYYYMMDD.1, YYYYMMDD.2, etc.
+// With optional suffix: YYYYMMDD.1-suffix
 // If there is no previous version, start at Todays date and .1
-export function calculateNextBuildVersion(latestVersion?: string | null): string {
+export function calculateNextBuildVersion(latestVersion?: string | null, suffix?: string): string {
   const today = new Date();
   const year = today.getFullYear();
   const month = today.getMonth() + 1;
   const day = today.getDate();
   const todayFormatted = `${year}${month < 10 ? "0" : ""}${month}${day < 10 ? "0" : ""}${day}`;
 
   if (!latestVersion) {
-    return `${todayFormatted}.1`;
+    const baseVersion = `${todayFormatted}.1`;
+    return suffix ? `${baseVersion}-${suffix}` : baseVersion;
   }
 
-  const [date, buildNumber] = latestVersion.split(".");
+  // Extract base version and suffix from latest version
+  const [baseVersion, existingSuffix] = latestVersion.split("-");
+  const [date, buildNumber] = baseVersion.split(".");
 
   if (date === todayFormatted) {
     const nextBuildNumber = parseInt(buildNumber, 10) + 1;
-    return `${date}.${nextBuildNumber}`;
+    const newBaseVersion = `${date}.${nextBuildNumber}`;
+    return suffix ? `${newBaseVersion}-${suffix}` : newBaseVersion;
   }
 
-  return `${todayFormatted}.1`;
+  const newBaseVersion = `${todayFormatted}.1`;
+  return suffix ? `${newBaseVersion}-${suffix}` : newBaseVersion;
 }

apps/webapp/app/v3/utils/deploymentVersions.ts

@@ -1,8 +1,13 @@
 // Compares two versions of a deployment, like 20250208.1 and 20250208.2
+// Also handles versions with suffixes like 20250208.1-hardened
 // Returns -1 if versionA is older than versionB, 0 if they are the same, and 1 if versionA is newer than versionB
 export function compareDeploymentVersions(versionA: string, versionB: string) {
-  const [dateA, numberA] = versionA.split(".");
-  const [dateB, numberB] = versionB.split(".");
+  // Extract base versions and suffixes
+  const [baseVersionA, suffixA = ""] = versionA.split("-");
+  const [baseVersionB, suffixB = ""] = versionB.split("-");
+  
+  const [dateA, numberA] = baseVersionA.split(".");
+  const [dateB, numberB] = baseVersionB.split(".");
 
   if (dateA < dateB) {
     return -1;
@@ -24,5 +29,20 @@ export function compareDeploymentVersions(versionA: string, versionB: string) {
     return 1;
   }
 
+  // Base versions are equal, compare suffixes alphabetically
+  // Versions without suffixes should come before versions with suffixes
+  if (suffixA === "" && suffixB !== "") {
+    return -1;
+  }
+  if (suffixA !== "" && suffixB === "") {
+    return 1;
+  }
+  if (suffixA < suffixB) {
+    return -1;
+  }
+  if (suffixA > suffixB) {
+    return 1;
+  }
+
   return 0;
 }

internal-packages/run-engine/src/engine/tests/setup.ts

@@ -292,23 +292,28 @@ export async function setupBackgroundWorker(
   };
 }
 
-function calculateNextBuildVersion(latestVersion?: string | null): string {
+function calculateNextBuildVersion(latestVersion?: string | null, suffix?: string): string {
   const today = new Date();
   const year = today.getFullYear();
   const month = today.getMonth() + 1;
   const day = today.getDate();
   const todayFormatted = `${year}${month < 10 ? "0" : ""}${month}${day < 10 ? "0" : ""}${day}`;
 
   if (!latestVersion) {
-    return `${todayFormatted}.1`;
+    const baseVersion = `${todayFormatted}.1`;
+    return suffix ? `${baseVersion}-${suffix}` : baseVersion;
   }
 
-  const [date, buildNumber] = latestVersion.split(".");
+  // Extract base version and suffix from latest version
+  const [baseVersion, existingSuffix] = latestVersion.split("-");
+  const [date, buildNumber] = baseVersion.split(".");
 
   if (date === todayFormatted) {
     const nextBuildNumber = parseInt(buildNumber, 10) + 1;
-    return `${date}.${nextBuildNumber}`;
+    const newBaseVersion = `${date}.${nextBuildNumber}`;
+    return suffix ? `${newBaseVersion}-${suffix}` : newBaseVersion;
   }
 
-  return `${todayFormatted}.1`;
+  const newBaseVersion = `${todayFormatted}.1`;
+  return suffix ? `${newBaseVersion}-${suffix}` : newBaseVersion;
 }