Merge pull request #17 from fogfish/master

Fix KMS alias name for newly created keys
SSHcom · May 18, 2020 · c91950f · c91950f
2 parents 7767005 + 9531c09
commit c91950f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/kms.ts b/lib/kms.ts
@@ -95,10 +95,10 @@ export class SymmetricKey extends kms.Key {
 
   constructor(scope: cdk.Construct, id: string, props: kms.KeyProps = {}) {
     const { alias, ...other } = props
-    const keyAlias = alias || id
+    const keyAlias = alias || `alias/${id}`
     super(scope, id, symmetricKeyProps({ alias: keyAlias, ...other }))
 
-    this.alias = new JustAlias(scope, `alias/${keyAlias}`, keyAlias)
+    this.alias = new JustAlias(scope, keyAlias, keyAlias)
     cdk.Tag.add(this, 'stack', cdk.Aws.STACK_NAME)
   }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ssh.com/c3",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Compliant Cloud Components",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

diff --git a/test/kms.test.ts b/test/kms.test.ts
@@ -67,7 +67,7 @@ it('symmetric kms.Key compliant with CIS 2.8',
       UpdateReplacePolicy: 'Retain',
     }
 
-    expect(key.alias.aliasName).toBe('MyKey')
+    expect(key.alias.aliasName).toBe('alias/MyKey')
     expect(key.alias.aliasTargetKey).toBeUndefined()
     assert.expect(stack).to(assert.countResources('AWS::KMS::Key', 1))
     assert.expect(stack).to(assert.haveResource('AWS::KMS::Key', expectKey, assert.ResourcePart.CompleteDefinition))