-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into rmuller/contributin…
…g-md
- Loading branch information
Showing
23 changed files
with
317 additions
and
142 deletions.
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
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
53 changes: 53 additions & 0 deletions
53
packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-ipv6-disabled.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": "redirect-to-https" | ||
| }, | ||
| "DefaultRootObject": "index.html", | ||
| "Enabled": true, | ||
| "HttpVersion": "http2", | ||
| "IPV6Enabled": false, | ||
| "Origins": [ | ||
| { | ||
| "DomainName": { | ||
| "Fn::GetAtt": [ | ||
| "Bucket83908E77", | ||
| "DomainName" | ||
| ] | ||
| }, | ||
| "Id": "origin1", | ||
| "S3OriginConfig": {} | ||
| } | ||
| ], | ||
| "PriceClass": "PriceClass_100", | ||
| "ViewerCertificate": { | ||
| "CloudFrontDefaultCertificate": true | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
24 changes: 24 additions & 0 deletions
24
packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-ipv6-disabled.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,24 @@ | ||
|
|
||
| import s3 = require('@aws-cdk/aws-s3'); | ||
| import cdk = require('@aws-cdk/cdk'); | ||
| import cloudfront = require('../lib'); | ||
|
|
||
| const app = new cdk.App(); | ||
|
|
||
| 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}] | ||
| } | ||
| ], | ||
| enableIpV6: false | ||
| }); | ||
|
|
||
| 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,25 @@ | ||
| import { App, Stack } from '@aws-cdk/cdk'; | ||
| import { VpcNetwork } from '../lib'; | ||
| import cdk = require('@aws-cdk/cdk'); | ||
| import ec2 = require('../lib'); | ||
|
|
||
| const app = new App(); | ||
| const app = new cdk.App(); | ||
| const stack = new cdk.Stack(app, 'aws-cdk-ec2-vpc'); | ||
|
|
||
| const stack = new Stack(app, 'aws-cdk-ec2-vpc'); | ||
| const vpc = new ec2.VpcNetwork(stack, 'MyVpc'); | ||
|
|
||
| new VpcNetwork(stack, 'MyVpc'); | ||
| // Test Security Group Rules | ||
| const sg = new ec2.SecurityGroup(stack, 'SG', { vpc }); | ||
|
|
||
| const rules = [ | ||
| new ec2.IcmpPing(), | ||
| new ec2.IcmpAllTypeCodes(128), | ||
| new ec2.IcmpAllTypesAndCodes(), | ||
| new ec2.UdpAllPorts(), | ||
| new ec2.UdpPort(123), | ||
| new ec2.UdpPortRange(800, 801), | ||
| ]; | ||
|
|
||
| for (const rule of rules) { | ||
| sg.addIngressRule(new ec2.AnyIPv4(), rule); | ||
| } | ||
|
|
||
| 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
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
Oops, something went wrong.