Revert "fix: Explicitly pass read preference with db.command commands COMPASS-4539 (#282)" (#283)

This reverts commit f2bd36d.

Author: Anemy

lib/instance-detail-helper.js

@@ -20,13 +20,6 @@ const {
 
 const debug = require('debug')('mongodb-data-service:instance-detail-helper');
 
-function getReadPreferenceOptions(db) {
-  // `db.command` does not use the read preference set on the
-  // connection, so here we explicitly to specify it in the options.
-  const readPreference = db.s ? db.s.readPreference : ReadPreference.PRIMARY;
-  return { readPreference };
-}
-
 /**
  * aggregates stats across all found databases
  * @param  {Object}   results   async.auto results
@@ -85,7 +78,7 @@ function getBuildInfo(results, done) {
   };
 
   const adminDb = db.databaseName === 'admin' ? db : db.admin();
-  adminDb.command(spec, getReadPreferenceOptions(db), function(err, res) {
+  adminDb.command(spec, {}, function(err, res) {
     if (err) {
       // buildInfo doesn't require any privileges to run, so if it fails,
       // something really went wrong and we should return the error.
@@ -105,7 +98,7 @@ function getCmdLineOpts(results, done) {
   };
 
   const adminDb = db.databaseName === 'admin' ? db : db.admin();
-  adminDb.command(spec, getReadPreferenceOptions(db), function(err, res) {
+  adminDb.command(spec, {}, function(err, res) {
     if (err) {
       debug('getCmdLineOpts failed!', err);
       return done(null, { errmsg: err.message });
@@ -220,7 +213,7 @@ function getHostInfo(results, done) {
   };
 
   const adminDb = db.databaseName === 'admin' ? db : db.admin();
-  adminDb.command(spec, getReadPreferenceOptions(db), function(err, res) {
+  adminDb.command(spec, {}, function(err, res) {
     if (err) {
       if (isNotAuthorized(err)) {
         // if the error is that the user is not authorized, silently ignore it
@@ -260,14 +253,12 @@ function listDatabases(results, done) {
     listDatabases: 1
   };
 
-  const options = getReadPreferenceOptions(db);
-
   const adminDb = db.databaseName === 'admin' ? db : db.admin();
-  adminDb.command(spec, options, function(err, res) {
+  adminDb.command(spec, {}, function(err, res) {
     if (err) {
       if (isNotAuthorized(err)) {
         // eslint-disable-next-line no-shadow
-        adminDb.command({connectionStatus: 1, showPrivileges: 1}, options, function(err, res) {
+        adminDb.command({connectionStatus: 1, showPrivileges: 1}, {}, function(err, res) {
           if (err) {
             done(err);
             return;
@@ -352,7 +343,7 @@ function getDatabase(client, db, name, done) {
     dbStats: 1
   };
 
-  const options = getReadPreferenceOptions(db);
+  const options = {};
   debug('running dbStats for `%s`...', name);
   client.db(name).command(spec, options, function(err, res) {
     if (err) {
@@ -385,15 +376,8 @@ function getDatabases(results, done) {
 function getUserInfo(results, done) {
   const db = results.db;
 
-  const options = getReadPreferenceOptions(db);
-
   // get the user privileges
-  db.command({
-    connectionStatus: 1,
-    showPrivileges: true
-  },
-  options,
-  function(
+  db.command({ connectionStatus: 1, showPrivileges: true }, {}, function(
     err,
     res
   ) {
@@ -410,7 +394,7 @@ function getUserInfo(results, done) {
     }
     const user = res.authInfo.authenticatedUsers[0];
 
-    db.command({ usersInfo: user, showPrivileges: true }, options, function(
+    db.command({ usersInfo: user, showPrivileges: true }, {}, function(
       _err,
       _res
     ) {
@@ -507,7 +491,15 @@ function getDatabaseCollections(db, done) {
 
   const spec = {};
 
-  db.listCollections(spec, getReadPreferenceOptions(db)).toArray(function(err, res) {
+  /**
+   * @note: Durran: For some reason the listCollections call does not take into
+   *  account the read preference that was set on the db instance - it only looks
+   *  in the passed options: https://github.com/mongodb/node-mongodb-native/blob/2.2/lib/db.js#L671
+   */
+  const rp = db.s ? db.s.readPreference : ReadPreference.PRIMARY;
+  const options = { readPreference: rp };
+
+  db.listCollections(spec, options).toArray(function(err, res) {
     if (err) {
       if (isNotAuthorized(err) || isMongosLocalException(err)) {
         // if the error is that the user is not authorized, silently ignore it

lib/native-client.js

@@ -267,11 +267,7 @@ class NativeClient extends EventEmitter {
    * @param {Function} callback - The callback.
    */
   listDatabases(callback) {
-    this.database.admin().command({
-      listDatabases: 1
-    }, {
-      readPreference: this.model.readPreference
-    }, (error, result) => {
+    this.database.admin().command({ listDatabases: 1 }, {}, (error, result) => {
       if (error) {
         return callback(this._translateMessage(error));
       }

package-lock.json

@@ -20,8 +20,8 @@
     "check": "mongodb-js-precommit"
   },
   "peerDependencies": {
-    "mongodb": "3.x",
-    "mongodb-connection-model": "*"
+    "mongodb": "^3.6.3",
+    "mongodb-connection-model": "^17.3.0"
   },
   "dependencies": {
     "async": "^3.2.0",
@@ -41,7 +41,7 @@
     "mocha": "^8.2.1",
     "mock-require": "^3.0.3",
     "mongodb": "^3.6.3",
-    "mongodb-connection-model": "^18.0.0",
+    "mongodb-connection-model": "^17.3.0",
     "mongodb-js-precommit": "^2.2.1",
     "mongodb-runner": "^4.8.0",
     "xvfb-maybe": "^0.2.1"

package.json

@@ -1,5 +1,4 @@
 const assert = require('assert');
-const { ReadPreference } = require('mongodb');
 const {
   getAllowedCollections,
   getAllowedDatabases,
@@ -384,43 +383,6 @@ describe('instance-detail-helper-mocked', function() {
         done();
       });
     });
-    it('should pass the read preference explicity when it is set', function(done) {
-      let passedOptions;
-      results.db = makeMockDB(function(times, command, options, callback) {
-        if (command.listDatabases) {
-          passedOptions = options;
-          return callback(null, { databases: [] });
-        }
-        return callback(null, {});
-      });
-      results.db.s = {
-        readPreference: ReadPreference.SECONDARY
-      };
-
-      listDatabases(results, function() {
-        assert.deepEqual(passedOptions, {
-          readPreference: 'secondary'
-        });
-        done();
-      });
-    });
-    it('defaults to passing the read preference as PRIMARY', function(done) {
-      let passedOptions;
-      results.db = makeMockDB(function(times, command, options, callback) {
-        if (command.listDatabases) {
-          passedOptions = options;
-          return callback(null, { databases: [] });
-        }
-        return callback(null, {});
-      });
-
-      listDatabases(results, function() {
-        assert.deepEqual(passedOptions, {
-          readPreference: ReadPreference.PRIMARY
-        });
-        done();
-      });
-    });
     it('should pass on other errors from the listDatabases command', function(done) {
       // instead of the real db handle, pass in the mocked one
       results.db = makeMockDB(