Skip to content

Commit 3e1cc69

Browse files
authored
feat(ecr): make assume role optional (#2321)
1 parent 2ea52da commit 3e1cc69

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,12 @@ async function ensureLoggedIntoDockerRegistry(
271271
if (isEcrRegistry(registryHost)) {
272272
auth = await getEcrAuthToken({
273273
registryHost,
274-
assumeRole: {
275-
roleArn: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN,
276-
externalId: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID,
277-
},
274+
assumeRole: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN
275+
? {
276+
roleArn: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN,
277+
externalId: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID,
278+
}
279+
: undefined,
278280
});
279281
} else if (!auth) {
280282
throw new Error("Authentication required for non-ECR registry");

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,12 @@ export class InitializeDeploymentService extends BaseService {
7777
nextVersion,
7878
environmentSlug: environment.slug,
7979
registryTags: env.DEPLOY_REGISTRY_ECR_TAGS,
80-
assumeRole: {
81-
roleArn: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN,
82-
externalId: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID,
83-
},
80+
assumeRole: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN
81+
? {
82+
roleArn: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN,
83+
externalId: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID,
84+
}
85+
: undefined,
8486
})
8587
);
8688

0 commit comments

Comments
 (0)