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

aws · Oct 3, 2018 · 8caa28c · 8caa28c
1 parent 8215389
commit 8caa28c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
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"
+ }
  }
  }
  });