From a0d69125ad5fd626dea397c17040f8f1769d95f2 Mon Sep 17 00:00:00 2001
From: abhibhaw <39991296+abhibhaw@users.noreply.github.com>
Date: Mon, 30 Mar 2026 19:07:08 +0530
Subject: [PATCH 1/3] feat(ecr): add Assume Role ARN field for cross-account
 ECR registries

Added assumeRoleArn to the ECR registry form and API payload, allowing
users to configure cross-account ECR access via STS AssumeRole. The
field is available for both EC2 IAM Role and User auth modes.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/components/dockerRegistry/Docker.tsx | 16 ++++++++++++++++
 src/config/constants.ts                  |  1 +
 2 files changed, 17 insertions(+)

diff --git a/src/components/dockerRegistry/Docker.tsx b/src/components/dockerRegistry/Docker.tsx
index 63a91ec6e2..05205a6fc8 100644
--- a/src/components/dockerRegistry/Docker.tsx
+++ b/src/components/dockerRegistry/Docker.tsx
@@ -233,6 +233,7 @@ const CollapsedList = ({
     awsAccessKeyId = '',
     awsSecretAccessKey = '',
     awsRegion = '',
+    assumeRoleArn = '',
     isDefault = false,
     active = true,
     username = '',
@@ -319,6 +320,7 @@ const CollapsedList = ({
                         awsAccessKeyId,
                         awsSecretAccessKey,
                         awsRegion,
+                        assumeRoleArn,
                         isDefault,
                         active,
                         username,
@@ -353,6 +355,7 @@ const DockerForm = ({
     awsAccessKeyId,
     awsSecretAccessKey,
     awsRegion,
+    assumeRoleArn,
     isDefault,
     active,
     username,
@@ -431,6 +434,7 @@ const DockerForm = ({
             value: id && !awsSecretAccessKey ? DEFAULT_SECRET_PLACEHOLDER : awsSecretAccessKey,
             error: '',
         },
+        assumeRoleArn: { value: assumeRoleArn, error: '' },
         registryUrl: { value: registryUrl, error: '' },
         username: { value: username, error: '' },
         password: {
@@ -629,6 +633,7 @@ const DockerForm = ({
             password: { value: selectedRegistry.password.defaultValue, error: '' },
             awsAccessKeyId: { value: '', error: '' },
             awsSecretAccessKey: { value: '', error: '' },
+            assumeRoleArn: { value: '', error: '' },
         }))
     }
 
@@ -788,6 +793,7 @@ const DockerForm = ({
                       awsAccessKeyId: customState.awsAccessKeyId.value?.trim(),
                       awsSecretAccessKey: parsePassword(customState.awsSecretAccessKey.value),
                       awsRegion,
+                      assumeRoleArn: customState.assumeRoleArn.value?.trim(),
                   }
                 : {}),
             ...((selectedDockerRegistryType.value === RegistryType.ARTIFACT_REGISTRY &&
@@ -1619,6 +1625,16 @@ const DockerForm = ({
                                 </div>
                             </>
                         )}
+                        <div className="form__row">
+                            <CustomInput
+                                name="assumeRoleArn"
+                                value={customState.assumeRoleArn.value}
+                                error={customState.assumeRoleArn.error}
+                                onChange={customHandleChange}
+                                label="Assume Role ARN (cross-account)"
+                                placeholder="arn:aws:iam::123456789012:role/cross-account-ecr-role"
+                            />
+                        </div>
                     </>
                 )
             }
diff --git a/src/config/constants.ts b/src/config/constants.ts
index d541b0abc1..f556605e5d 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -456,6 +456,7 @@ export interface RegistryPayloadType {
     awsAccessKeyId?: string
     awsSecretAccessKey?: string
     awsRegion?: string
+    assumeRoleArn?: string
     username?: string
     password?: string
     connection?: string

From 06821c1007b3dd3a9300498ac181d7eb6ce7e6b3 Mon Sep 17 00:00:00 2001
From: abhibhaw <39991296+abhibhaw@users.noreply.github.com>
Date: Tue, 31 Mar 2026 16:37:54 +0530
Subject: [PATCH 2/3] fix(ecr): add dataTestId to assume role ARN input field

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/components/dockerRegistry/Docker.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/dockerRegistry/Docker.tsx b/src/components/dockerRegistry/Docker.tsx
index 05205a6fc8..4061cd48bd 100644
--- a/src/components/dockerRegistry/Docker.tsx
+++ b/src/components/dockerRegistry/Docker.tsx
@@ -1628,6 +1628,7 @@ const DockerForm = ({
                         <div className="form__row">
                             <CustomInput
                                 name="assumeRoleArn"
+                                dataTestId="ecr-assume-role-arn-textbox"
                                 value={customState.assumeRoleArn.value}
                                 error={customState.assumeRoleArn.error}
                                 onChange={customHandleChange}

From c7bd3f80612c4b7d1538bcf7bd9ff6d958039f33 Mon Sep 17 00:00:00 2001
From: abhibhaw <39991296+abhibhaw@users.noreply.github.com>
Date: Wed, 15 Apr 2026 16:17:58 +0530
Subject: [PATCH 3/3] fix: failing ci

---
 src/components/dockerRegistry/Docker.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/dockerRegistry/Docker.tsx b/src/components/dockerRegistry/Docker.tsx
index 88cc78f65e..edafc3faf0 100644
--- a/src/components/dockerRegistry/Docker.tsx
+++ b/src/components/dockerRegistry/Docker.tsx
@@ -1628,7 +1628,6 @@ const DockerForm = ({
                         <div className="form__row">
                             <CustomInput
                                 name="assumeRoleArn"
-                                dataTestId="ecr-assume-role-arn-textbox"
                                 value={customState.assumeRoleArn.value}
                                 error={customState.assumeRoleArn.error}
                                 onChange={customHandleChange}