-
Notifications
You must be signed in to change notification settings - Fork 4k
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.
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 CloudFront origin error #514
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
7ffee35
Fix CloudFront origin error
mindstorms6 70a1fc5
CloudFront origin comment fix
mindstorms6 f142583
Fix package.json of CloudFront to align with standards
mindstorms6 64c6a32
Adding a few more tests
mindstorms6 8396a5c
Do validation of origins in constructor
mindstorms6 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-custom.expected.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| { | ||
| "Resources": { | ||
| "AnAmazingWebsiteProbablyCFDistribution47E3983B": { | ||
| "Type": "AWS::CloudFront::Distribution", | ||
| "Properties": { | ||
| "DistributionConfig": { | ||
| "CacheBehaviors": [], | ||
| "DefaultCacheBehavior": { | ||
| "AllowedMethods": [ | ||
| "GET", | ||
| "HEAD" | ||
| ], | ||
| "CachedMethods": [ | ||
| "GET", | ||
| "HEAD" | ||
| ], | ||
| "ForwardedValues": { | ||
| "Cookies": { | ||
| "Forward": "none" | ||
| }, | ||
| "QueryString": false | ||
| }, | ||
| "TargetOriginId": "origin1", | ||
| "ViewerProtocolPolicy": "https-only" | ||
| }, | ||
| "DefaultRootObject": "index.html", | ||
| "Enabled": true, | ||
| "HttpVersion": "http2", | ||
| "IPV6Enabled": true, | ||
| "Origins": [ | ||
| { | ||
| "CustomOriginConfig": { | ||
| "HTTPPort": 80, | ||
| "HTTPSPort": 443, | ||
| "OriginKeepaliveTimeout": 5, | ||
| "OriginProtocolPolicy": "https-only", | ||
| "OriginReadTimeout": 30, | ||
| "OriginSSLProtocols": [ | ||
| "TLSv1.2" | ||
| ] | ||
| }, | ||
| "DomainName": "brelandm.a2z.com", | ||
| "Id": "origin1", | ||
| "OriginCustomHeaders": [ | ||
| { | ||
| "HeaderName": "X-Custom-Header", | ||
| "HeaderValue": "somevalue" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "PriceClass": "PriceClass_100", | ||
| "ViewerCertificate": { | ||
| "CloudFrontDefaultCertificate": true | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-custom.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
|
|
||
| import cdk = require('@aws-cdk/cdk'); | ||
| import cloudfront = require('../lib'); | ||
|
|
||
| const app = new cdk.App(process.argv); | ||
|
|
||
| const stack = new cdk.Stack(app, 'aws-cdk-cloudfront-custom'); | ||
|
|
||
| new cloudfront.CloudFrontWebDistribution(stack, 'AnAmazingWebsiteProbably', { | ||
| originConfigs: [ | ||
| { | ||
| originHeaders: { | ||
| "X-Custom-Header": "somevalue", | ||
| }, | ||
| customOriginSource: { | ||
| domainName: "brelandm.a2z.com", | ||
| }, | ||
| behaviors: [ | ||
| { | ||
| isDefaultBehavior: true, | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }); | ||
|
|
||
| process.stdout.write(app.run()); |
53 changes: 53 additions & 0 deletions
53
packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront.expected.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| { | ||
| "Resources": { | ||
| "Bucket83908E77": { | ||
| "Type": "AWS::S3::Bucket" | ||
| }, | ||
| "MyDistributionCFDistributionDE147309": { | ||
| "Type": "AWS::CloudFront::Distribution", | ||
| "Properties": { | ||
| "DistributionConfig": { | ||
| "CacheBehaviors": [], | ||
| "DefaultCacheBehavior": { | ||
| "AllowedMethods": [ | ||
| "GET", | ||
| "HEAD" | ||
| ], | ||
| "CachedMethods": [ | ||
| "GET", | ||
| "HEAD" | ||
| ], | ||
| "ForwardedValues": { | ||
| "Cookies": { | ||
| "Forward": "none" | ||
| }, | ||
| "QueryString": false | ||
| }, | ||
| "TargetOriginId": "origin1", | ||
| "ViewerProtocolPolicy": "https-only" | ||
| }, | ||
| "DefaultRootObject": "index.html", | ||
| "Enabled": true, | ||
| "HttpVersion": "http2", | ||
| "IPV6Enabled": true, | ||
| "Origins": [ | ||
| { | ||
| "DomainName": { | ||
| "Fn::GetAtt": [ | ||
| "Bucket83908E77", | ||
| "DomainName" | ||
| ] | ||
| }, | ||
| "Id": "origin1", | ||
| "S3OriginConfig": {} | ||
| } | ||
| ], | ||
| "PriceClass": "PriceClass_100", | ||
| "ViewerCertificate": { | ||
| "CloudFrontDefaultCertificate": true | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
|
|
||
| import s3 = require('@aws-cdk/aws-s3'); | ||
| import cdk = require('@aws-cdk/cdk'); | ||
| import cloudfront = require('../lib'); | ||
|
|
||
| const app = new cdk.App(process.argv); | ||
|
|
||
| const stack = new cdk.Stack(app, 'aws-cdk-cloudfront'); | ||
|
|
||
| const sourceBucket = new s3.Bucket(stack, 'Bucket'); | ||
|
|
||
| new cloudfront.CloudFrontWebDistribution(stack, 'MyDistribution', { | ||
| originConfigs: [ | ||
| { | ||
| s3OriginSource: { | ||
| s3BucketSource: sourceBucket | ||
| }, | ||
| behaviors : [ {isDefaultBehavior: true}] | ||
| } | ||
| ] | ||
| }); | ||
|
|
||
| process.stdout.write(app.run()); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it possible to add origins after the construct is created (might be a useful feature)? If not, then why not just validate this in the constructor?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't mind validating in the constructor - I just thought that was the point of the
validatemethod.Is the idea that validate is only used if you have post-constructor modifications? (That makes sense to me, just trying to get a feel for how you see it)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yap. It's a hook that allows you to perform validations just before synthesis. But the sooner you can perform a validation, the better, because the error will include the most context for the user to be able to understand what they did wrong.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Understood. I'll drop the
validatefor the time being - I don't currently think adding a origin post creation is valuable. (In my mind - it's not.)If someone opens a pull request later - it's easy enough to add that.