Merge remote-tracking branch 'origin/4.0' into NODE-3056/4.0/fix-aws-auth-test

Author: emadum

HISTORY.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [4.0.0-beta.1](https://github.com/mongodb/node-mongodb-native/compare/v4.0.0-beta.0...v4.0.0-beta.1) (2021-02-02)
+
+
+### Bug Fixes
+
+* **find:** correctly translate timeout option into noCursorTimeout ([#2708](https://github.com/mongodb/node-mongodb-native/issues/2708)) ([16a22c4](https://github.com/mongodb/node-mongodb-native/commit/16a22c4688bd1b4fba83fe54ea4eb24b7778eb86))
+* Compatibility with mongodb-client-encryption ([#2713](https://github.com/mongodb/node-mongodb-native/issues/2713)) ([d08ddb9](https://github.com/mongodb/node-mongodb-native/commit/d08ddb95984606c681b781052827e40ccdc8ef3d))
+* restore `createAutoEncrypter()` functionality ([#2710](https://github.com/mongodb/node-mongodb-native/issues/2710)) ([25ef870](https://github.com/mongodb/node-mongodb-native/commit/25ef87026bca935b00d30ad943ddd28784f801e8))
+* Support bson property on Topology class ([#2721](https://github.com/mongodb/node-mongodb-native/issues/2721)) ([00b1374](https://github.com/mongodb/node-mongodb-native/commit/00b1374454f5614879a5ecec5b4aae871e31222c))
+* Use getters to sync BulkWriteResult wrappers ([#2716](https://github.com/mongodb/node-mongodb-native/issues/2716)) ([c94b54a](https://github.com/mongodb/node-mongodb-native/commit/c94b54ad35dfe65d45f730f9e78169d169608a34))
+* **operations:** avoid hardcoding `checkKeys` for insert operations ([#2726](https://github.com/mongodb/node-mongodb-native/issues/2726)) ([5ce9b25](https://github.com/mongodb/node-mongodb-native/commit/5ce9b25c965e2be633bf4095647e73a152d9914c))
+* **operations:** make every CollationOptions property optional except `locale` ([#2727](https://github.com/mongodb/node-mongodb-native/issues/2727)) ([8a678e9](https://github.com/mongodb/node-mongodb-native/commit/8a678e9f1d323700773ab2530a137f0346036dce))
+* **WriteConcern:** avoid throwing error when options is null ([#2714](https://github.com/mongodb/node-mongodb-native/issues/2714)) ([ea142bc](https://github.com/mongodb/node-mongodb-native/commit/ea142bc78ce9f6b2b97fd8998734d3d698aa2f38))
+
 ## [4.0.0-beta.0](https://github.com/mongodb/node-mongodb-native/compare/v3.5.4...v4.0.0-beta.0) (2021-01-19)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "4.0.0-beta.0",
+  "version": "4.0.0-beta.1",
   "description": "The official MongoDB driver for Node.js",
   "main": "lib/index.js",
   "files": [
@@ -70,7 +70,7 @@
     "sinon-chai": "^3.2.0",
     "snappy": "^6.3.0",
     "source-map-support": "^0.5.19",
-    "standard-version": "^7.1.0",
+    "standard-version": "^8.0.2",
     "through2": "^3.0.1",
     "ts-node": "^9.0.0",
     "typedoc": "^0.20.14",

package.json

@@ -1,6 +1,7 @@
 import { AggregateOperation, AggregateOptions } from '../operations/aggregate';
 import { AbstractCursor, assertUninitialized } from './abstract_cursor';
 import { executeOperation, ExecutionResult } from '../operations/execute_operation';
+import { mergeOptions } from '../utils';
 import type { Document } from '../bson';
 import type { Sort } from '../sort';
 import type { Topology } from '../sdam/topology';
@@ -52,9 +53,9 @@ export class AggregationCursor extends AbstractCursor {
   }
 
   clone(): AggregationCursor {
+    const clonedOptions = mergeOptions({}, this[kOptions]);
     return new AggregationCursor(this[kParent], this.topology, this.namespace, this[kPipeline], {
-      ...this[kOptions],
-      ...this.cursorOptions
+      ...clonedOptions
     });
   }
 

src/cursor/aggregation_cursor.ts

@@ -4,6 +4,7 @@ import type { ExplainVerbosityLike } from '../explain';
 import { CountOperation, CountOptions } from '../operations/count';
 import { executeOperation, ExecutionResult } from '../operations/execute_operation';
 import { FindOperation, FindOptions } from '../operations/find';
+import { mergeOptions } from '../utils';
 import type { Hint } from '../operations/operation';
 import type { CollationOptions } from '../operations/command';
 import type { Topology } from '../sdam/topology';
@@ -52,9 +53,9 @@ export class FindCursor extends AbstractCursor {
   }
 
   clone(): FindCursor {
+    const clonedOptions = mergeOptions({}, this[kBuiltOptions]);
     return new FindCursor(this.topology, this.namespace, this[kFilter], {
-      ...this[kBuiltOptions],
-      ...this.cursorOptions
+      ...clonedOptions
     });
   }
 

src/cursor/find_cursor.ts

@@ -16,13 +16,14 @@ const SUPPORTS_WRITE_CONCERN_AND_COLLATION = 5;
 /** @public */
 export interface CollationOptions {
   locale: string;
-  caseLevel: boolean;
-  caseFirst: string;
-  strength: number;
-  numericOrdering: boolean;
-  alternate: string;
-  maxVariable: string;
-  backwards: boolean;
+  caseLevel?: boolean;
+  caseFirst?: string;
+  strength?: number;
+  numericOrdering?: boolean;
+  alternate?: string;
+  maxVariable?: string;
+  backwards?: boolean;
+  normalization?: boolean;
 }
 
 /** @public */

src/operations/command.ts

@@ -18,7 +18,7 @@ export class InsertOperation extends CommandOperation<Document> {
 
   constructor(ns: MongoDBNamespace, documents: Document[], options: BulkWriteOptions) {
     super(undefined, options);
-    this.options = { ...options, checkKeys: true };
+    this.options = { ...options, checkKeys: options.checkKeys ?? true };
     this.ns = ns;
     this.documents = documents;
   }

src/operations/insert.ts

@@ -95,18 +95,29 @@ export class TopologyDescription {
     // value among ServerDescriptions of all data-bearing server types. If any have a null
     // logicalSessionTimeoutMinutes, then TopologyDescription.logicalSessionTimeoutMinutes MUST be
     // set to null.
-    const readableServers = Array.from(this.servers.values()).filter(
-      (s: ServerDescription) => s.isReadable
-    );
-
-    this.logicalSessionTimeoutMinutes = readableServers.reduce(
-      (result: number | undefined, server: ServerDescription) => {
-        if (server.logicalSessionTimeoutMinutes == null) return;
-        if (result == null) return server.logicalSessionTimeoutMinutes;
-        return Math.min(result, server.logicalSessionTimeoutMinutes);
-      },
-      undefined
-    );
+    this.logicalSessionTimeoutMinutes = undefined;
+    for (const [, server] of this.servers) {
+      if (server.isReadable) {
+        if (server.logicalSessionTimeoutMinutes == null) {
+          // If any of the servers have a null logicalSessionsTimeout, then the whole topology does
+          this.logicalSessionTimeoutMinutes = undefined;
+          break;
+        }
+
+        if (this.logicalSessionTimeoutMinutes === undefined) {
+          // First server with a non null logicalSessionsTimeout
+          this.logicalSessionTimeoutMinutes = server.logicalSessionTimeoutMinutes;
+          continue;
+        }
+
+        // Always select the smaller of the:
+        // current server logicalSessionsTimeout and the topologies logicalSessionsTimeout
+        this.logicalSessionTimeoutMinutes = Math.min(
+          this.logicalSessionTimeoutMinutes,
+          server.logicalSessionTimeoutMinutes
+        );
+      }
+    }
   }
 
   /**

src/sdam/topology_description.ts

@@ -6,11 +6,7 @@ const fs = require('fs');
 const path = require('path');
 const BSON = require('bson');
 const { EJSON } = require('bson');
-const chai = require('chai');
-const expect = chai.expect;
-chai.config.includeStack = true;
-chai.config.showDiff = true;
-chai.config.truncateThreshold = 0;
+const { expect } = require('chai');
 
 describe('Client Side Encryption Corpus', function () {
   const metadata = {

test/functional/client_side_encryption/corpus.test.js

@@ -4,9 +4,6 @@ const crypto = require('crypto');
 const BSON = require('bson');
 const chai = require('chai');
 const expect = chai.expect;
-chai.config.includeStack = true;
-chai.config.showDiff = true;
-chai.config.truncateThreshold = 0;
 chai.use(require('chai-subset'));
 
 describe('Client Side Encryption Functional', function () {

test/functional/client_side_encryption/driver.test.js

@@ -269,6 +269,16 @@ describe('Collection', function () {
       });
     });
 
+    it('should permit insert of dot and dollar keys if requested', function () {
+      const collection = db.collection('test_invalid_key_names');
+      return Promise.all([
+        collection.insertOne({ hel$lo: 0 }, { checkKeys: false }),
+        collection.insertOne({ hello: { $hello: 0 } }, { checkKeys: false }), // embedded document can have a leading dollar
+        collection.insertOne({ 'hel.lo': 0 }, { checkKeys: false }),
+        collection.drop()
+      ]);
+    });
+
     it('should fail due to illegal listCollections', function (done) {
       db.collection(5, err => {
         expect(err.message).to.equal('collection name must be a String');

test/functional/collection.test.js

@@ -144,9 +144,9 @@ describe('Connection - functional', function () {
     metadata: { requires: { topology: 'single' } },
 
     test: function (done) {
-      var configuration = this.configuration;
-      var user = 'testConnectGoodAuth',
-        password = 'password';
+      const configuration = this.configuration;
+      const username = 'testConnectGoodAuth';
+      const password = 'password';
 
       const setupClient = configuration.newClient();
 
@@ -155,14 +155,14 @@ describe('Connection - functional', function () {
         expect(err).to.not.exist;
         var db = client.db(configuration.db);
 
-        db.addUser(user, password, function (err) {
+        db.addUser(username, password, function (err) {
           expect(err).to.not.exist;
           client.close(restOfTest);
         });
       });
 
       function restOfTest() {
-        const testClient = configuration.newClient(configuration.url(user, password));
+        const testClient = configuration.newClient(configuration.url({ username, password }));
         testClient.connect(
           connectionTester(configuration, 'testConnectGoodAuth', function (client) {
             client.close(done);
@@ -176,7 +176,7 @@ describe('Connection - functional', function () {
     metadata: { requires: { topology: 'single' } },
 
     test: function (done) {
-      var configuration = this.configuration;
+      const configuration = this.configuration;
       const username = 'testConnectGoodAuthAsOption';
       const password = 'password';
 
@@ -211,7 +211,9 @@ describe('Connection - functional', function () {
 
     test: function (done) {
       var configuration = this.configuration;
-      const client = configuration.newClient(configuration.url('slithy', 'toves'));
+      const client = configuration.newClient(
+        configuration.url({ username: 'slithy', password: 'toves' })
+      );
       client.connect(function (err, client) {
         expect(err).to.exist;
         expect(client).to.not.exist;

test/functional/connection.test.js

@@ -3755,6 +3755,65 @@ describe('Cursor', function () {
     }
   );
 
+  describe('#clone', function () {
+    let client;
+    let db;
+    let collection;
+
+    beforeEach(function () {
+      client = this.configuration.newClient({ w: 1 });
+
+      return client.connect().then(client => {
+        db = client.db(this.configuration.db);
+        collection = db.collection('test_coll');
+      });
+    });
+
+    afterEach(function () {
+      return client.close();
+    });
+
+    context('when executing on a find cursor', function () {
+      it('removes the existing session from the cloned cursor', function () {
+        const docs = [{ name: 'test1' }, { name: 'test2' }];
+        return collection.insertMany(docs).then(() => {
+          const cursor = collection.find({}, { batchSize: 1 });
+          return cursor
+            .next()
+            .then(doc => {
+              expect(doc).to.exist;
+              const clonedCursor = cursor.clone();
+              expect(clonedCursor.cursorOptions.session).to.not.exist;
+              expect(clonedCursor.session).to.not.exist;
+            })
+            .finally(() => {
+              return cursor.close();
+            });
+        });
+      });
+    });
+
+    context('when executing on an aggregation cursor', function () {
+      it('removes the existing session from the cloned cursor', function () {
+        const docs = [{ name: 'test1' }, { name: 'test2' }];
+        return collection.insertMany(docs).then(() => {
+          const cursor = collection.aggregate([{ $match: {} }], { batchSize: 1 });
+          return cursor
+            .next()
+            .then(doc => {
+              expect(doc).to.exist;
+              const clonedCursor = cursor.clone();
+              expect(clonedCursor.cursorOptions.session).to.not.exist;
+              expect(clonedCursor.session).to.not.exist;
+            })
+            .finally(() => {
+              return cursor.close();
+            });
+        });
+      });
+    });
+  });
+
   it('should return a promise when no callback supplied to forEach method', function () {
     const configuration = this.configuration;
     const client = configuration.newClient({ w: 1 }, { maxPoolSize: 1 });

test/functional/cursor.test.js

@@ -21,9 +21,6 @@ function promiseTry(callback) {
 
 chai.use(require('chai-subset'));
 chai.use(require('./matcher').default);
-chai.config.includeStack = true;
-chai.config.showDiff = true;
-chai.config.truncateThreshold = 0;
 
 function escape(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');

test/functional/spec-runner/index.js

@@ -187,7 +187,7 @@ function matchMongoSpec(chai, utils) {
       'expected #{act} to not match spec #{exp}',
       result.expected,
       result.actual,
-      chai.config.showDiff
+      chai.config.showDiff || true
     );
   });
 

test/functional/spec-runner/matcher.js

@@ -3,15 +3,15 @@
 function resolveConnectionString(configuration, spec, context) {
   const isShardedEnvironment = configuration.topologyType === 'Sharded';
   const useMultipleMongoses = spec && !!spec.useMultipleMongoses;
-  const user = context && context.user;
+  const username = context && context.user;
   const password = context && context.password;
   const authSource = context && context.authSource;
   const connectionString =
     isShardedEnvironment && !useMultipleMongoses
       ? `mongodb://${configuration.host}:${configuration.port}/${
           configuration.db
         }?directConnection=false${authSource ? '&authSource=${authSource}' : ''}`
-      : configuration.url(user, password, { authSource });
+      : configuration.url({ username, password, authSource });
   return connectionString;
 }