fix(cloudfront): Escape hatch support for Distribution

Changed the ID for the CfnDistribution to support escape hatches (`dist.node.defaultChild`). fixes #9620 BREAKING CHANGE: (cloudfront) Changed IDs for Distributions
aws · Aug 12, 2020 · dff6799 · dff6799
1 parent a772fe8
commit dff6799
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/packages/@aws-cdk/aws-cloudfront-origins/test/integ.http-origin.expected.json b/packages/@aws-cdk/aws-cloudfront-origins/test/integ.http-origin.expected.json
@@ -1,6 +1,6 @@
 {
   "Resources": {
-    "DistributionCFDistribution882A7313": {
+    "Distribution830FAC52": {
       "Type": "AWS::CloudFront::Distribution",
       "Properties": {
         "DistributionConfig": {

diff --git a/packages/@aws-cdk/aws-cloudfront-origins/test/integ.load-balancer-origin.expected.json b/packages/@aws-cdk/aws-cloudfront-origins/test/integ.load-balancer-origin.expected.json
@@ -400,7 +400,7 @@
         }
       }
     },
-    "DistributionCFDistribution882A7313": {
+    "Distribution830FAC52": {
       "Type": "AWS::CloudFront::Distribution",
       "Properties": {
         "DistributionConfig": {
@@ -430,4 +430,4 @@
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-cloudfront-origins/test/integ.origin-group.expected.json b/packages/@aws-cdk/aws-cloudfront-origins/test/integ.origin-group.expected.json
@@ -64,7 +64,7 @@
         }
       }
     },
-    "DistributionCFDistribution882A7313": {
+    "Distribution830FAC52": {
       "Type": "AWS::CloudFront::Distribution",
       "Properties": {
         "DistributionConfig": {
@@ -141,4 +141,4 @@
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-cloudfront-origins/test/integ.s3-origin.expected.json b/packages/@aws-cdk/aws-cloudfront-origins/test/integ.s3-origin.expected.json
@@ -64,7 +64,7 @@
         }
       }
     },
-    "DistributionCFDistribution882A7313": {
+    "Distribution830FAC52": {
       "Type": "AWS::CloudFront::Distribution",
       "Properties": {
         "DistributionConfig": {

diff --git a/packages/@aws-cdk/aws-cloudfront/lib/distribution.ts b/packages/@aws-cdk/aws-cloudfront/lib/distribution.ts
@@ -158,7 +158,7 @@ export class Distribution extends Resource implements IDistribution {
     this.certificate = props.certificate;
     this.errorResponses = props.errorResponses ?? [];
 
-    const distribution = new CfnDistribution(this, 'CFDistribution', { distributionConfig: {
+    const distribution = new CfnDistribution(this, 'Resource', { distributionConfig: {
       enabled: true,
       origins: Lazy.anyValue({ produce: () => this.renderOrigins() }),
       originGroups: Lazy.anyValue({ produce: () => this.renderOriginGroups() }),

diff --git a/packages/@aws-cdk/aws-cloudfront/test/distribution.test.ts b/packages/@aws-cdk/aws-cloudfront/test/distribution.test.ts
@@ -382,6 +382,24 @@ test('price class is included if provided', () => {
   });
 });
 
+test('escape hatches are supported', () => {
+  const dist = new Distribution(stack, 'Dist', {
+    defaultBehavior: { origin: defaultOrigin },
+  });
+  const cfnDist = dist.node.defaultChild as CfnDistribution;
+  cfnDist.addPropertyOverride('DistributionConfig.DefaultCacheBehavior.ForwardedValues.Headers', ['*']);
+
+  expect(stack).toHaveResourceLike('AWS::CloudFront::Distribution', {
+    DistributionConfig: {
+      DefaultCacheBehavior: {
+        ForwardedValues: {
+          Headers: ['*'],
+        },
+      },
+    },
+  });
+});
+
 function defaultOrigin(domainName?: string): IOrigin {
   return new TestOrigin(domainName ?? 'www.example.com');
 }