-
Notifications
You must be signed in to change notification settings - Fork 3.9k
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.
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): auto delete images on ECR repository containing manifest list #25789
Conversation
…te event, deletes all images on delete event
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.
A comment requesting an exemption should contain the text Exemption Request
. Additionally, if clarification is needed add Clarification Request
to a comment.
Exemption Request - All integration tests remain unchanged so I think we do not need to update snapshots in this PR. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add diffAssets: true
to the integ test here? Since this integ test tests custom resources this should have been set to true and will show the diff.
Line 19 in 53d24f1
testCases: [stack], |
@corymhall |
@hkford |
✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good! Just a couple of minor comments.
@@ -40,14 +40,23 @@ async function emptyRepository(params: ECR.ListImagesRequest) { | |||
const listedImages = await ecr.listImages(params).promise(); | |||
|
|||
const imageIds = listedImages?.imageIds ?? []; | |||
const imageIdsTagged = imageIds.filter((imageId) => 'imageTag' in imageId) ?? []; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like you would be processing the tagged images twice. Can we instead create two lists that don't have overlap?
Maybe something like
const imageIds = [];
const imageIdsTagged = [];
(listedImages.imageIds ?? []).forEach(imageId => {
if ('imageTag' in imageId) {
imageIdsTagged.push(imageId);
} else {
imageIds.push(imageId);
}
});
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add a test where some images are tagged and some are not (with mixed ordering) so that we can assert that it deletes the tagged images first?
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
Fixes #24822
As I commented on #24822 (comment), auto delete container images in ECR repository fails when it has container manifest list. I fix custom resource Lambda function to delete tagged images first.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license