Skip to content

fix(ecr): Generate valid CloudFormation for imageScanOnPush #13420

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

Merged
merged 2 commits into from
Mar 5, 2021
Merged

fix(ecr): Generate valid CloudFormation for imageScanOnPush #13420

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c233d5
fix #13418: Update ECR construct to generate valid CloudFormation whe…
cplee Mar 5, 2021
db04a82
Merge branch 'master' into iss-13418-ecr-scan-on-push
mergify[bot] Mar 5, 2021
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
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-ecr/lib/repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ export class Repository extends RepositoryBase {
repositoryPolicyText: Lazy.any({ produce: () => this.policyDocument }),
lifecyclePolicy: Lazy.any({ produce: () => this.renderLifecyclePolicy() }),
imageScanningConfiguration: !props.imageScanOnPush ? undefined : {
scanOnPush: true,
ScanOnPush: true,
},
});

Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-ecr/test/integ.imagescan.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Type": "AWS::ECR::Repository",
"Properties": {
"ImageScanningConfiguration": {
"scanOnPush": true
"ScanOnPush": true
}
},
"UpdateReplacePolicy": "Delete",
Expand Down Expand Up @@ -87,4 +87,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-ecr/test/test.repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export = {
// THEN
expect(stack).to(haveResource('AWS::ECR::Repository', {
ImageScanningConfiguration: {
scanOnPush: true,
ScanOnPush: true,
},
}));
test.done();
Expand Down