From dcd312dc63b4dfabd94fd10df030af91782a1d2d Mon Sep 17 00:00:00 2001
From: nicktrn <55853254+nicktrn@users.noreply.github.com>
Date: Mon, 28 Jul 2025 14:05:59 +0100
Subject: [PATCH] feat(ecr): make assume role optional

---
 .../app/v3/services/finalizeDeploymentV2.server.ts     | 10 ++++++----
 .../app/v3/services/initializeDeployment.server.ts     | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/apps/webapp/app/v3/services/finalizeDeploymentV2.server.ts b/apps/webapp/app/v3/services/finalizeDeploymentV2.server.ts
index e15c3d2c45..993f4b6e2c 100644
--- a/apps/webapp/app/v3/services/finalizeDeploymentV2.server.ts
+++ b/apps/webapp/app/v3/services/finalizeDeploymentV2.server.ts
@@ -271,10 +271,12 @@ async function ensureLoggedIntoDockerRegistry(
   if (isEcrRegistry(registryHost)) {
     auth = await getEcrAuthToken({
       registryHost,
-      assumeRole: {
-        roleArn: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN,
-        externalId: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID,
-      },
+      assumeRole: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN
+        ? {
+            roleArn: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN,
+            externalId: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID,
+          }
+        : undefined,
     });
   } else if (!auth) {
     throw new Error("Authentication required for non-ECR registry");
diff --git a/apps/webapp/app/v3/services/initializeDeployment.server.ts b/apps/webapp/app/v3/services/initializeDeployment.server.ts
index 8370e3fdd9..813b48af58 100644
--- a/apps/webapp/app/v3/services/initializeDeployment.server.ts
+++ b/apps/webapp/app/v3/services/initializeDeployment.server.ts
@@ -77,10 +77,12 @@ export class InitializeDeploymentService extends BaseService {
           nextVersion,
           environmentSlug: environment.slug,
           registryTags: env.DEPLOY_REGISTRY_ECR_TAGS,
-          assumeRole: {
-            roleArn: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN,
-            externalId: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID,
-          },
+          assumeRole: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN
+            ? {
+                roleArn: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN,
+                externalId: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID,
+              }
+            : undefined,
         })
       );