refactor: don't use admin database in CSFLE tests

NODE-2571

Author: mbroadst

test/functional/client_side_encryption/corpus.test.js

@@ -59,7 +59,7 @@ describe('Client Side Encryption Corpus', function() {
   const dataDbName = 'db';
   const dataCollName = 'coll';
   const dataNamespace = `${dataDbName}.${dataCollName}`;
-  const keyVaultDbName = 'admin';
+  const keyVaultDbName = 'keyvault';
   const keyVaultCollName = 'datakeys';
   const keyVaultNamespace = `${keyVaultDbName}.${keyVaultCollName}`;
 
@@ -136,7 +136,7 @@ describe('Client Side Encryption Corpus', function() {
     return Promise.resolve()
       .then(() => client.connect())
       .then(() => {
-        // 3. Using ``client``, drop the collection ``admin.datakeys``. Insert the documents `corpus/corpus-key-local.json <../corpus/corpus-key-local.json>`_ and `corpus/corpus-key-aws.json <../corpus/corpus-key-aws.json>`_.
+        // 3. Using ``client``, drop the collection ``keyvault.datakeys``. Insert the documents `corpus/corpus-key-local.json <../corpus/corpus-key-local.json>`_ and `corpus/corpus-key-aws.json <../corpus/corpus-key-aws.json>`_.
         const keyDb = client.db(keyVaultDbName);
         return Promise.resolve()
           .then(() => keyDb.dropCollection(keyVaultCollName))
@@ -182,7 +182,7 @@ describe('Client Side Encryption Corpus', function() {
           //    Where LOCAL_MASTERKEY is the following base64:
           //    .. code:: javascript
           //       Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN3YkQ5aXRRMkhGRGdQV09wOGVNYUMxT2k3NjZKelhaQmRCZGJkTXVyZG9uSjFk
-          //    Configure both objects with ``keyVaultNamespace`` set to ``admin.datakeys``.
+          //    Configure both objects with ``keyVaultNamespace`` set to ``keyvault.datakeys``.
           const autoEncryption = {
             keyVaultNamespace,
             kmsProviders: this.configuration.kmsProviders(null, localKey)

test/functional/client_side_encryption/driver.test.js

@@ -13,7 +13,7 @@ chai.use(require('chai-subset'));
 describe('Client Side Encryption Functional', function() {
   const dataDbName = 'db';
   const dataCollName = 'coll';
-  const keyVaultDbName = 'admin';
+  const keyVaultDbName = 'keyvault';
   const keyVaultCollName = 'datakeys';
   const keyVaultNamespace = `${keyVaultDbName}.${keyVaultCollName}`;
 

test/functional/client_side_encryption/prose.test.js

@@ -17,7 +17,7 @@ describe('Client Side Encryption Prose Tests', function() {
   const dataDbName = 'db';
   const dataCollName = 'coll';
   const dataNamespace = `${dataDbName}.${dataCollName}`;
-  const keyVaultDbName = 'admin';
+  const keyVaultDbName = 'keyvault';
   const keyVaultCollName = 'datakeys';
   const keyVaultNamespace = `${keyVaultDbName}.${keyVaultCollName}`;
 
@@ -65,7 +65,7 @@ describe('Client Side Encryption Prose Tests', function() {
       return (
         Promise.resolve()
           .then(() => this.client.connect())
-          // #. Using ``client``, drop the collections ``admin.datakeys`` and ``db.coll``.
+          // #. Using ``client``, drop the collections ``keyvault.datakeys`` and ``db.coll``.
           .then(() => dropCollection(this.client.db(dataDbName), dataCollName))
           .then(() => dropCollection(this.client.db(keyVaultDbName), keyVaultCollName))
           // #. Create the following:
@@ -77,7 +77,7 @@ describe('Client Side Encryption Prose Tests', function() {
           //           "aws": { <AWS credentials> },
           //           "local": { "key": <base64 decoding of LOCAL_MASTERKEY> }
           //       }
-          //   Configure both objects with ``keyVaultNamespace`` set to ``admin.datakeys``.
+          //   Configure both objects with ``keyVaultNamespace`` set to ``keyvault.datakeys``.
           //   Configure the ``MongoClient`` with the following ``schema_map``:
           //   .. code:: javascript
           //       {
@@ -136,7 +136,7 @@ describe('Client Side Encryption Prose Tests', function() {
         .then(() => {
           // #. Call ``client_encryption.createDataKey()`` with the ``local`` KMS provider and keyAltNames set to ``["local_altname"]``.
           // - Expect a BSON binary with subtype 4 to be returned, referred to as ``local_datakey_id``.
-          // - Use ``client`` to run a ``find`` on ``admin.datakeys`` by querying with the ``_id`` set to the ``local_datakey_id``.
+          // - Use ``client`` to run a ``find`` on ``keyvault.datakeys`` by querying with the ``_id`` set to the ``local_datakey_id``.
           // - Expect that exactly one document is returned with the "masterKey.provider" equal to "local".
           // - Check that ``client`` captured a command_started event for the ``insert`` command containing a majority writeConcern.
           this.commandStartedEvents.clear();
@@ -210,7 +210,7 @@ describe('Client Side Encryption Prose Tests', function() {
           //         key: "arn:aws:kms:us-east-1:579766882180:key/89fcc2c4-08b0-4bd9-9f25-e30687b580d0"
           //       }
           //    - Expect a BSON binary with subtype 4 to be returned, referred to as ``aws_datakey_id``.
-          //    - Use ``client`` to run a ``find`` on ``admin.datakeys`` by querying with the ``_id`` set to the ``aws_datakey_id``.
+          //    - Use ``client`` to run a ``find`` on ``keyvault.datakeys`` by querying with the ``_id`` set to the ``aws_datakey_id``.
           //    - Expect that exactly one document is returned with the "masterKey.provider" equal to "aws".
           //    - Check that ``client`` captured a command_started event for the ``insert`` command containing a majority writeConcern.
           this.commandStartedEvents.clear();
@@ -315,7 +315,7 @@ describe('Client Side Encryption Prose Tests', function() {
       //       {
       //           "aws": { <AWS credentials> }
       //       }
-      //    Configure with ``keyVaultNamespace`` set to ``admin.datakeys``, and a default MongoClient as the ``keyVaultClient``.
+      //    Configure with ``keyVaultNamespace`` set to ``keyvault.datakeys``, and a default MongoClient as the ``keyVaultClient``.
       this.client = this.configuration.newClient(
         {},
         { useNewUrlParser: true, useUnifiedTopology: true }
@@ -481,7 +481,7 @@ describe('Client Side Encryption Prose Tests', function() {
               validator: { $jsonSchema: limitsSchema }
             });
           })
-          // #. Using ``client``, drop the collection ``admin.datakeys``. Insert the document `limits/limits-key.json <../limits/limits-key.json>`_
+          // #. Using ``client``, drop the collection ``keyvault.datakeys``. Insert the document `limits/limits-key.json <../limits/limits-key.json>`_
           .then(() => dropCollection(this.client.db(keyVaultDbName), keyVaultCollName))
           .then(() => {
             return this.client
@@ -497,7 +497,7 @@ describe('Client Side Encryption Prose Tests', function() {
       //    Configure with the ``local`` KMS provider as follows:
       //    .. code:: javascript
       //       { "local": { "key": <base64 decoding of LOCAL_MASTERKEY> } }
-      //    Configure with the ``keyVaultNamespace`` set to ``admin.datakeys``.
+      //    Configure with the ``keyVaultNamespace`` set to ``keyvault.datakeys``.
       this.clientEncrypted = this.configuration.newClient(
         {},
         {
@@ -746,8 +746,8 @@ describe('Client Side Encryption Prose Tests', function() {
       return (
         this.client
           .connect()
-          // #. Using ``client``, drop the collections ``admin.datakeys`` and ``db.coll``.
-          //    Insert the document `external/external-key.json <../external/external-key.json>`_ into ``admin.datakeys``.
+          // #. Using ``client``, drop the collections ``keyvault.datakeys`` and ``db.coll``.
+          //    Insert the document `external/external-key.json <../external/external-key.json>`_ into ``keyvault.datakeys``.
           .then(() => dropCollection(this.client.db(dataDbName), dataCollName))
           .then(() => dropCollection(this.client.db(keyVaultDbName), keyVaultCollName))
           .then(() => {
@@ -803,7 +803,7 @@ describe('Client Side Encryption Prose Tests', function() {
               //    Configure both objects with the ``local`` KMS providers as follows:
               //    .. code:: javascript
               //       { "local": { "key": <base64 decoding of LOCAL_MASTERKEY> } }
-              //    Configure both objects with ``keyVaultNamespace`` set to ``admin.datakeys``.
+              //    Configure both objects with ``keyVaultNamespace`` set to ``keyvault.datakeys``.
               //    Configure ``client_encrypted`` to use the schema `external/external-schema.json <../external/external-schema.json>`_  for ``db.coll`` by setting a schema map like: ``{ "db.coll": <contents of external-schema.json>}``
               .then(() => {
                 const options = {

test/functional/spec-runner/index.js

@@ -41,6 +41,10 @@ function translateClientOptions(options) {
     } else if (key === 'autoEncryptOpts') {
       options.autoEncryption = Object.assign({}, options.autoEncryptOpts);
 
+      if (options.autoEncryptOpts.keyVaultNamespace == null) {
+        options.autoEncryption.keyVaultNamespace = 'keyvault.datakeys';
+      }
+
       if (options.autoEncryptOpts.kmsProviders) {
         delete options.kmsProviders;
         options.autoEncryption.kmsProviders = options.autoEncryptOpts.kmsProviders;
@@ -165,7 +169,7 @@ function prepareDatabaseForSuite(suite, context) {
     .admin()
     .command({ killAllSessions: [] })
     .catch(err => {
-      if (err.code === 11601) {
+      if (err.message.match(/no such command/) || err.code === 11601) {
         return;
       }
 
@@ -184,7 +188,7 @@ function prepareDatabaseForSuite(suite, context) {
     })
     .then(() => {
       if (suite.key_vault_data) {
-        const dataKeysCollection = context.sharedClient.db('admin').collection('datakeys');
+        const dataKeysCollection = context.sharedClient.db('keyvault').collection('datakeys');
         return dataKeysCollection
           .drop({ w: 'majority' })
           .catch(err => {