From dc11de0714e73f1b904c986079ade613494ea747 Mon Sep 17 00:00:00 2001
From: nicktrn <55853254+nicktrn@users.noreply.github.com>
Date: Tue, 19 Mar 2024 13:54:44 +0000
Subject: [PATCH] shorten index container names

---
 apps/docker-provider/src/index.ts                  | 10 +++++-----
 apps/kubernetes-provider/src/index.ts              | 14 +++++++-------
 .../app/v3/services/indexDeployment.server.ts      |  2 +-
 packages/core-apps/src/provider.ts                 |  4 ++--
 packages/core/src/v3/schemas/schemas.ts            |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apps/docker-provider/src/index.ts b/apps/docker-provider/src/index.ts
index d88d37ac1..0d3530fb5 100644
--- a/apps/docker-provider/src/index.ts
+++ b/apps/docker-provider/src/index.ts
@@ -81,7 +81,7 @@ class DockerTaskOperations implements TaskOperations {
   async index(opts: TaskOperationsIndexOptions) {
     await this.#initialize();
 
-    const containerName = this.#getIndexContainerName(opts.contentHash);
+    const containerName = this.#getIndexContainerName(opts.shortCode);
 
     logger.log(`Indexing task ${opts.imageRef}`, {
       host: COORDINATOR_HOST,
@@ -200,12 +200,12 @@ class DockerTaskOperations implements TaskOperations {
     logger.log("noop: get");
   }
 
-  #getIndexContainerName(contentHash: string) {
-    return `task-index-${contentHash}`;
+  #getIndexContainerName(suffix: string) {
+    return `task-index-${suffix}`;
   }
 
-  #getRunContainerName(attemptId: string) {
-    return `task-run-${attemptId}`;
+  #getRunContainerName(suffix: string) {
+    return `task-run-${suffix}`;
   }
 }
 
diff --git a/apps/kubernetes-provider/src/index.ts b/apps/kubernetes-provider/src/index.ts
index 851bc3ecd..46a2dfc6f 100644
--- a/apps/kubernetes-provider/src/index.ts
+++ b/apps/kubernetes-provider/src/index.ts
@@ -42,7 +42,7 @@ class KubernetesTaskOperations implements TaskOperations {
     await this.#createJob(
       {
         metadata: {
-          name: this.#getIndexContainerName(opts.contentHash),
+          name: this.#getIndexContainerName(opts.shortCode),
           namespace: this.#namespace.metadata.name,
         },
         spec: {
@@ -63,7 +63,7 @@ class KubernetesTaskOperations implements TaskOperations {
               ],
               containers: [
                 {
-                  name: opts.contentHash,
+                  name: this.#getIndexContainerName(opts.shortCode),
                   image: opts.imageRef,
                   ports: [
                     {
@@ -159,7 +159,7 @@ class KubernetesTaskOperations implements TaskOperations {
           ],
           containers: [
             {
-              name: opts.attemptId,
+              name: this.#getRunContainerName(opts.attemptId),
               image: opts.image,
               ports: [
                 {
@@ -309,12 +309,12 @@ class KubernetesTaskOperations implements TaskOperations {
     await this.#getPod(opts.runId, this.#namespace);
   }
 
-  #getIndexContainerName(contentHash: string) {
-    return `task-index-${contentHash}`;
+  #getIndexContainerName(suffix: string) {
+    return `task-index-${suffix}`;
   }
 
-  #getRunContainerName(attemptId: string) {
-    return `task-run-${attemptId}`;
+  #getRunContainerName(suffix: string) {
+    return `task-run-${suffix}`;
   }
 
   #createK8sApi() {
diff --git a/apps/webapp/app/v3/services/indexDeployment.server.ts b/apps/webapp/app/v3/services/indexDeployment.server.ts
index 3442c6ea7..74e6dc012 100644
--- a/apps/webapp/app/v3/services/indexDeployment.server.ts
+++ b/apps/webapp/app/v3/services/indexDeployment.server.ts
@@ -45,7 +45,7 @@ export class IndexDeploymentService extends BaseService {
     try {
       const responses = await socketIo.providerNamespace.timeout(10_000).emitWithAck("INDEX", {
         version: "v1",
-        contentHash: deployment.contentHash,
+        shortCode: deployment.shortCode,
         imageTag: deployment.imageReference,
         envId: deployment.environmentId,
         apiKey: deployment.environment.apiKey,
diff --git a/packages/core-apps/src/provider.ts b/packages/core-apps/src/provider.ts
index daeeea00d..78b5cf247 100644
--- a/packages/core-apps/src/provider.ts
+++ b/packages/core-apps/src/provider.ts
@@ -22,7 +22,7 @@ const PLATFORM_SECRET = process.env.PLATFORM_SECRET || "provider-secret";
 const logger = new SimpleLogger(`[${MACHINE_NAME}]`);
 
 export interface TaskOperationsIndexOptions {
-  contentHash: string;
+  shortCode: string;
   imageRef: string;
   envId: string;
   apiKey: string;
@@ -164,7 +164,7 @@ export class ProviderShell implements Provider {
         INDEX: async (message) => {
           try {
             await this.tasks.index({
-              contentHash: message.contentHash,
+              shortCode: message.shortCode,
               imageRef: message.imageTag,
               envId: message.envId,
               apiKey: message.apiKey,
diff --git a/packages/core/src/v3/schemas/schemas.ts b/packages/core/src/v3/schemas/schemas.ts
index 3a055aca7..1415a4427 100644
--- a/packages/core/src/v3/schemas/schemas.ts
+++ b/packages/core/src/v3/schemas/schemas.ts
@@ -67,7 +67,7 @@ export const PlatformToProviderMessages = {
     message: z.object({
       version: z.literal("v1").default("v1"),
       imageTag: z.string(),
-      contentHash: z.string(),
+      shortCode: z.string(),
       envId: z.string(),
       apiKey: z.string(),
       apiUrl: z.string(),