Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ecr): allow creating repository uri to use tokens like cfn params #32053

Merged
merged 11 commits into from
Nov 8, 2024
Merged

fix(ecr): allow creating repository uri to use tokens like cfn params #32053

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
81efab3
fix(ecr): allow creating repository uri suing tokens like cfn params
moelasmar Nov 7, 2024
8e39788
Merge branch 'main' into ecr-repo-uri-token
moelasmar Nov 7, 2024
1834d43
Merge branch 'main' into ecr-repo-uri-token
paulhcsun Nov 7, 2024
82658d8
Update packages/aws-cdk-lib/aws-ecr/lib/repository.ts
paulhcsun Nov 7, 2024
540d00d
Update packages/aws-cdk-lib/aws-ecr/lib/repository.ts
paulhcsun Nov 7, 2024
a66bfb5
remove the ecr deployer.
moelasmar Nov 8, 2024
9ac9788
apply comments
moelasmar Nov 8, 2024
9969237
Merge remote-tracking branch 'melasmar-aws-cdk/ecr-repo-uri-token' in…
moelasmar Nov 8, 2024
0d16ef9
fix old integ test case
moelasmar Nov 8, 2024
94e5fe2
fix build
moelasmar Nov 8, 2024
5ec99f4
Merge branch 'main' into ecr-repo-uri-token
paulhcsun Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
apply comments
  • Loading branch information
@moelasmar
moelasmar committed Nov 8, 2024
commit 9ac9788b1afb87c183219b09cf60ac9a8499a668
9 changes: 6 additions & 3 deletions packages/aws-cdk-lib/aws-ecr/lib/repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,20 +235,23 @@ export abstract class RepositoryBase extends Resource implements IRepository {

let isInputDigestCondition;

// Use the existing condition of the same Token is existed, and if not create a new one
// Use the existing condition of the Token if it already exists, and if not create a new one
if (tagOrDigest in this.tokenConditions) {
isInputDigestCondition = this.tokenConditions[tagOrDigest];
} else {
this.conditionsNumber += 1;
isInputDigestCondition = new CfnCondition(this, `IsInputDigest${this.conditionsNumber}`, {
// we split the value of the Token using the delimiter : to check if the first element equals sha256
// to check if it is a digest, or it will be an image tag.
// in order to determine if it is a digest or an image tag.
expression: Fn.conditionEquals(Fn.select(0, Fn.split(':', tagOrDigest)), 'sha256'),
});
this.tokenConditions[tagOrDigest] = isInputDigestCondition;
}

const suffix = Fn.conditionIf(isInputDigestCondition.logicalId, `@${tagOrDigest}`, `:${tagOrDigest}`).toString();
const imageTagWithPrefix = `:${tagOrDigest}`;
const imageDigestWithPrefix = `@${tagOrDigest}`;

const suffix = Fn.conditionIf(isInputDigestCondition.logicalId, imageDigestWithPrefix, imageTagWithPrefix).toString();
return this.repositoryUriWithSuffix(suffix);
} else {
if (tagOrDigest?.startsWith('sha256:')) {
Expand Down