Apply suggestions from code review

Co-authored-by: José Corella <[email protected]>
Co-authored-by: Tony Knapp <[email protected]>

Author: 3 people

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

@@ -274,15 +274,15 @@ export class BranchKeyStoreNode implements IBranchKeyStoreNode {
     needs(
       activeEncryptedBranchKey.type instanceof
         ActiveHierarchicalSymmetricVersion,
-      'Unexpected type. Not an version record.'
+      'Unexpected type. Not a version record.'
     )
 
     //= aws-encryption-sdk-specification/framework/branch-key-store.md#getactivebranchkey
     //# GetActiveBranchKey MUST verify that the returned EncryptedHierarchicalKey MUST have a logical table name equal to the configured logical table name.
     needs(
       activeEncryptedBranchKey.encryptionContext[TABLE_FIELD] ==
         this.logicalKeyStoreName,
-      'Unexpected logical table name.'
+      'Unexpected logical table name. Expected ${this.logicalKeyStoreName}, found ${activeEncryptedBranchKey.encryptionContext[TABLE_FIELD]}.'
     )
 
     //= aws-encryption-sdk-specification/framework/branch-key-store.md#getactivebranchkey
@@ -319,7 +319,7 @@ export class BranchKeyStoreNode implements IBranchKeyStoreNode {
       'MUST supply a string branch key id'
     )
     needs(
-      branchKeyId && branchKeyVersion,
+      branchKeyVersion && typeof branchKeyVersion === 'string,
       'MUST supply a string branch key version'
     )
 
@@ -352,15 +352,15 @@ export class BranchKeyStoreNode implements IBranchKeyStoreNode {
     //# GetActiveBranchKey MUST verify that the returned EncryptedHierarchicalKey is an HierarchicalSymmetricVersion.
     needs(
       encryptedBranchKey.type instanceof HierarchicalSymmetricVersion,
-      'Unexpected type. Not an version record.'
+      'Unexpected type. Not a version record.'
     )
 
     //= aws-encryption-sdk-specification/framework/branch-key-store.md#getbranchkeyversion
     //# GetBranchKeyVersion MUST verify that the returned EncryptedHierarchicalKey MUST have a logical table name equal to the configured logical table name.
     needs(
       encryptedBranchKey.encryptionContext[TABLE_FIELD] ==
         this.logicalKeyStoreName,
-      'Unexpected logical table name.'
+      'Unexpected logical table name. Expected ${this.logicalKeyStoreName}, found ${encryptedBranchKey.encryptionContext[TABLE_FIELD}.'
     )
 
     //= aws-encryption-sdk-specification/framework/branch-key-store.md#getbranchkeyversion