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): AutoDeleteImages custom resource description contains "undefined" #26800

Merged
merged 5 commits into from
Aug 22, 2023
Merged

fix(ecr): AutoDeleteImages custom resource description contains "undefined" #26800

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc86d05
chore: repo name is not embedded in CustomResourceProvider description
go-to-k Aug 18, 2023
29e6418
chore: move autoDeleteImages handling
go-to-k Aug 19, 2023
4b8ba64
Merge branch 'main' into chore/ecr-repo-name-is-not-embedded
mergify[bot] Aug 21, 2023
6ef0b5a
Merge branch 'main' into chore/ecr-repo-name-is-not-embedded
rix0rrr Aug 22, 2023
23d4871
Merge branch 'main' into chore/ecr-repo-name-is-not-embedded
mergify[bot] Aug 22, 2023
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
4 changes: 2 additions & 2 deletions ...-ecr/test/integ.repository-auto-delete-images.js.snapshot/aws-ecr-integ-stack.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
}
}
},
"adb4722adf5406a51ec51892647c61e7ac61ba38b845cd1163397018822e542e": {
"f7032f0e3d4a420cf27f5b6a19d9097105b1bd8f4d91c3fc98eb303a6ece75ed": {
"source": {
"path": "aws-ecr-integ-stack.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "adb4722adf5406a51ec51892647c61e7ac61ba38b845cd1163397018822e542e.json",
"objectKey": "f7032f0e3d4a420cf27f5b6a19d9097105b1bd8f4d91c3fc98eb303a6ece75ed.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
13 changes: 12 additions & 1 deletion ...cr/test/integ.repository-auto-delete-images.js.snapshot/aws-ecr-integ-stack.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,18 @@
]
},
"Runtime": "nodejs18.x",
"Description": "Lambda function for auto-deleting images in undefined repository."
"Description": {
"Fn::Join": [
"",
[
"Lambda function for auto-deleting images in ",
{
"Ref": "Repo02AC86CF"
},
" repository."
]
]
}
},
"DependsOn": [
"CustomECRAutoDeleteImagesCustomResourceProviderRole665F2773"
Expand Down
2 changes: 1 addition & 1 deletion ...ork-integ/test/aws-ecr/test/integ.repository-auto-delete-images.js.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/adb4722adf5406a51ec51892647c61e7ac61ba38b845cd1163397018822e542e.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f7032f0e3d4a420cf27f5b6a19d9097105b1bd8f4d91c3fc98eb303a6ece75ed.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down
13 changes: 12 additions & 1 deletion ...ault-resources.js.snapshot/StagingStack-default-resourcesmax-ACCOUNT-REGION.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,18 @@
]
},
"Runtime": "nodejs18.x",
"Description": "Lambda function for auto-deleting images in undefined repository."
"Description": {
"Fn::Join": [
"",
[
"Lambda function for auto-deleting images in ",
{
"Ref": "defaultresourcesmaxecrasset13112F7F9"
},
" repository."
]
]
}
},
"DependsOn": [
"CustomECRAutoDeleteImagesCustomResourceProviderRole665F2773"
Expand Down
Loading