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

Jump to bottom

fix(cloudfront): all origin access identities have identical names #9829

Merged
merged 2 commits into from
Aug 19, 2020
Merged

fix(cloudfront): all origin access identities have identical names #9829

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
7432ab0
fix(cloudfront): All origin access identities have identical names
njlynch Aug 19, 2020
94046f1
Merge branch 'master' into njlynch/cf-oai-comment
mergify[bot] Aug 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-cloudfront-origins/lib/s3-origin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ class S3BucketOrigin extends cloudfront.OriginBase {

public bind(scope: cdk.Construct, options: cloudfront.OriginBindOptions): cloudfront.OriginBindConfig {
if (!this.originAccessIdentity) {
this.originAccessIdentity = new cloudfront.OriginAccessIdentity(scope, 'S3Origin');
this.originAccessIdentity = new cloudfront.OriginAccessIdentity(scope, 'S3Origin', {
comment: `Access identity for ${options.originId}`,
njlynch marked this conversation as resolved.
Show resolved Hide resolved
});
this.bucket.grantRead(this.originAccessIdentity);
}
return super.bind(scope, options);
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-cloudfront-origins/test/integ.origin-group.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"Type": "AWS::CloudFront::CloudFrontOriginAccessIdentity",
"Properties": {
"CloudFrontOriginAccessIdentityConfig": {
"Comment": "Allows CloudFront to reach the bucket"
"Comment": "Access identity for cloudfrontorigingroupDistributionOrigin137659A54"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-cloudfront-origins/test/integ.s3-origin.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"Type": "AWS::CloudFront::CloudFrontOriginAccessIdentity",
"Properties": {
"CloudFrontOriginAccessIdentityConfig": {
"Comment": "Allows CloudFront to reach the bucket"
"Comment": "Access identity for cloudfronts3originDistributionOrigin1741C4E95"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-cloudfront-origins/test/s3-origin.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ describe('With bucket', () => {

expect(stack).toHaveResourceLike('AWS::CloudFront::CloudFrontOriginAccessIdentity', {
CloudFrontOriginAccessIdentityConfig: {
Comment: 'Allows CloudFront to reach the bucket',
Comment: 'Access identity for StackDistOrigin15754CE84',
},
});
expect(stack).toHaveResourceLike('AWS::S3::BucketPolicy', {
Expand Down