WIP - #305 - expanding tests EOD

MatrixAI · Feb 24, 2022 · 48afda2 · 48afda2
1 parent c5d70d2
commit 48afda2
Show file tree

Hide file tree

Showing 3 changed files with 498 additions and 128 deletions.
diff --git a/src/vaults/VaultInternal.ts b/src/vaults/VaultInternal.ts
@@ -20,7 +20,7 @@ import type GRPCClientAgent from '../agent/GRPCClientAgent';
 import type { POJO } from '../types';
 import path from 'path';
 import git from 'isomorphic-git';
-import grpc from '@grpc/grpc-js';
+import * as grpc from '@grpc/grpc-js';
 import Logger from '@matrixai/logger';
 import {
   CreateDestroyStartStop,

diff --git a/src/vaults/VaultManager.ts b/src/vaults/VaultManager.ts
@@ -237,6 +237,7 @@ class VaultManager {
       await withF([this.getWriteLock(vaultId)], async () => {
         await vaultAndLock.vault?.stop();
       });
+      this.vaultMap.delete(vaultIdString);
     }
 
     // Need to figure out if this id thing is a good idea
@@ -804,6 +805,12 @@ class VaultManager {
         if (vault != null) {
           return vault;
         }
+        // Only create if the vault state already exists
+        if ((await this.getVaultMeta(vaultId)) == null) {
+          throw new vaultsErrors.ErrorVaultsVaultUndefined(
+            `Vault ${vaultsUtils.encodeVaultId(vaultId)} doesn't exist`,
+          );
+        }
         vault = await VaultInternal.createVaultInternal({
           vaultId,
           keyManager: this.keyManager,
@@ -827,6 +834,12 @@ class VaultManager {
       let release;
       try {
         release = await lock.acquireWrite();
+        // Only create if the vault state already exists
+        if ((await this.getVaultMeta(vaultId)) == null) {
+          throw new vaultsErrors.ErrorVaultsVaultUndefined(
+            `Vault ${vaultsUtils.encodeVaultId(vaultId)} doesn't exist`,
+          );
+        }
         vault = await VaultInternal.createVaultInternal({
           vaultId,
           keyManager: this.keyManager,