updating kms and solving special tags members

aws · Jun 7, 2019 · ac60000 · ac60000
1 parent 6193da3
commit ac60000
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/packages/@aws-cdk/aws-kms/lib/key.ts b/packages/@aws-cdk/aws-kms/lib/key.ts
@@ -224,7 +224,7 @@ export class Key extends KeyBase {
       keyPolicy: this.policy,
     });
 
-    this.keyArn = resource.keyArn;
+    this.keyArn = resource.attrArn;
     resource.options.deletionPolicy = props.retain === false
                                     ? DeletionPolicy.Delete
                                     : DeletionPolicy.Retain;

diff --git a/tools/cfn2ts/lib/codegen.ts b/tools/cfn2ts/lib/codegen.ts
@@ -318,6 +318,10 @@ export default class CodeGenerator {
         this.code.indent(`if (props !== undefined) {`);
       }
       for (const prop of Object.values(propMap)) {
+        // tags are handled by the tagmanager already
+        if (prop === 'tags') {
+          continue;
+        }
         this.code.line(`this.${prop} = props.${prop};`);
       }
       if (optionalProps) {
@@ -355,6 +359,9 @@ export default class CodeGenerator {
     this.code.openBlock(`protected get updatedProperties(): ${propsType.className}`);
     this.code.indent('return {');
     for (const prop of Object.values(propMap)) {
+      if (prop === 'tags') {
+        continue;
+      }
       this.code.line(`${prop}: this.${prop},`);
     }
     this.code.unindent('};');