updates for tests

Author: seebees

modules/branch-keystore-node/src/branch_keystore.ts

@@ -82,7 +82,7 @@ export class BranchKeyStoreNode implements IBranchKeyStoreNode {
       'Logical keystore name must be a string'
     )
 
-    needs(kmsConfiguration, 'AWS KMS Configuration required')
+    /* Precondition: KMS Configuration must be provided. */
     readOnlyProperty(
       this,
       'kmsConfiguration',

modules/branch-keystore-node/src/kms_config.ts

@@ -81,9 +81,10 @@ export class KmsKeyConfig implements RegionalKmsConfig {
     readOnlyProperty(this, '_config', config)
     /* Precondition: config must be a string or object */
     const configType = typeof config
-    needs(!!config && (configType === 'object' || 'string'), 'Config must be a `discovery` or an object.')
-    if (config === 'discovery') {
-      // Nothing to set
+    needs(!!config && (configType === 'object' || configType === 'string'), 'Config must be a `discovery` or an object.')
+    if (configType === 'string') {
+      /* Precondition: Only `discovery` is a valid string value */
+      needs(config === 'discovery', 'Unexpected config shape')
     } else if ('identifier' in config || 'mrkIdentifier' in config) {
       const arn =
         'identifier' in config ? config.identifier : config.mrkIdentifier

modules/branch-keystore-node/test/branch_keystore.test.ts

@@ -93,19 +93,16 @@ describe('Test Branch keystore', () => {
       }
     })
 
-    it('Precondition: KMS Configuration must be SRK', () => {
-      // all types of values
-      const badVals = [...falseyValues, ...truthyValues]
-
-      for (const kmsConfiguration of badVals) {
+    it('Precondition: KMS Configuration must be provided.', () => {
+      for (const kmsConfiguration of [...falseyValues, ...truthyValues]) {
         expect(
           () =>
             new BranchKeyStoreNode({
               storage: { ddbTableName: DDB_TABLE_NAME },
               logicalKeyStoreName: LOGICAL_KEYSTORE_NAME,
               kmsConfiguration: kmsConfiguration as any,
             })
-        ).to.throw('KMS Configuration must be SRK')
+        ).to.throw(/Unexpected config shape|Config must be a `discovery` or an object./)
       }
     })
 
@@ -193,11 +190,10 @@ describe('Test Branch keystore', () => {
       const kmsClient = new KMSClient({})
       const ddbClient = new DynamoDBClient({})
       expect(() => {
-        const kmsConfig = { identifier: KEY_ID }
         return new BranchKeyStoreNode({
           storage: { ddbTableName: DDB_TABLE_NAME, ddbClient },
           logicalKeyStoreName: LOGICAL_KEYSTORE_NAME,
-          kmsConfiguration: kmsConfig,
+          kmsConfiguration: { identifier: KEY_ID},
           keyManagement: { kmsClient },
         })
       }).to.throw(
@@ -224,7 +220,7 @@ describe('Test Branch keystore', () => {
     it('Valid config', () => {
       const kmsClient = new KMSClient({})
       const ddbClient = new DynamoDBClient({})
-      const kmsConfig = { identifier: KEY_ID }
+      const kmsConfig = { identifier: KEY_ARN }
       const keyStore = new BranchKeyStoreNode({
         storage: { ddbTableName: DDB_TABLE_NAME, ddbClient },
         logicalKeyStoreName: LOGICAL_KEYSTORE_NAME,
@@ -236,13 +232,13 @@ describe('Test Branch keystore', () => {
         validate(keyStore.keyStoreId) && version(keyStore.keyStoreId) === 4
       ).equals(true)
       // expect(keyStore.ddbTableName).equals(DDB_TABLE_NAME)
-      expect(keyStore.kmsConfiguration).equals(kmsConfig)
+      expect(keyStore.kmsConfiguration._config).equals(kmsConfig)
     })
 
     it('Test valid config with no clients', () => {
       const kmsClient = new KMSClient({})
       const ddbClient = new DynamoDBClient({})
-      const kmsConfig = { identifier: KEY_ID }
+      const kmsConfig = { identifier: KEY_ARN }
 
       // test with no kms client supplied
       expect(
@@ -390,7 +386,7 @@ describe('Test Branch keystore', () => {
           DDB_TABLE_NAME
         )
         expect(test.logicalKeyStoreName).to.equal(LOGICAL_KEYSTORE_NAME)
-        expect(test.kmsConfiguration).to.equal(KMS_CONFIGURATION)
+        expect(test.kmsConfiguration._config).to.equal(KMS_CONFIGURATION)
         expect(test.kmsClient).to.equal(kmsClient)
         expect((test.storage as DynamoDBKeyStorage).ddbClient).to.equal(
           ddbClient
@@ -407,7 +403,7 @@ describe('Test Branch keystore', () => {
   it('Test get active key', async () => {
     const kmsClient = new KMSClient({})
     const ddbClient = new DynamoDBClient({})
-    const kmsConfig = { identifier: KEY_ID }
+    const kmsConfig = { identifier: KEY_ARN }
     const keyStore = new BranchKeyStoreNode({
       kmsConfiguration: kmsConfig,
       storage: { ddbTableName: DDB_TABLE_NAME, ddbClient: ddbClient },
@@ -443,7 +439,7 @@ describe('Test Branch keystore', () => {
   it('Test get branch key version', async () => {
     const kmsClient = new KMSClient({})
     const ddbClient = new DynamoDBClient({})
-    const kmsConfig = { identifier: KEY_ID }
+    const kmsConfig = { identifier: KEY_ARN }
 
     const keyStore = new BranchKeyStoreNode({
       kmsConfiguration: kmsConfig,
@@ -493,7 +489,7 @@ describe('Test Branch keystore', () => {
   it('Test get active key with incorrect kms key arn', async () => {
     const kmsClient = new KMSClient({})
     const ddbClient = new DynamoDBClient({})
-    const kmsConfig = { identifier: KEY_ID }
+    const kmsConfig = { identifier: KEY_ARN }
 
     const keyStore = new BranchKeyStoreNode({
       kmsConfiguration: kmsConfig,
@@ -513,7 +509,7 @@ describe('Test Branch keystore', () => {
   it('Test get active key with wrong logical keystore name', async () => {
     const kmsClient = new KMSClient({})
     const ddbClient = new DynamoDBClient({})
-    const kmsConfig = { identifier: KEY_ID }
+    const kmsConfig = { identifier: KEY_ARN }
 
     const keyStore = new BranchKeyStoreNode({
       kmsConfiguration: kmsConfig,
@@ -531,7 +527,7 @@ describe('Test Branch keystore', () => {
   it('Test get active key does not exist fails', async () => {
     const kmsClient = new KMSClient({})
     const ddbClient = new DynamoDBClient({})
-    const kmsConfig = { identifier: KEY_ID }
+    const kmsConfig = { identifier: KEY_ARN }
 
     const keyStore = new BranchKeyStoreNode({
       kmsConfiguration: kmsConfig,
@@ -549,7 +545,7 @@ describe('Test Branch keystore', () => {
   })
 
   it('Test get active key with no clients', async () => {
-    const kmsConfig = { identifier: KEY_ID }
+    const kmsConfig = { identifier: KEY_ARN }
     const keyStore = new BranchKeyStoreNode({
       kmsConfiguration: kmsConfig,
       logicalKeyStoreName: LOGICAL_KEYSTORE_NAME,