cleanups

Author: baileympearson

scripts/setup-encryption-tests.js

@@ -5,63 +5,48 @@ const { rm, readdir, writeFile } = require('fs/promises');
 const { tmpdir } = require('os');
 const { join, resolve } = require('path');
 
-async function getCryptShared() {
-  const crypt_shared_dir = await downloadMongoDb('./data/crypt', '8.0', {
-    enterprise: true,
-    crypt_shared: true
-  });
 
-  for (const direntry of await readdir(crypt_shared_dir)) {
-    if (/crypt/.test(direntry)) {
-      return join(crypt_shared_dir, direntry);
-    }
-  }
-}
+async function main() {
+  const runnerDir = join(resolve(__dirname), '../data');
+  const serverVersion = '8.0';
 
-const runnerDir = join(resolve(__dirname), '../data');
-const id = 'my-cluster';
+  const { uri, cryptShared } = await run();
+  await writeFile('mo-expansion.yml',
+    `CRYPT_SHARED_LIB_PATH: "${cryptShared}"
+MONGODB_URI: "${uri}"`
+  );
 
-async function run() {
-  await rm(runnerDir, { recursive: true }).catch(e => {});
+  async function downloadCryptShared() {
+    const crypt_shared_dir = await downloadMongoDb(join(runnerDir, 'crypt'), serverVersion, {
+      enterprise: true,
+      crypt_shared: true
+    });
 
-  const cryptShared = await getCryptShared();
-  const binDir = await downloadMongoDb('./data', '8.0', {
-    enterprise: true
-  });
+    for (const dirEntry of await readdir(crypt_shared_dir)) {
+      if (/crypt/.test(dirEntry)) {
+        return join(crypt_shared_dir, dirEntry);
+      }
+    }
+  }
 
-  const tmpDir = tmpdir();
+  async function run() {
+    await rm(runnerDir, { recursive: true }).catch(() => {});
 
-  await start({ id, binDir, topology: 'replset', runnerDir, tmpDir });
+    const cryptShared = await downloadCryptShared();
+    const binDir = await downloadMongoDb(runnerDir, serverVersion, {
+      enterprise: true
+    });
 
-  for await (const instance of instances({ runnerDir })) {
-    if (instance.id === id) return {
-      cryptShared, uri: instance.connectionString
-    };
-  }
+    await start({ id: 'encryption-test-cluster', binDir, topology: 'replset', runnerDir, tmpDir: tmpdir() });
 
-  throw new Error('unable to find new instance.');
-}
-
-async function stop() {
-  await require('mongodb-runner').stop({
-    runnerDir,
-    id
-  });
-}
+    for await (const instance of instances({ runnerDir })) {
+      if (instance.id === 'encryption-test-cluster') return {
+        cryptShared, uri: instance.connectionString
+      };
+    }
 
-async function main() {
-  const { uri, cryptShared } = await run();
-  await writeFile('mo-expansion.yml',
-    `
-        CRYPT_SHARED_LIB_PATH: "${cryptShared}"
-        MONGODB_URI: "${uri}"
-        `
-  );
+    throw new Error('Unable to location newly configured instance of mongod - should never happen.');
+  }
 }
 
-if (require.main === module) {
-  main();
-}
-else {
-  module.exports = { start: run, stop };
-}
+main();

test/encryption/encryption.test.js

@@ -8,8 +8,7 @@ const { ObjectId, Double, Int32, Decimal128 } = require('bson');
 const fs = require('fs');
 const mongoose = require('../../lib');
 const { Map } = require('../../lib/types');
-
-const { stop, start } = require('../../scripts/setup-encryption-tests');
+const { join } = require('path');
 
 const LOCAL_KEY = Buffer.from('Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk', 'base64');
 
@@ -33,34 +32,19 @@ function isEncryptedValue(object, property) {
 }
 
 describe('encryption integration tests', () => {
-  const cachedUri = process.env.MONGOOSE_TEST_URI;
-  const cachedLib = process.env.CRYPT_SHARED_LIB_PATH;
-
   before(async function() {
-    this.timeout(0);
-    const cwd = process.cwd();
-    if (!exists(cwd + '/mo-expansion.yml')) {
-      const { uri, cryptShared } = await start();
-      process.env.CRYPT_SHARED_LIB_PATH = cryptShared;
-      process.env.MONGOOSE_TEST_URI = uri;
-    } else {
-      const file = fs.readFileSync(cwd + '/mo-expansion.yml', { encoding: 'utf-8' }).trim().split('\n');
-
-      const regex = /^(?<key>.*): "(?<value>.*)"$/;
-      const variables = Object.fromEntries(file.map((line) => regex.exec(line.trim()).groups).map(({ key, value }) => [key, value]));
-
-      process.env.CRYPT_SHARED_LIB_PATH = variables.CRYPT_SHARED_LIB_PATH;
-      process.env.MONGOOSE_TEST_URI = variables.MONGODB_URI;
+    const expansionFile = join(__dirname, '../..', 'mo-expansion.yml');
+    if (!exists(expansionFile)) {
+      throw new Error('must setup a cluster using `npm run setup-test-encryption`.');
     }
-  });
 
-  after(async function() {
-    if (!exists(process.cwd() + '/mo-expansion.yml')) {
-      await stop();
-    }
+    const lines = fs.readFileSync(expansionFile, { encoding: 'utf-8' }).trim().split('\n');
+
+    const regex = /^(?<key>.*): "(?<value>.*)"$/;
+    const variables = Object.fromEntries(lines.map((line) => regex.exec(line.trim()).groups).map(({ key, value }) => [key, value]));
 
-    process.env.CRYPT_SHARED_LIB_PATH = cachedLib;
-    process.env.MONGOOSE_TEST_URI = cachedUri;
+    process.env.CRYPT_SHARED_LIB_PATH = variables.CRYPT_SHARED_LIB_PATH;
+    process.env.MONGOOSE_TEST_URI = variables.MONGODB_URI;
   });
 
   describe('meta: environmental variables are correctly set up', () => {