Skip to content

Commit 8a79cad

Browse files
Jimmy Gaussenmergify[bot]
authored andcommitted
fix(cloudfront): expose CfnDistribution as defaultChild (#4556)
* fix(cloudfront): export CfnDistribution as defaultChild * chore: fix import order
1 parent eac7695 commit 8a79cad

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

packages/@aws-cdk/aws-cloudfront/lib/web_distribution.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -697,6 +697,7 @@ export class CloudFrontWebDistribution extends cdk.Construct implements IDistrib
697697
}
698698

699699
const distribution = new CfnDistribution(this, 'CFDistribution', { distributionConfig });
700+
this.node.defaultChild = distribution;
700701
this.domainName = distribution.attrDomainName;
701702
this.distributionId = distribution.ref;
702703
}

packages/@aws-cdk/aws-cloudfront/test/test.basic.ts

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as lambda from '@aws-cdk/aws-lambda';
33
import s3 = require('@aws-cdk/aws-s3');
44
import cdk = require('@aws-cdk/core');
55
import { Test } from 'nodeunit';
6-
import { CloudFrontWebDistribution, LambdaEdgeEventType, ViewerProtocolPolicy } from '../lib';
6+
import { CfnDistribution, CloudFrontWebDistribution, LambdaEdgeEventType, ViewerProtocolPolicy } from '../lib';
77

88
// tslint:disable:object-literal-key-quotes
99

@@ -456,4 +456,23 @@ export = {
456456
test.done();
457457
},
458458

459+
'distribution has a defaultChild'(test: Test) {
460+
const stack = new cdk.Stack();
461+
const sourceBucket = new s3.Bucket(stack, 'Bucket');
462+
463+
const distribution = new CloudFrontWebDistribution(stack, 'AnAmazingWebsiteProbably', {
464+
originConfigs: [
465+
{
466+
s3OriginSource: {
467+
s3BucketSource: sourceBucket
468+
},
469+
behaviors: [{ isDefaultBehavior: true }]
470+
}
471+
]
472+
});
473+
474+
test.ok(distribution.node.defaultChild instanceof CfnDistribution);
475+
test.done();
476+
},
477+
459478
};

0 commit comments

Comments
 (0)