fix(cloudfront): logging bucket uses global domain name (#10945)

This reverts #10570. The logging buckets were originally using the regional domain names, but this caused odd behavior with CloudFront's new console "Logs" experience. #10570 switched logging buckets to use the global domain name, which addressed the console issue but broke customers in CN regions. We will follow up internally to improve the CloudFront console issue. fixes #10923 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Oct 20, 2020 · aa3f3fd · aa3f3fd
1 parent dd81e77
commit aa3f3fd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/packages/@aws-cdk/aws-cloudfront/lib/distribution.ts b/packages/@aws-cdk/aws-cloudfront/lib/distribution.ts
@@ -419,7 +419,7 @@ export class Distribution extends Resource implements IDistribution {
 
     const bucket = props.logBucket ?? new s3.Bucket(this, 'LoggingBucket');
     return {
-      bucket: bucket.bucketDomainName,
+      bucket: bucket.bucketRegionalDomainName,
       includeCookies: props.logIncludesCookies,
       prefix: props.logFilePrefix,
     };

diff --git a/packages/@aws-cdk/aws-cloudfront/lib/web_distribution.ts b/packages/@aws-cdk/aws-cloudfront/lib/web_distribution.ts
@@ -899,7 +899,7 @@ export class CloudFrontWebDistribution extends cdk.Resource implements IDistribu
       distributionConfig = {
         ...distributionConfig,
         logging: {
-          bucket: this.loggingBucket.bucketDomainName,
+          bucket: this.loggingBucket.bucketRegionalDomainName,
           includeCookies: props.loggingConfig.includeCookies || false,
           prefix: props.loggingConfig.prefix,
         },

diff --git a/packages/@aws-cdk/aws-cloudfront/test/distribution.test.ts b/packages/@aws-cdk/aws-cloudfront/test/distribution.test.ts
@@ -79,7 +79,7 @@ test('exhaustive example of props renders correctly', () => {
       HttpVersion: 'http1.1',
       IPV6Enabled: false,
       Logging: {
-        Bucket: { 'Fn::GetAtt': ['MyDistLoggingBucket9B8976BC', 'DomainName'] },
+        Bucket: { 'Fn::GetAtt': ['MyDistLoggingBucket9B8976BC', 'RegionalDomainName'] },
         IncludeCookies: true,
         Prefix: 'logs/',
       },
@@ -411,7 +411,7 @@ describe('logging', () => {
     expect(stack).toHaveResourceLike('AWS::CloudFront::Distribution', {
       DistributionConfig: {
         Logging: {
-          Bucket: { 'Fn::GetAtt': ['MyDistLoggingBucket9B8976BC', 'DomainName'] },
+          Bucket: { 'Fn::GetAtt': ['MyDistLoggingBucket9B8976BC', 'RegionalDomainName'] },
         },
       },
     });
@@ -428,7 +428,7 @@ describe('logging', () => {
     expect(stack).toHaveResourceLike('AWS::CloudFront::Distribution', {
       DistributionConfig: {
         Logging: {
-          Bucket: { 'Fn::GetAtt': ['MyLoggingBucket4382CD04', 'DomainName'] },
+          Bucket: { 'Fn::GetAtt': ['MyLoggingBucket4382CD04', 'RegionalDomainName'] },
         },
       },
     });
@@ -446,7 +446,7 @@ describe('logging', () => {
     expect(stack).toHaveResourceLike('AWS::CloudFront::Distribution', {
       DistributionConfig: {
         Logging: {
-          Bucket: { 'Fn::GetAtt': ['MyDistLoggingBucket9B8976BC', 'DomainName'] },
+          Bucket: { 'Fn::GetAtt': ['MyDistLoggingBucket9B8976BC', 'RegionalDomainName'] },
           IncludeCookies: true,
           Prefix: 'logs/',
         },

diff --git a/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-bucket-logging.expected.json b/packages/@aws-cdk/aws-cloudfront/test/integ.cloudfront-bucket-logging.expected.json
@@ -36,7 +36,7 @@
             "Bucket": {
               "Fn::GetAtt": [
                 "Bucket83908E77",
-                "DomainName"
+                "RegionalDomainName"
               ]
             },
             "IncludeCookies": true,
@@ -109,7 +109,7 @@
             "Bucket": {
               "Fn::GetAtt": [
                 "AnAmazingWebsiteProbably2LoggingBucket222F7CE9",
-                "DomainName"
+                "RegionalDomainName"
               ]
             },
             "IncludeCookies": false
@@ -146,4 +146,4 @@
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-extensive.expected.json b/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-extensive.expected.json
@@ -24,7 +24,7 @@
             "Bucket": {
               "Fn::GetAtt": [
                 "MyDistLoggingBucket9B8976BC",
-                "DomainName"
+                "RegionalDomainName"
               ]
             },
             "IncludeCookies": true,