From 54ffdedec74185c5bb3b0bfb8d3f41da3ab6bfa8 Mon Sep 17 00:00:00 2001
From: Adam Boxall <adam.boxall@gmail.com>
Date: Mon, 29 Oct 2018 15:36:51 +0000
Subject: [PATCH] fix(aws-kms): encryption key ref export

---
 .../@aws-cdk/aws-kinesis/test/test.stream.ts  |  6 +++
 packages/@aws-cdk/aws-kms/lib/key.ts          |  2 +-
 packages/@aws-cdk/aws-kms/test/test.key.ts    | 42 +++++++++++--------
 3 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/packages/@aws-cdk/aws-kinesis/test/test.stream.ts b/packages/@aws-cdk/aws-kinesis/test/test.stream.ts
index 99c0fd22888d1..5aaa910254d5f 100644
--- a/packages/@aws-cdk/aws-kinesis/test/test.stream.ts
+++ b/packages/@aws-cdk/aws-kinesis/test/test.stream.ts
@@ -953,6 +953,12 @@ export = {
         },
         "Outputs": {
           "MyStreamKeyKeyArn967BCB03": {
+            "Value": {
+              "Fn::GetAtt": [
+                "MyStreamKey76F3300E",
+                "Arn"
+              ]
+            },
             "Export": {
               "Name": "MyStreamKeyKeyArn967BCB03"
             }
diff --git a/packages/@aws-cdk/aws-kms/lib/key.ts b/packages/@aws-cdk/aws-kms/lib/key.ts
index fed34ea93a97e..004e576199e11 100644
--- a/packages/@aws-cdk/aws-kms/lib/key.ts
+++ b/packages/@aws-cdk/aws-kms/lib/key.ts
@@ -75,7 +75,7 @@ export abstract class EncryptionKeyRef extends Construct {
    */
   public export(): EncryptionKeyRefProps {
     return {
-      keyArn: new Output(this, 'KeyArn').makeImportValue().toString()
+      keyArn: new Output(this, 'KeyArn', { value: this.keyArn }).makeImportValue().toString()
     };
   }
 }
diff --git a/packages/@aws-cdk/aws-kms/test/test.key.ts b/packages/@aws-cdk/aws-kms/test/test.key.ts
index 5805b1fa315d9..6ffa56c2806a6 100644
--- a/packages/@aws-cdk/aws-kms/test/test.key.ts
+++ b/packages/@aws-cdk/aws-kms/test/test.key.ts
@@ -304,29 +304,35 @@ export = {
 
     expect(stack1).toMatch({
       Resources: {
-      MyKey6AB29FA6: {
-        Type: "AWS::KMS::Key",
-        Properties: {
-        KeyPolicy: {
-          Statement: [
-          {
-            Effect: "Allow",
-            Resource: "*"
-          }
-          ],
-          Version: "2012-10-17"
+        MyKey6AB29FA6: {
+          Type: "AWS::KMS::Key",
+          Properties: {
+            KeyPolicy: {
+              Statement: [
+                {
+                  Effect: "Allow",
+                  Resource: "*"
+                }
+              ],
+              Version: "2012-10-17"
+            }
+          },
+          DeletionPolicy: "Retain"
         }
-        },
-        DeletionPolicy: "Retain"
-      }
       },
       Outputs: {
-      MyKeyKeyArn317F1332: {
-        Export: {
-        Name: "MyKeyKeyArn317F1332"
+        MyKeyKeyArn317F1332: {
+          Value: {
+            "Fn::GetAtt": [
+              "MyKey6AB29FA6",
+              "Arn"
+            ]
+          },
+          Export: {
+            Name: "MyKeyKeyArn317F1332"
+          }
         }
       }
-      }
     });
 
     const stack2 = new Stack();