fix(kms): append aliasName only after first (#3659)

aws · Aug 14, 2019 · 77671ad · 77671ad
1 parent d0beab1
commit 77671ad
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/packages/@aws-cdk/aws-kms/lib/key.ts b/packages/@aws-cdk/aws-kms/lib/key.ts
@@ -64,11 +64,23 @@ abstract class KeyBase extends Resource implements IKey {
    */
   protected abstract readonly policy?: PolicyDocument;
 
+  /**
+   * Collection of aliases added to the key
+   *
+   * Tracked to determine whether or not the aliasName should be added to the end of its ID
+   */
+  private readonly aliases: Alias[] = [];
+
   /**
    * Defines a new alias for the key.
    */
-  public addAlias(alias: string): Alias {
-    return new Alias(this, `Alias${alias}`, { aliasName: alias, targetKey: this });
+  public addAlias(aliasName: string): Alias {
+    const aliasId = this.aliases.length > 0 ? `Alias${aliasName}` : 'Alias';
+
+    const alias = new Alias(this, aliasId, { aliasName, targetKey: this });
+    this.aliases.push(alias);
+
+    return alias;
   }
 
   /**

diff --git a/packages/@aws-cdk/aws-kms/test/integ.key.expected.json b/packages/@aws-cdk/aws-kms/test/integ.key.expected.json
@@ -59,7 +59,7 @@
       "UpdateReplacePolicy": "Delete",
       "DeletionPolicy": "Delete"
     },
-    "MyKeyAliasaliasbarD0D50DB8": {
+    "MyKeyAlias1B45D9DA": {
       "Type": "AWS::KMS::Alias",
       "Properties": {
         "AliasName": "alias/bar",

diff --git a/packages/@aws-cdk/aws-kms/test/test.key.ts b/packages/@aws-cdk/aws-kms/test/test.key.ts
@@ -311,7 +311,7 @@ export = {
           DeletionPolicy: "Retain",
           UpdateReplacePolicy: "Retain",
         },
-        MyKeyAliasaliasxoo9464EB1C: {
+        MyKeyAlias1B45D9DA: {
           Type: "AWS::KMS::Alias",
           Properties: {
             AliasName: "alias/xoo",
@@ -396,7 +396,7 @@ export = {
           DeletionPolicy: "Retain",
           UpdateReplacePolicy: "Retain",
         },
-        MyKeyAliasaliasalias1668D31D7: {
+        MyKeyAlias1B45D9DA: {
           Type: "AWS::KMS::Alias",
           Properties: {
             AliasName: "alias/alias1",
@@ -484,7 +484,7 @@ export = {
 
     expect(stack2).toMatch({
       Resources: {
-        MyKeyImportedAliasaliashelloD41FEB6C: {
+        MyKeyImportedAliasB1C5269F: {
           Type: "AWS::KMS::Alias",
           Properties: {
             AliasName: "alias/hello",