fix(route53): remove http:// from bucket target (#4070)

* fix(route53-targets): remove `http://` from bucket target * change bucket type to IBucket to allow static import * chore: tslint fix * fix: use bucketWebsiteDomainName property * chore: remove unnecessary quotes
aws · Sep 18, 2019 · 621441d · 621441d
1 parent 1f64b87
commit 621441d
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 3 deletions.
diff --git a/packages/@aws-cdk/aws-route53-targets/lib/bucket-website-target.ts b/packages/@aws-cdk/aws-route53-targets/lib/bucket-website-target.ts
@@ -7,7 +7,7 @@ import {RegionInfo} from '@aws-cdk/region-info';
  * Use a S3 as an alias record target
  */
 export class BucketWebsiteTarget implements route53.IAliasRecordTarget {
-  constructor(private readonly bucket: s3.Bucket) {
+  constructor(private readonly bucket: s3.IBucket) {
   }
 
   public bind(_record: route53.IRecordSet): route53.AliasRecordTargetConfig {
@@ -29,7 +29,7 @@ export class BucketWebsiteTarget implements route53.IAliasRecordTarget {
 
     return {
       hostedZoneId,
-      dnsName: this.bucket.bucketWebsiteUrl,
+      dnsName: this.bucket.bucketWebsiteDomainName,
     };
   }
 }
diff --git a/packages/@aws-cdk/aws-route53-targets/test/bucket-website-target.test.ts b/packages/@aws-cdk/aws-route53-targets/test/bucket-website-target.test.ts
@@ -22,7 +22,66 @@ test('use S3 bucket website as record target', () => {
   // THEN
   expect(stack).toHaveResource('AWS::Route53::RecordSet', {
     AliasTarget: {
-      DNSName: { "Fn::GetAtt": [ "Bucket83908E77", "WebsiteURL"] },
+      DNSName: {
+        "Fn::Select": [
+          2,
+          {
+            "Fn::Split": [
+              "/",
+              {
+                "Fn::GetAtt": [
+                  "Bucket83908E77",
+                  "WebsiteURL"
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      HostedZoneId: "Z3AQBSTGFYJSTF"
+    },
+  });
+});
+
+test('use S3 bucket website as record target (fromBucketName)', () => {
+  // GIVEN
+  const app = new App();
+  const stack = new Stack(app, 'test', {env: {region: 'us-east-1'}});
+
+  const bucketWebsite = s3.Bucket.fromBucketName(stack, 'Bucket', 'test');
+
+  // WHEN
+  const zone = new route53.PublicHostedZone(stack, 'HostedZone', { zoneName: 'test.public' });
+  new route53.ARecord(zone, 'Alias', {
+    zone,
+    recordName: '_foo',
+    target: route53.RecordTarget.fromAlias(new targets.BucketWebsiteTarget(bucketWebsite))
+  });
+
+  // THEN
+  expect(stack).toHaveResource('AWS::Route53::RecordSet', {
+    AliasTarget: {
+      DNSName: {
+        "Fn::Select": [
+          2,
+          {
+            "Fn::Split": [
+              "/",
+              {
+                "Fn::Join": [
+                  "",
+                  [
+                    "test.s3-website-us-east-1.",
+                    {
+                      Ref: "AWS::URLSuffix"
+                    }
+                  ]
+                ]
+              }
+            ]
+          }
+        ]
+      },
       HostedZoneId: "Z3AQBSTGFYJSTF"
     },
   });