From 049153e7cfec6fc22524158c8e28f783644e9989 Mon Sep 17 00:00:00 2001 From: Sumu Pitchayan <35242245+sumupitchayan@users.noreply.github.com> Date: Thu, 14 Sep 2023 11:09:08 -0400 Subject: [PATCH 1/4] revert: "chore(ecs): clarify it's possible to use image digest on fromEcrRepository" (#27143) Reverts aws/aws-cdk#27115 Renaming `tag` prop to `tagOrDigest` of the `ContainerImage.fromEcrRepository` function introduces a breaking change, not for typescript users, but for other languages that require specifying the property name when calling the function. --- .../@aws-cdk/aws-sagemaker-alpha/lib/container-image.ts | 7 ++----- packages/aws-cdk-lib/aws-ecs/lib/container-image.ts | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/@aws-cdk/aws-sagemaker-alpha/lib/container-image.ts b/packages/@aws-cdk/aws-sagemaker-alpha/lib/container-image.ts index c6e4423b06b6d..8a48d1bbde767 100644 --- a/packages/@aws-cdk/aws-sagemaker-alpha/lib/container-image.ts +++ b/packages/@aws-cdk/aws-sagemaker-alpha/lib/container-image.ts @@ -26,12 +26,9 @@ export interface ContainerImageConfig { export abstract class ContainerImage { /** * Reference an image in an ECR repository - * - * @param repository ECR repository - * @param tagOrDigest Optional image tag or digest (digests must start with `sha256:`) */ - public static fromEcrRepository(repository: ecr.IRepository, tagOrDigest: string = 'latest'): ContainerImage { - return new EcrImage(repository, tagOrDigest); + public static fromEcrRepository(repository: ecr.IRepository, tag: string = 'latest'): ContainerImage { + return new EcrImage(repository, tag); } /** diff --git a/packages/aws-cdk-lib/aws-ecs/lib/container-image.ts b/packages/aws-cdk-lib/aws-ecs/lib/container-image.ts index 893a8f764180e..7ba6d6bf320d7 100644 --- a/packages/aws-cdk-lib/aws-ecs/lib/container-image.ts +++ b/packages/aws-cdk-lib/aws-ecs/lib/container-image.ts @@ -18,12 +18,9 @@ export abstract class ContainerImage { /** * Reference an image in an ECR repository - * - * @param repository ECR repository - * @param tagOrDigest Optional image tag or digest (digests must start with `sha256:`) */ - public static fromEcrRepository(repository: ecr.IRepository, tagOrDigest: string = 'latest') { - return new EcrImage(repository, tagOrDigest); + public static fromEcrRepository(repository: ecr.IRepository, tag: string = 'latest') { + return new EcrImage(repository, tag); } /** From 088e60824a29d0503e5d0f83534bf33e82759540 Mon Sep 17 00:00:00 2001 From: Sumu Date: Thu, 14 Sep 2023 11:34:32 -0400 Subject: [PATCH 2/4] chore(release): 2.96.1 --- CHANGELOG.v2.alpha.md | 2 ++ CHANGELOG.v2.md | 7 +++++++ version.v2.json | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md index 30f33eaa5f131..a044ea50839ac 100644 --- a/CHANGELOG.v2.alpha.md +++ b/CHANGELOG.v2.alpha.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [2.96.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.96.0-alpha.0...v2.96.1-alpha.0) (2023-09-14) + ## [2.96.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.95.1-alpha.0...v2.96.0-alpha.0) (2023-09-13) diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md index d1c4bebc0b003..738734a1a2aa4 100644 --- a/CHANGELOG.v2.md +++ b/CHANGELOG.v2.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [2.96.1](https://github.com/aws/aws-cdk/compare/v2.96.0...v2.96.1) (2023-09-14) + + +### Reverts + +* "chore(ecs): clarify it's possible to use image digest on fromEcrRepository" ([#27143](https://github.com/aws/aws-cdk/issues/27143)) ([049153e](https://github.com/aws/aws-cdk/commit/049153e7cfec6fc22524158c8e28f783644e9989)), closes [aws/aws-cdk#27115](https://github.com/aws/aws-cdk/issues/27115) + ## [2.96.0](https://github.com/aws/aws-cdk/compare/v2.95.1...v2.96.0) (2023-09-13) diff --git a/version.v2.json b/version.v2.json index 4c373b9bf8cf9..1ad50edb88b3a 100644 --- a/version.v2.json +++ b/version.v2.json @@ -1,4 +1,4 @@ { - "version": "2.96.0", - "alphaVersion": "2.96.0-alpha.0" + "version": "2.96.1", + "alphaVersion": "2.96.1-alpha.0" } \ No newline at end of file From 3058369e938a0cb02ef9df97d228600ce3816bb3 Mon Sep 17 00:00:00 2001 From: Sumu Date: Thu, 14 Sep 2023 11:37:07 -0400 Subject: [PATCH 3/4] Verify the heading of the patch entry is H2 (##) and not H3 (###) Signed-off-by: Sumu --- CHANGELOG.v2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md index 738734a1a2aa4..e1b8a418edb74 100644 --- a/CHANGELOG.v2.md +++ b/CHANGELOG.v2.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. -### [2.96.1](https://github.com/aws/aws-cdk/compare/v2.96.0...v2.96.1) (2023-09-14) +## [2.96.1](https://github.com/aws/aws-cdk/compare/v2.96.0...v2.96.1) (2023-09-14) ### Reverts From 0bc7c64a7bfb067d8865956d41ee1303b545899c Mon Sep 17 00:00:00 2001 From: Sumu Date: Thu, 14 Sep 2023 11:49:24 -0400 Subject: [PATCH 4/4] fix ## in alpha v2 changelog Signed-off-by: Sumu --- CHANGELOG.v2.alpha.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md index a044ea50839ac..355c88ba3be58 100644 --- a/CHANGELOG.v2.alpha.md +++ b/CHANGELOG.v2.alpha.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. -### [2.96.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.96.0-alpha.0...v2.96.1-alpha.0) (2023-09-14) +## [2.96.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.96.0-alpha.0...v2.96.1-alpha.0) (2023-09-14) ## [2.96.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.95.1-alpha.0...v2.96.0-alpha.0) (2023-09-13)