Update tests

Author: seebees

modules/example-node/src/kms-hierarchical-keyring/caching_cmm.ts

@@ -32,7 +32,7 @@ export async function hKeyringCachingCMMNodeSimpleTest(
   //    This SHOULD be the same configuration that you used
   //    to initially create and populate your KeyStore.
   const keyStore = new BranchKeyStoreNode({
-    ddbTableName: keyStoreTableName,
+    storage: {ddbTableName: keyStoreTableName},
     logicalKeyStoreName: logicalKeyStoreName,
     kmsConfiguration: new SrkCompatibilityKmsConfig(kmsKeyId),
   })

modules/example-node/src/kms-hierarchical-keyring/disable_commitment.ts

@@ -30,7 +30,7 @@ export async function hKeyringDisableCommitmentTest(
   //    This SHOULD be the same configuration that you used
   //    to initially create and populate your KeyStore.
   const keyStore = new BranchKeyStoreNode({
-    ddbTableName: keyStoreTableName,
+    storage: {ddbTableName: keyStoreTableName},
     logicalKeyStoreName: logicalKeyStoreName,
     kmsConfiguration: new SrkCompatibilityKmsConfig(kmsKeyId),
   })

modules/example-node/src/kms-hierarchical-keyring/multi_keyring.ts

@@ -38,7 +38,7 @@ export async function hierarchicalAesMultiKeyringTest(
   //    This SHOULD be the same configuration that you used
   //    to initially create and populate your KeyStore.
   const keyStore = new BranchKeyStoreNode({
-    ddbTableName: keyStoreTableName,
+    storage: {ddbTableName: keyStoreTableName},
     logicalKeyStoreName: logicalKeyStoreName,
     kmsConfiguration: new SrkCompatibilityKmsConfig(kmsKeyId),
   })

modules/example-node/src/kms-hierarchical-keyring/multi_tenancy.ts

@@ -98,7 +98,7 @@ export async function hKeyringMultiTenancy(
   //    This SHOULD be the same configuration that you used
   //    to initially create and populate your KeyStore.
   const keyStore = new BranchKeyStoreNode({
-    ddbTableName: keyStoreTableName,
+    storage: {ddbTableName: keyStoreTableName},
     logicalKeyStoreName: logicalKeyStoreName,
     kmsConfiguration: new SrkCompatibilityKmsConfig(kmsKeyId),
   })

modules/example-node/src/kms-hierarchical-keyring/simple.ts

@@ -63,7 +63,7 @@ export async function hKeyringSimpleTest(
   //    This SHOULD be the same configuration that you used
   //    to initially create and populate your KeyStore.
   const keyStore = new BranchKeyStoreNode({
-    ddbTableName: keyStoreTableName,
+    storage: {ddbTableName: keyStoreTableName},
     logicalKeyStoreName: logicalKeyStoreName,
     kmsConfiguration: new SrkCompatibilityKmsConfig(kmsKeyId),
   })

modules/example-node/src/kms-hierarchical-keyring/stream.ts

@@ -38,7 +38,7 @@ export async function hKeyringStreamTest(
   //    This SHOULD be the same configuration that you used
   //    to initially create and populate your KeyStore.
   const keyStore = new BranchKeyStoreNode({
-    ddbTableName: keyStoreTableName,
+    storage: {ddbTableName: keyStoreTableName},
     logicalKeyStoreName: logicalKeyStoreName,
     kmsConfiguration: new SrkCompatibilityKmsConfig(kmsKeyId),
   })

modules/kms-keyring-node/src/kms_hkeyring_node.ts

@@ -95,7 +95,6 @@ export class KmsHierarchicalKeyRingNode
 
     const partition = randomBytes(64)
     readOnlyProperty(this, '_partition', partition)
-    readOnlyProperty(this, '_logicalKeyStoreName', stringToUtf8Bytes(keyStore.logicalKeyStoreName))    
 
     /* Precondition: The branch key id must be a string */
     if (branchKeyId) {
@@ -123,6 +122,8 @@ export class KmsHierarchicalKeyRingNode
       'The keystore must be a BranchKeyStore'
     )
 
+    readOnlyProperty(this, '_logicalKeyStoreName', stringToUtf8Bytes(keyStore.getKeyStoreInfo().logicalKeyStoreName))    
+
     /* Precondition: The cache limit TTL must be a number */
     needs(
       typeof cacheLimitTtl === 'number',

modules/kms-keyring-node/test/kms_hkeyring_node.edk-order.test.ts

@@ -35,7 +35,7 @@ import {
   testOnDecryptError,
   testOnEncrypt,
 } from './kms_hkeyring_node.test'
-import { BranchKeyStoreNode } from '@aws-crypto/branch-keystore-node'
+import { BranchKeyStoreNode, KeyStoreInfoOutput } from '@aws-crypto/branch-keystore-node'
 chai.use(chaiAsPromised)
 
 // an edk that can't even be destructured according to any alg suite
@@ -145,6 +145,17 @@ describe('KmsHierarchicalKeyRingNode: decrypt EDK order', () => {
         )
       }
     })
+
+    keyStore.getKeyStoreInfo.callsFake(function(): KeyStoreInfoOutput {
+      return {
+        keystoreId: "keyStoreId",
+        keystoreTableName: "keystoreTableName",
+        logicalKeyStoreName: "logicalKeyStoreName",
+        grantTokens: [],
+        // This is not used by any tests
+        kmsConfiguration: null as any
+      }
+    })
   })
 
   afterEach(() => {

modules/kms-keyring-node/test/kms_hkeyring_node.ondecrypt.test.ts

@@ -34,7 +34,7 @@ import { expect } from 'chai'
 import Sinon from 'sinon'
 import { KMSClient } from '@aws-sdk/client-kms'
 import { DynamoDBClient } from '@aws-sdk/client-dynamodb'
-import { BranchKeyStoreNode } from '@aws-crypto/branch-keystore-node'
+import { BranchKeyStoreNode, KeyStoreInfoOutput } from '@aws-crypto/branch-keystore-node'
 
 const branchKeyIdA = BRANCH_KEY_ID_A
 const branchKeyIdB = BRANCH_KEY_ID_B
@@ -129,6 +129,17 @@ describe('KmsHierarchicalKeyRingNode: onDecrypt', () => {
         )
       }
     })
+
+    keyStore.getKeyStoreInfo.callsFake(function(): KeyStoreInfoOutput {
+      return {
+        keystoreId: "keyStoreId",
+        keystoreTableName: "keystoreTableName",
+        logicalKeyStoreName: "logicalKeyStoreName",
+        grantTokens: [],
+        // This is not used by any tests
+        kmsConfiguration: null as any
+      }
+    })
   })
 
   afterEach(() => {
@@ -584,6 +595,7 @@ describe('KmsHierarchicalKeyRingNode: onDecrypt', () => {
 
     it('CMC evictions occur due to capacity', async () => {
       const maxCacheSize = 1
+      
       const hkr = new KmsHierarchicalKeyRingNode({
         branchKeyIdSupplier,
         keyStore,

modules/kms-keyring-node/test/kms_hkeyring_node.onencrypt.test.ts

@@ -28,7 +28,7 @@ import {
   testOnEncrypt,
   testOnEncryptError,
 } from './kms_hkeyring_node.test'
-import { BranchKeyStoreNode } from '@aws-crypto/branch-keystore-node'
+import { BranchKeyStoreNode, KeyStoreInfoOutput } from '@aws-crypto/branch-keystore-node'
 chai.use(chaiAsPromised)
 
 const branchKeyIdA = BRANCH_KEY_ID_A
@@ -84,6 +84,17 @@ describe('KmsHierarchicalKeyRingNode: onEncrypt', () => {
         )
       }
     })
+
+    keyStore.getKeyStoreInfo.callsFake(function(): KeyStoreInfoOutput {
+      return {
+        keystoreId: "keyStoreId",
+        keystoreTableName: "keystoreTableName",
+        logicalKeyStoreName: "logicalKeyStoreName",
+        grantTokens: [],
+        // This is not used by any tests
+        kmsConfiguration: null as any
+      }
+    })
   })
 
   // what to do after each test: reset all sinons