fix(aws-s3): properly export bucketDomainName (#844)

ZeldoKavira · rix0rrr · commit 8caa28c530cc · 2018-10-03T23:07:11.000+02:00
diff --git a/packages/@aws-cdk/aws-s3/lib/bucket.ts b/packages/@aws-cdk/aws-s3/lib/bucket.ts
@@ -110,6 +110,7 @@ export abstract class BucketRef extends cdk.Construct {
     return {
       bucketArn: new cdk.Output(this, 'BucketArn', { value: this.bucketArn }).makeImportValue().toString(),
       bucketName: new cdk.Output(this, 'BucketName', { value: this.bucketName }).makeImportValue().toString(),
+      bucketDomainName: new cdk.Output(this, 'DomainName', { value: this.domainName }).makeImportValue().toString(),
     };
   }
 
diff --git a/packages/@aws-cdk/aws-s3/test/test.bucket.ts b/packages/@aws-cdk/aws-s3/test/test.bucket.ts
@@ -329,7 +329,8 @@ export = {
       const bucketRef = bucket.export();
       test.deepEqual(cdk.resolve(bucketRef), {
         bucketArn: { 'Fn::ImportValue': 'MyStack:MyBucketBucketArnE260558C' },
-        bucketName: { 'Fn::ImportValue': 'MyStack:MyBucketBucketName8A027014' }
+        bucketName: { 'Fn::ImportValue': 'MyStack:MyBucketBucketName8A027014' },
+        bucketDomainName: { 'Fn::ImportValue': 'MyStack:MyBucketDomainNameF76B9A7A' }
       });
       test.done();
     },
@@ -340,7 +341,8 @@ export = {
       const bucketRef = bucket.export();
       test.deepEqual(cdk.resolve(bucketRef), {
         bucketArn: { 'Fn::ImportValue': 'MyStack:MyBucketBucketArnE260558C' },
-        bucketName: { 'Fn::ImportValue': 'MyStack:MyBucketBucketName8A027014' }
+        bucketName: { 'Fn::ImportValue': 'MyStack:MyBucketBucketName8A027014' },
+        bucketDomainName: { 'Fn::ImportValue': 'MyStack:MyBucketDomainNameF76B9A7A' }
       });
       test.done();
     },
@@ -457,6 +459,17 @@ export = {
           "Export": {
           "Name": "S1:MyBucketBucketName8A027014"
           }
+        },
+        "MyBucketDomainNameF76B9A7A": {
+          "Value": {
+            "Fn::GetAtt": [
+              "MyBucketF68F3FF0",
+              "DomainName"
+            ]
+          },
+          "Export": {
+            "Name": "S1:MyBucketDomainNameF76B9A7A"
+          }
         }
         }
       });
@@ -881,6 +894,17 @@ export = {
         "Export": {
         "Name": "MyBucketBucketName8A027014"
         }
+      },
+      "MyBucketDomainNameF76B9A7A": {
+        "Value": {
+          "Fn::GetAtt": [
+            "MyBucketF68F3FF0",
+            "DomainName"
+          ]
+        },
+        "Export": {
+          "Name": "MyBucketDomainNameF76B9A7A"
+        }
       }
       }
     });

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ export abstract class BucketRef extends cdk.Construct {`
`110`	`110`	`return {`
`111`	`111`	`bucketArn: new cdk.Output(this, 'BucketArn', { value: this.bucketArn }).makeImportValue().toString(),`
`112`	`112`	`bucketName: new cdk.Output(this, 'BucketName', { value: this.bucketName }).makeImportValue().toString(),`
	`113`	`+ bucketDomainName: new cdk.Output(this, 'DomainName', { value: this.domainName }).makeImportValue().toString(),`
`113`	`114`	`};`
`114`	`115`	`}`
`115`	`116`