Skip to content

Switch Content S3 Bucket to Use CloudFront Origin Access Control #415

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

Open
sureshc wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −6
Open

Switch Content S3 Bucket to Use CloudFront Origin Access Control #415

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 24 additions & 6 deletions cicd/3-app/javabuilder/template.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,16 +487,32 @@ Resources:
Status: Enabled
ExpirationInDays: 1

ContentOriginAccessControl:
Type: AWS::CloudFront::OriginAccessControl
Properties:
OriginAccessControlConfig:
Name: !Sub "${SubdomainName}-${BaseDomainName}-content-oac"
OriginAccessControlOriginType: s3
SigningBehavior: always
SigningProtocol: sigv4

ContentBucketPolicy:
Type: AWS::S3::BucketPolicy
Properties:
Bucket: !Ref ContentBucket
PolicyDocument:
Version: '2012-10-17'
Statement:
- Action: ['s3:GetObject']
Effect: Allow
Resource: !Sub "arn:aws:s3:::${ContentBucket}/*"
Principal: '*'
- Sid: AllowCloudFrontRead
Effect: Allow
Principal:
Service: cloudfront.amazonaws.com
Action:
- s3:GetObject
Resource: !Sub "arn:aws:s3:::${ContentBucket}/*"
Condition:
StringEquals:
AWS:SourceArn: !Sub "arn:aws:cloudfront::${AWS::AccountId}:distribution/${ContentCDN}"

ContentApiCertificate:
Type: AWS::CertificateManager::Certificate
Expand Down Expand Up @@ -537,8 +553,10 @@ Resources:
# Prefix: !Sub "${SubdomainName}-content.${BaseDomainName}"
Origins:
- Id: ContentBucket
DomainName: !GetAtt ContentBucket.DomainName
S3OriginConfig: {}
DomainName: !GetAtt ContentBucket.RegionalDomainName
OriginAccessControlId: !GetAtt ContentOriginAccessControl.Id
S3OriginConfig:
OriginAccessIdentity: ""
DefaultCacheBehavior:
TargetOriginId: ContentBucket
AllowedMethods: [DELETE, GET, HEAD, OPTIONS, PATCH, POST, PUT]
Expand Down