chore(encryption): incorporating review feedback

Author: daprahamian

lib/bulk/common.js

@@ -754,10 +754,10 @@ class BulkOperationBase {
 
     // If we have autoEncryption on, batch-splitting must be done on 2mb chunks, but single documents
     // over 2mb are still allowed
-    const autoEncrypter = topology.s.options && topology.s.options.autoEncrypter;
+    const usingAutoEncryption = !!(topology.s.options && topology.s.options.autoEncrypter);
     const maxBsonObjectSize =
       isMaster && isMaster.maxBsonObjectSize ? isMaster.maxBsonObjectSize : 1024 * 1024 * 16;
-    const maxBatchSizeBytes = autoEncrypter ? 1024 * 1024 * 2 : maxBsonObjectSize;
+    const maxBatchSizeBytes = usingAutoEncryption ? 1024 * 1024 * 2 : maxBsonObjectSize;
     const maxWriteBatchSize =
       isMaster && isMaster.maxWriteBatchSize ? isMaster.maxWriteBatchSize : 1000;
 

test/functional/client_side_encryption_tests.js

@@ -23,6 +23,8 @@ describe('Client Side Encryption', function() {
   });
 
   generateTopologyTests(testSuites, testContext, spec => {
+    // Note: we are skipping regex tests b/c we currently deserialize straight to native
+    // regex representation instead of to BSONRegExp.
     return !spec.description.match(/type=regex/);
   });
 });

test/runner/filters/client_encryption_filter.js

@@ -25,8 +25,7 @@ class ClientSideEncryptionFilter {
 
     this.enabled = !!(AWS_ACCESS_KEY_ID && AWS_SECRET_ACCESS_KEY && mongodbClientEncryption);
 
-    // TODO: shove these fields on to the context so they can be reused.
-
+    // Adds these fields onto the context so that they can be reused by tests
     context.clientSideEncryption = {
       enabled: this.enabled,
       mongodbClientEncryption,