Merge remote-tracking branch 'origin/master' into NODE-2820/remove-readable-from-cursor

Author: emadum

.gitignore

@@ -51,3 +51,6 @@ yarn.lock
 lib/
 *.tgz
 *.d.ts
+
+.vscode
+output

etc/update-spec-tests.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# This script is used to fetch the latest tests for the specified spec.
+# It puts the tests in the direcory $spec_root. It should be run from the root of the repository.
+
+set -o errexit
+set -o nounset
+
+if [ ! -d ".git" ]; then
+    echo "$0: This script must be run from the root of the repository" >&2
+    exit 1
+fi
+
+if [ $# -ne 1 ]; then
+    echo "$0: This script must be passed exactly one argument for which tests to sync" >&2
+    exit 1
+fi
+
+spec_root="test/spec"
+
+tmpdir=$(mktemp -d -t spec_testsXXXX)
+curl -sL "https://github.com/mongodb/specifications/archive/master.zip" -o "$tmpdir/specs.zip"
+unzip -d "$tmpdir" "$tmpdir/specs.zip" > /dev/null
+mkdir -p "$spec_root/$1"
+rsync -ah --exclude '*.rst' "$tmpdir/specifications-master/source/$1/tests/" "$spec_root/$1" --delete
+rm -rf "$tmpdir"

src/operations/add_user.ts

@@ -54,7 +54,9 @@ export class AddUserOperation extends CommandOperation<AddUserOptions, Document>
     }
 
     // Get additional values
-    let roles = Array.isArray(options.roles) ? options.roles : [];
+    let roles: string[] = [];
+    if (Array.isArray(options.roles)) roles = options.roles;
+    if (typeof options.roles === 'string') roles = [options.roles];
 
     // If not roles defined print deprecated message
     // TODO: handle deprecation properly

test/functional/readpreference.test.js

@@ -4,7 +4,8 @@ const test = require('./shared').assert;
 const setupDatabase = require('./shared').setupDatabase;
 const withMonitoredClient = require('./shared').withMonitoredClient;
 const expect = require('chai').expect;
-const { ReadPreference } = require('../../src');
+const { ReadPreference, Topology } = require('../../src');
+const { withClient } = require('./shared');
 
 describe('ReadPreference', function () {
   before(function () {
@@ -587,4 +588,74 @@ describe('ReadPreference', function () {
       })
     });
   });
+
+  context('should enforce fixed primary read preference', function () {
+    const collectionName = 'ddl_collection';
+
+    beforeEach(function () {
+      const configuration = this.configuration;
+      const client = this.configuration.newClient(configuration.writeConcernMax(), {
+        useUnifiedTopology: true,
+        readPreference: 'primaryPreferred'
+      });
+      return withClient(client, (client, done) => {
+        const db = client.db(configuration.db);
+        db.addUser('default', 'pass', { roles: 'readWrite' }, () => {
+          db.createCollection('before_collection', () => {
+            db.createIndex(collectionName, { aloha: 1 }, done);
+          });
+        });
+      });
+    });
+
+    const methods = {
+      'Collection#createIndex': [{ quote: 'text' }],
+      'Db#createIndex': [collectionName, { quote: 'text' }],
+      'Db#addUser': ['thomas', 'pass', { roles: 'readWrite' }],
+      'Db#removeUser': ['default'],
+      'Db#createCollection': ['created_collection'],
+      'Db#dropCollection': ['before_collection'],
+      'Collection#dropIndex': ['aloha_1'],
+      'Collection#rename': ['new_name'],
+      'Db#dropDatabase': []
+    };
+
+    Object.keys(methods).forEach(operation => {
+      it(`${operation}`, {
+        metadata: {
+          requires: { topology: ['replicaset', 'sharded'] }
+        },
+        test: function () {
+          const configuration = this.configuration;
+          const client = this.configuration.newClient(configuration.writeConcernMax(), {
+            useUnifiedTopology: true,
+            readPreference: 'primaryPreferred'
+          });
+          return withClient(client, (client, done) => {
+            const db = client.db(configuration.db);
+            const args = methods[operation];
+            const [parentId, method] = operation.split('#');
+            const collection = db.collection(collectionName);
+            const parent = parentId === 'Collection' ? collection : parentId === 'Db' ? db : null;
+            const selectServerSpy = this.sinon.spy(Topology.prototype, 'selectServer');
+            const callback = err => {
+              expect(err).to.not.exist;
+              expect(selectServerSpy.called).to.equal(true);
+              if (typeof selectServerSpy.args[0][0] === 'function') {
+                expect(selectServerSpy)
+                  .nested.property('args[0][1].readPreference.mode')
+                  .to.equal(ReadPreference.PRIMARY);
+              } else {
+                expect(selectServerSpy)
+                  .nested.property('args[0][0].readPreference.mode')
+                  .to.equal(ReadPreference.PRIMARY);
+              }
+              done();
+            };
+            parent[method].apply(parent, [...args, callback]);
+          });
+        }
+      });
+    });
+  });
 });

test/spec/connection-monitoring-and-pooling/pool-checkout-connection.json

@@ -12,15 +12,23 @@
       "type": "ConnectionCheckOutStarted",
       "address": 42
     },
+    {
+      "type": "ConnectionCreated",
+      "connectionId": 1,
+      "address": 42
+    },
+    {
+      "type": "ConnectionReady",
+      "connectionId": 1,
+      "address": 42
+    },
     {
       "type": "ConnectionCheckedOut",
       "connectionId": 1,
       "address": 42
     }
   ],
   "ignore": [
-    "ConnectionPoolCreated",
-    "ConnectionCreated",
-    "ConnectionReady"
+    "ConnectionPoolCreated"
   ]
 }

test/spec/connection-monitoring-and-pooling/pool-checkout-connection.yml

@@ -6,10 +6,14 @@ operations:
 events:
   - type: ConnectionCheckOutStarted
     address: 42
+  - type: ConnectionCreated
+    connectionId: 1
+    address: 42
+  - type: ConnectionReady
+    connectionId: 1
+    address: 42
   - type: ConnectionCheckedOut
     connectionId: 1
     address: 42
 ignore:
   - ConnectionPoolCreated
-  - ConnectionCreated
-  - ConnectionReady

test/spec/connection-monitoring-and-pooling/pool-create-min-size.json

@@ -11,6 +11,11 @@
       "event": "ConnectionCreated",
       "count": 3
     },
+    {
+      "name": "waitForEvent",
+      "event": "ConnectionReady",
+      "count": 3
+    },
     {
       "name": "checkOut"
     }

test/spec/connection-monitoring-and-pooling/pool-create-min-size.yml

@@ -7,6 +7,9 @@ operations:
   - name: waitForEvent
     event: ConnectionCreated
     count: 3
+  - name: waitForEvent
+    event: ConnectionReady
+    count: 3
   - name: checkOut
 events:
   - type: ConnectionPoolCreated

test/spec/connection-monitoring-and-pooling/wait-queue-timeout.json

@@ -4,7 +4,7 @@
   "description": "must aggressively timeout threads enqueued longer than waitQueueTimeoutMS",
   "poolOptions": {
     "maxPoolSize": 1,
-    "waitQueueTimeoutMS": 100
+    "waitQueueTimeoutMS": 20
   },
   "operations": [
     {

test/spec/connection-monitoring-and-pooling/wait-queue-timeout.yml

@@ -3,7 +3,7 @@ style: unit
 description: must aggressively timeout threads enqueued longer than waitQueueTimeoutMS
 poolOptions:
   maxPoolSize: 1
-  waitQueueTimeoutMS: 100
+  waitQueueTimeoutMS: 20
 operations:
   # Check out only possible connection
   - name: checkOut