Merge branch 'beta' into master

Author: hasezoey

CHANGELOG.md

@@ -1,3 +1,55 @@
+## [8.8.0-beta.3](https://github.com/nodkz/mongodb-memory-server/compare/v8.8.0-beta.2...v8.8.0-beta.3) (2022-07-24)
+
+
+### Features
+
+* **MongoBinaryDownloadUrl:** change to use "aarch64" by  default and map to "arm64" where needed ([ddf1991](https://github.com/nodkz/mongodb-memory-server/commit/ddf19917aa07b1872db4e34fd1165d17f472905c)), closes [#678](https://github.com/nodkz/mongodb-memory-server/issues/678)
+* **MongoBinaryDownloadUrl::getRhelVersionString:** add support for aarch64 ([62d96e6](https://github.com/nodkz/mongodb-memory-server/commit/62d96e635bec8ced1dedde3bd65d4926c07f9a1f))
+
+
+### Dependencies
+
+* **@types/jest:** upgrade to version 28.1.6 ([dff909f](https://github.com/nodkz/mongodb-memory-server/commit/dff909facf013e069861c35a105b0666c39832ac))
+* **@typescript-eslint/*:** upgrade to version 5.30.7 ([f73a26e](https://github.com/nodkz/mongodb-memory-server/commit/f73a26ec7adb75168a2fcf18479a97720e9eab03))
+* **eslint:** upgrade to version 8.20.0 ([76a4a48](https://github.com/nodkz/mongodb-memory-server/commit/76a4a48ba36c3f54302438f8043fd45a4c32919d))
+* **jest:** upgrade to version 28.1.3 ([2ade5c3](https://github.com/nodkz/mongodb-memory-server/commit/2ade5c31a6e323aa438b0596a7481d12f4a95d36))
+* **mongodb:** set version to be "~" ([8a5552a](https://github.com/nodkz/mongodb-memory-server/commit/8a5552a8db0ac33524f573176240a4b53412546e))
+* **ts-jest:** upgrade to version 28.0.7 ([fa9975d](https://github.com/nodkz/mongodb-memory-server/commit/fa9975d20566a704cdebc634d222de61bc475ec4))
+
+## [8.8.0-beta.2](https://github.com/nodkz/mongodb-memory-server/compare/v8.8.0-beta.1...v8.8.0-beta.2) (2022-07-13)
+
+
+### Style
+
+* **MongoBinaryDownloadUrl::getFedoraVersionString:** add comment about 36 ([c168c62](https://github.com/nodkz/mongodb-memory-server/commit/c168c62b0457eee48ce671a1e823dc48572e8b1c)), closes [#673](https://github.com/nodkz/mongodb-memory-server/issues/673)
+* **MongoBinaryDownloadUrl::getLegacyVersionString:** remove nonexistent parameter from tsdoc ([417d946](https://github.com/nodkz/mongodb-memory-server/commit/417d946bb79a9b7ecd0980e88253534b225a65db))
+
+
+### Fixes
+
+* **MongoMemoryServer:** add some extra context to -86 error on macos-arm ([1f0f045](https://github.com/nodkz/mongodb-memory-server/commit/1f0f045ef89b2a94687fe10e4e7ca500f4df7426)), closes [#674](https://github.com/nodkz/mongodb-memory-server/issues/674)
+
+## [8.8.0-beta.1](https://github.com/nodkz/mongodb-memory-server/compare/v8.7.2...v8.8.0-beta.1) (2022-07-05)
+
+
+### Features
+
+* make use of the "localhost exception" for creating users ([b1f4dc0](https://github.com/nodkz/mongodb-memory-server/commit/b1f4dc01e007454aea5fe3c83df1f71fbaed892d)), closes [#670](https://github.com/nodkz/mongodb-memory-server/issues/670) [#671](https://github.com/nodkz/mongodb-memory-server/issues/671)
+
+
+### Style
+
+* **MongoMemoryServer::AutomaticAuth:** fix typo in tsdoc ([770791b](https://github.com/nodkz/mongodb-memory-server/commit/770791b0e98b25573e0a626b1ebdab279b887d81))
+
+
+### Dependencies
+
+* **@types/jest:** upgrade to version 28.1.4 ([627a3b5](https://github.com/nodkz/mongodb-memory-server/commit/627a3b5ba90cf87b5249f40e9627f2b08a637f72))
+* **@typescript-eslint/*:** upgrade to version 5.30.5 ([58cfeaf](https://github.com/nodkz/mongodb-memory-server/commit/58cfeafcc36e1c853e0a5dc2b87c124a56d25e27))
+* **eslint:** upgrade to version 8.19.0 ([574c252](https://github.com/nodkz/mongodb-memory-server/commit/574c252f804b20776337260fa5bc770c61722c7f))
+* **eslint-plugin-prettier:** upgrade to version 4.2.1 ([97145a8](https://github.com/nodkz/mongodb-memory-server/commit/97145a8a71c134ded6677cea5061abc534c61ae1))
+* **jest:** upgrade to version 28.1.2 ([c7c7303](https://github.com/nodkz/mongodb-memory-server/commit/c7c73037ddaaf619a8395de6764d2e92c73b9b02))
+
 ## [8.7.2](https://github.com/nodkz/mongodb-memory-server/compare/v8.7.1...v8.7.2) (2022-06-29)
 
 

docs/guides/supported-systems.md

@@ -12,6 +12,7 @@ Currently Supported platforms:
 Officially Supported Architectures:
 <!--Platfrom taken from "MongoBinaryDownloadUrl.translateArch"-->
 - `x64` / `x86_64`
+- `arm64` / `aarch64` (only some linux distros have binaries)
 - ~~`ia32` / `i686` / `i386`~~ (There are only binaries up to ~3.2 and [will be removed with the next MMS version](https://github.com/nodkz/mongodb-memory-server/issues/638))
 
 :::note
@@ -52,14 +53,13 @@ Depends on the distribution, many common ones should just work right out of the
 (uses mongodb's `ubuntu` release)<br/>
 Lowest supported Distribution version is `1404`<br/>
 Highest version is `2204`<br/>
-Default version is `1404`
+Default version is `1404`<br/>
+Architectures Supported: `x86_64`, `arm64`(`aarch64`)
+
 :::note
 Lower Versions than `2004` may be used if mongodb dosnt provide binaries for an lower version of mongodb for an higher version of ubuntu
 :::
 :::note
-For Arm64 MongoDB only provides binaries for `ubuntu1604`
-:::
-:::note
 There are currently no native binaries for `2204`, so it is mapped to `2004` and will require `libssl1.1` to be installed.  
 See [this mongodb issue](https://jira.mongodb.org/browse/SERVER-62300).
 :::
@@ -79,17 +79,27 @@ Default version is `10` (when in `unstable` or `testing`, otherwise none)
 
 (uses mongodb's `rhel` release)<br/>
 Lowest supported Distribution version is `6`<br/>
-Highest version is `18`<br/>
+Highest version is `36` (see note)<br/>
 Default version is `34` (when above or equal to `34`, otherwise none)
 
+:::note
+Fedora 36 and onwards dont ship openssl1.1 anymore by default and currently needs to be manually installed.  
+There are currently no newer mongodb builds that support the newer provided openssl.
+:::
+
 ### Rhel
 
 <span class="badge badge--warning">Untested</span> <span class="badge badge--warning">Outdated</span>
 
 (uses mongodb's `rhel` release)<br/>
 Lowest supported Distribution version is `5`<br/>
 Highest version is `8`<br/>
-Default version is `70`
+Default version is `70`<br/>
+Architectures Supported: `x86_64`, `arm64`(`aarch64`)
+
+:::note
+`arm64`/`aarch64` support is only for Rhel 8(.2)
+:::
 
 ### Amazon
 

package.json

@@ -14,23 +14,23 @@
     "@semantic-release/github": "7.2.3",
     "@semantic-release/npm": "7.1.3",
     "@semantic-release/release-notes-generator": "9.0.3",
-    "@types/jest": "^28.1.2",
+    "@types/jest": "^28.1.6",
     "@types/node": "~14.14.45",
-    "@typescript-eslint/eslint-plugin": "5.28.0",
-    "@typescript-eslint/parser": "5.28.0",
+    "@typescript-eslint/eslint-plugin": "5.30.7",
+    "@typescript-eslint/parser": "5.30.7",
     "commitlint": "16.2.4",
     "conventional-changelog-conventionalcommits": "5.0.0",
     "cross-env": "7.0.3",
     "doctoc": "2.2.0",
-    "eslint": "8.18.0",
+    "eslint": "8.20.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "4.0.0",
+    "eslint-plugin-prettier": "4.2.1",
     "husky": "7.0.4",
-    "jest": "28.1.1",
+    "jest": "28.1.3",
     "lint-staged": "11.2.6",
     "prettier": "2.7.1",
     "semantic-release": "17.4.7",
-    "ts-jest": "28.0.5",
+    "ts-jest": "28.0.7",
     "typescript": "4.4.4"
   },
   "workspaces": {

packages/mongodb-memory-server-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb-memory-server-core",
-  "version": "8.7.2",
+  "version": "8.8.0-beta.3",
   "description": "MongoDB Server for testing (core package, without autodownload). The server will allow you to connect your favourite ODM or client library to the MongoDB Server and run parallel integration tests isolated from each other.",
   "main": "lib/index",
   "types": "lib/index.d.ts",
@@ -48,7 +48,7 @@
     "get-port": "^5.1.1",
     "https-proxy-agent": "^5.0.1",
     "md5-file": "^5.0.0",
-    "mongodb": "^4.7.0",
+    "mongodb": "~4.7.0",
     "new-find-package-json": "^2.0.0",
     "semver": "^7.3.7",
     "tar-stream": "^2.1.4",

packages/mongodb-memory-server-core/src/MongoMemoryReplSet.ts

@@ -48,7 +48,7 @@ export interface ReplSetOpts {
    * enable auth ("--auth" / "--noauth")
    * @default false
    */
-  auth?: boolean | AutomaticAuth;
+  auth?: boolean | AutomaticAuth; // TODO: remove "boolean" option next major version
   /**
    * additional command line arguments passed to `mongod`
    * @default []
@@ -255,29 +255,58 @@ export class MongoMemoryReplSet extends EventEmitter implements ManagerAdvanced
 
     assertion(this._replSetOpts.count > 0, new ReplsetCountLowError(this._replSetOpts.count));
 
-    if (typeof this._replSetOpts.auth === 'object') {
+    // setting this for sanity
+    if (typeof this._replSetOpts.auth === 'boolean') {
+      this._replSetOpts.auth = { disable: !this._replSetOpts.auth };
+    }
+
+    // do not set default when "disable" is "true" to save execution and memory
+    if (!this._replSetOpts.auth.disable) {
       this._replSetOpts.auth = authDefault(this._replSetOpts.auth);
     }
   }
 
+  /**
+   * Helper function to determine if "auth" should be enabled
+   * This function expectes to be run after the auth object has been transformed to a object
+   * @returns "true" when "auth" should be enabled
+   */
+  protected enableAuth(): boolean {
+    if (isNullOrUndefined(this._replSetOpts.auth)) {
+      return false;
+    }
+
+    assertion(typeof this._replSetOpts.auth === 'object', new AuthNotObjectError());
+
+    return typeof this._replSetOpts.auth.disable === 'boolean' // if "this._replSetOpts.auth.disable" is defined, use that
+      ? !this._replSetOpts.auth.disable // invert the disable boolean, because "auth" should only be disabled if "disabled = true"
+      : true; // if "this._replSetOpts.auth.disable" is not defined, default to true because "this._replSetOpts.auth" is defined
+  }
+
   /**
    * Returns instance options suitable for a MongoMemoryServer.
    * @param baseOpts Options to merge with
+   * @param keyfileLocation The Keyfile location if "auth" is used
    */
-  protected getInstanceOpts(baseOpts: MongoMemoryInstanceOptsBase = {}): MongoMemoryInstanceOpts {
+  protected getInstanceOpts(
+    baseOpts: MongoMemoryInstanceOptsBase = {},
+    keyfileLocation?: string
+  ): MongoMemoryInstanceOpts {
+    const enableAuth: boolean = this.enableAuth();
+
     const opts: MongoMemoryInstanceOpts = {
-      // disable "auth" if replsetopts has an object-auth
-      auth:
-        typeof this._replSetOpts.auth === 'object' && !this._ranCreateAuth
-          ? false
-          : !!this._replSetOpts.auth,
+      auth: enableAuth,
       args: this._replSetOpts.args,
       dbName: this._replSetOpts.dbName,
       ip: this._replSetOpts.ip,
       replSet: this._replSetOpts.name,
       storageEngine: this._replSetOpts.storageEngine,
     };
 
+    if (!isNullOrUndefined(keyfileLocation)) {
+      opts.keyfileLocation = keyfileLocation;
+    }
+
     if (baseOpts.args) {
       opts.args = this._replSetOpts.args.concat(baseOpts.args);
     }
@@ -410,6 +439,12 @@ export class MongoMemoryReplSet extends EventEmitter implements ManagerAdvanced
       return;
     }
 
+    let keyfilePath: string | undefined = undefined;
+
+    if (this.enableAuth()) {
+      keyfilePath = resolve((await this.ensureKeyFile()).name, 'keyfile');
+    }
+
     // Any servers defined within `_instanceOpts` should be started first as
     // the user could have specified a `dbPath` in which case we would want to perform
     // the `replSetInitiate` command against that server.
@@ -420,15 +455,15 @@ export class MongoMemoryReplSet extends EventEmitter implements ManagerAdvanced
         }" from instanceOpts (count: ${this.servers.length + 1}):`,
         opts
       );
-      this.servers.push(this._initServer(this.getInstanceOpts(opts)));
+      this.servers.push(this._initServer(this.getInstanceOpts(opts, keyfilePath)));
     });
     while (this.servers.length < this._replSetOpts.count) {
       log(
         `initAllServers: starting extra server "${this.servers.length + 1}" of "${
           this._replSetOpts.count
         }" (count: ${this.servers.length + 1})`
       );
-      this.servers.push(this._initServer(this.getInstanceOpts()));
+      this.servers.push(this._initServer(this.getInstanceOpts(undefined, keyfilePath)));
     }
 
     log('initAllServers: waiting for all servers to finish starting');
@@ -638,15 +673,15 @@ export class MongoMemoryReplSet extends EventEmitter implements ManagerAdvanced
     const uris = this.servers.map((server) => server.getUri());
     const isInMemory = this.servers[0].instanceInfo?.storageEngine === 'ephemeralForTest';
 
-    let con: MongoClient = await MongoClient.connect(uris[0], {
+    const con: MongoClient = await MongoClient.connect(uris[0], {
       // somehow since mongodb-nodejs 4.0, this option is needed when the server is set to be in a replset
       directConnection: true,
     });
     log('_initReplSet: connected');
 
     // try-finally to close connection in any case
     try {
-      let adminDb = con.db('admin');
+      const adminDb = con.db('admin');
 
       const members = uris.map((uri, index) => ({
         _id: index,
@@ -682,34 +717,9 @@ export class MongoMemoryReplSet extends EventEmitter implements ManagerAdvanced
             new InstanceInfoError('_initReplSet authIsObject primary')
           );
 
+          await con.close(); // just ensuring that no timeouts happen or conflicts happen
           await primary.createAuth(primary.instanceInfo);
           this._ranCreateAuth = true;
-
-          // TODO: maybe change the static "isInMemory" to be for each server individually, based on "storageEngine", not just the first one
-          if (!isInMemory) {
-            log('_initReplSet: closing connection for restart');
-            await con.close(); // close connection in preparation for "stop"
-            await this.stop({ doCleanup: false, force: false }); // stop all servers for enabling auth
-            log('_initReplSet: starting all server again with auth');
-            await this.initAllServers(); // start all servers again with "auth" enabled
-            await this._waitForPrimary(); // wait for a primary to come around, because otherwise server selection may time out, this may take more than 30s
-
-            con = await MongoClient.connect(this.getUri(), {
-              authSource: 'admin',
-              authMechanism: 'SCRAM-SHA-256',
-              auth: {
-                username: this._replSetOpts.auth.customRootName as string, // cast because these are existing
-                password: this._replSetOpts.auth.customRootPwd as string,
-              },
-            });
-            adminDb = con.db('admin');
-            log('_initReplSet: auth restart finished');
-          } else {
-            console.warn(
-              'Not Restarting ReplSet for Auth\n' +
-                'Storage engine of current PRIMARY is ephemeralForTest, which does not write data on shutdown, and mongodb does not allow changing "auth" runtime'
-            );
-          }
         }
       } catch (e) {
         if (e instanceof MongoError && e.errmsg == 'already initialized') {