fix(s3): missing http on website url (#4189)

* fix(s3): missing http on website url

* review

Author: hoegertn

packages/@aws-cdk/aws-route53-targets/test/bucket-website-target.test.ts

@@ -62,24 +62,14 @@ test('use S3 bucket website as record target (fromBucketName)', () => {
   expect(stack).toHaveResource('AWS::Route53::RecordSet', {
     AliasTarget: {
       DNSName: {
-        "Fn::Select": [
-          2,
-          {
-            "Fn::Split": [
-              "/",
-              {
-                "Fn::Join": [
-                  "",
-                  [
-                    "test.s3-website-us-east-1.",
-                    {
-                      Ref: "AWS::URLSuffix"
-                    }
-                  ]
-                ]
-              }
-            ]
-          }
+        "Fn::Join": [
+          "",
+          [
+            "test.s3-website-us-east-1.",
+            {
+              Ref: "AWS::URLSuffix"
+            }
+          ]
         ]
       },
       HostedZoneId: "Z3AQBSTGFYJSTF"

packages/@aws-cdk/aws-s3/lib/bucket.ts

@@ -883,16 +883,16 @@ export class Bucket extends BucketBase {
       ? false
       : attrs.bucketWebsiteNewUrlFormat;
 
-    const websiteUrl = newUrlFormat
+    const websiteDomain = newUrlFormat
       ? `${bucketName}.s3-website.${region}.${urlSuffix}`
       : `${bucketName}.s3-website-${region}.${urlSuffix}`;
 
     class Import extends BucketBase {
       public readonly bucketName = bucketName!;
       public readonly bucketArn = parseBucketArn(scope, attrs);
       public readonly bucketDomainName = attrs.bucketDomainName || `${bucketName}.s3.${urlSuffix}`;
-      public readonly bucketWebsiteUrl = attrs.bucketWebsiteUrl || websiteUrl;
-      public readonly bucketWebsiteDomainName = Fn.select(2, Fn.split('/', attrs.bucketWebsiteUrl || websiteUrl));
+      public readonly bucketWebsiteUrl = attrs.bucketWebsiteUrl || `http://${websiteDomain}`;
+      public readonly bucketWebsiteDomainName = attrs.bucketWebsiteUrl ? Fn.select(2, Fn.split('/', attrs.bucketWebsiteUrl)) : websiteDomain;
       public readonly bucketRegionalDomainName = attrs.bucketRegionalDomainName || `${bucketName}.s3.${region}.${urlSuffix}`;
       public readonly bucketDualStackDomainName = attrs.bucketDualStackDomainName || `${bucketName}.s3.dualstack.${region}.${urlSuffix}`;
       public readonly bucketWebsiteNewUrlFormat = newUrlFormat;

packages/@aws-cdk/aws-s3/test/test.bucket.ts

@@ -1563,6 +1563,43 @@ export = {
       });
       test.done();
     },
+    'exports the WebsiteURL for imported buckets'(test: Test) {
+      const stack = new cdk.Stack();
+      const bucket = s3.Bucket.fromBucketName(stack, 'Website', 'my-test-bucket');
+      test.deepEqual(stack.resolve(bucket.bucketWebsiteUrl), {
+        'Fn::Join': [
+          '',
+          [
+            'http://my-test-bucket.s3-website-',
+            { Ref: 'AWS::Region' },
+            '.',
+            { Ref: 'AWS::URLSuffix' }
+          ]
+        ]
+      });
+      test.deepEqual(stack.resolve(bucket.bucketWebsiteDomainName), {
+        'Fn::Join': [
+          '',
+          [
+            'my-test-bucket.s3-website-',
+            { Ref: 'AWS::Region' },
+            '.',
+            { Ref: 'AWS::URLSuffix' }
+          ]
+        ]
+      });
+      test.done();
+    },
+    'exports the WebsiteURL for imported buckets with url'(test: Test) {
+      const stack = new cdk.Stack();
+      const bucket = s3.Bucket.fromBucketAttributes(stack, 'Website', {
+        bucketName: 'my-test-bucket',
+        bucketWebsiteUrl: 'http://my-test-bucket.my-test.suffix',
+      });
+      test.deepEqual(stack.resolve(bucket.bucketWebsiteUrl), 'http://my-test-bucket.my-test.suffix');
+      test.deepEqual(stack.resolve(bucket.bucketWebsiteDomainName), 'my-test-bucket.my-test.suffix');
+      test.done();
+    },
     'adds RedirectAllRequestsTo property'(test: Test) {
       const stack = new cdk.Stack();
       new s3.Bucket(stack, 'Website', {