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

feat(cloudfront): s3 origin access control L2 construct #31254

Merged
merged 79 commits into from
Sep 5, 2024
Merged

feat(cloudfront): s3 origin access control L2 construct #31254

merged 79 commits into from
Sep 5, 2024

Conversation

gracelu0
Copy link
Contributor

@gracelu0 gracelu0 commented Aug 29, 2024 •
edited
Loading

Issue # (if applicable)

Closes #21771 .

Reason for this change

L2 support for setting up OAC for S3 origins.

See RFC 617 for more details.

Description of changes

  • New L2 construct OriginAccessControl
  • Deprecation of CloudFrontWebDistribution — replaced by existing Distribution construct
  • Deprecation of S3Origin — replaced by new constructs S3BucketOrigin and S3StaticWebsiteOrigin
  • README updates

Description of how you validated changes

Added unit tests and integration tests

Internal tracking: V1491594161

Checklist

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

gracelu0 and others added 30 commits August 25, 2024 15:29
@gracelu0
wip oac
cd5f600
@gracelu0
create custom resource to update kms policy
fee9488
@gracelu0
custom resource for bucket policy
4ae6627
@gracelu0
Support oac in webDistribution
dc49ed1
@gracelu0
refactor
ad28865
@gracelu0
fix undefined distribution id
98af399
@gracelu0
refactor
d87681e
@gracelu0
Add validation for origin type on OAC
c9bba82
@gracelu0
Add origin type to oac
8a4e752
@gracelu0
remove feature flag
4267b49
@gracelu0
deprecate S3Origin and replace with S3StaticWebsiteOrigin and S3Bucke…
a0529ec 
…tOrigin
@gracelu0
Add S3BucketOrigin subclass props
e0a3d37
@gracelu0
update README for cloudfront with new API for S3BucketOrigin
1bd7d95
@gracelu0
add unit tests for S3 OAC
5c16627
@gracelu0
remove name length validation (leave this to cloudformation)
664d2a9
@gracelu0
fix unit test
62f8c68
@gracelu0
formatting
012dfc6
@gracelu0
Add integration test for S3 bucket origin with default OAC
622209a
@gracelu0
add if check to OAC bind method
1f7f792
@samson-keung @gracelu0
check default properties in OriginAccessControl in unit test
d4ac775
@gracelu0
remove custom resource
a306f53
@gracelu0
fix integ test formatting
d9376fb
@gracelu0
Add note about bucket object ownership with OAC
840957d
@gracelu0
remove web distribution oac
632c131
@samson-keung @gracelu0
adding first unit test for S3BucketOrigin
bbc70e0
@samson-keung @gracelu0
more unit tests for S3BucketOrigin
d835503
@samson-keung @gracelu0
more unit tests for S3BucketOrigin and removed originAccessControlId …
7f51018 
…prop from origin base
@gracelu0
address feedback
1b9455c
@gracelu0
fix unit tests
903b105
@samson-keung @gracelu0
Unit test for S3BucketOrigin.withOriginAccessIdentity
4c9d719
GavinZZ
GavinZZ approved these changes Sep 5, 2024
View reviewed changes
Copy link
Contributor

@GavinZZ GavinZZ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks Grace for the great work!

paulhcsun
paulhcsun approved these changes Sep 5, 2024
View reviewed changes
Copy link
Contributor

@paulhcsun paulhcsun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noice, great work @gracelu0!

xazhao
xazhao approved these changes Sep 5, 2024
View reviewed changes
Copy link
Contributor

@xazhao xazhao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks for the work!

@aws-cdk-automation aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Sep 5, 2024
samson-keung
samson-keung approved these changes Sep 5, 2024
View reviewed changes
Copy link
Contributor

@samson-keung samson-keung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excited to see this launch. Thank you for the hard work

@gracelu0
Copy link
Contributor Author

gracelu0 commented Sep 5, 2024

Thank you all for reviewing!! @paulhcsun @GavinZZ @xazhao @samson-keung

@gracelu0 gracelu0 removed the pr/do-not-merge This PR should not be merged at this time. label Sep 5, 2024
@gracelu0
Copy link
Contributor Author

gracelu0 commented Sep 5, 2024

@Mergifyio update

@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 5, 2024

update

✅ Branch has been successfully updated

@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 5, 2024

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).

1 similar comment
@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 5, 2024

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-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 3d79694
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify mergify bot merged commit 30675f0 into main Sep 5, 2024
11 of 12 checks passed
@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 5, 2024

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).

@mergify mergify bot deleted the gracelu0/s3-oac-l2 branch September 5, 2024 17:36
@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 5, 2024

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@xazhao xazhao xazhao approved these changes

@GavinZZ GavinZZ GavinZZ approved these changes

@samson-keung samson-keung samson-keung approved these changes

@paulhcsun paulhcsun paulhcsun approved these changes

Assignees
No one assigned
Labels
contribution/core This is a PR that came from AWS. effort/medium Medium work item – several days of effort feature-request A feature should be added or improved. p2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

cloudfront: Support Origin Access Control
6 participants
@gracelu0 @paulhcsun @aws-cdk-automation @GavinZZ @xazhao @samson-keung