mongo 2.12.0.rc0 → 2.12.1

data/spec/integration/client_side_encryption/auto_encryption_old_wire_version_spec.rb

@@ -20,7 +20,9 @@ describe 'Auto Encryption' do
           # Must use local schema map because server versions older than 4.2
           # do not support jsonSchema collection validator.
           schema_map: { 'auto_encryption.users' => schema_map },
-          bypass_auto_encryption: bypass_auto_encryption
+          bypass_auto_encryption: bypass_auto_encryption,
+          # Spawn mongocryptd on non-default port for sharded cluster tests
+          extra_options: extra_options,
         },
         database: 'auto_encryption'
       ),
@@ -28,7 +30,7 @@ describe 'Auto Encryption' do
   end
 
   let(:bypass_auto_encryption) { false }
-  let(:client) { authorized_client.use(:auto_encryption) }
+  let(:client) { authorized_client.use('auto_encryption') }
 
   let(:encrypted_ssn_binary) do
     BSON::Binary.new(Base64.decode64(encrypted_ssn), :ciphertext)
@@ -36,15 +38,16 @@ describe 'Auto Encryption' do
 
   shared_examples 'it decrypts but does not encrypt on wire version < 8' do
     before do
-      client[:users].insert_one(ssn: encrypted_ssn_binary)
+      client['users'].drop
+      client['users'].insert_one(ssn: encrypted_ssn_binary)
 
-      authorized_client.use(:admin)[:datakeys].drop
-      authorized_client.use(:admin)[:datakeys].insert_one(data_key)
+      key_vault_collection.drop
+      key_vault_collection.insert_one(data_key)
     end
 
     it 'raises an exception when trying to encrypt' do
       expect do
-        encryption_client[:users].find(ssn: ssn).first
+        encryption_client['users'].find(ssn: ssn).first
       end.to raise_error(Mongo::Error::CryptError, /Auto-encryption requires a minimum MongoDB version of 4.2/)
     end
 
@@ -52,12 +55,12 @@ describe 'Auto Encryption' do
       let(:bypass_auto_encryption) { true }
 
       it 'does not raise an exception but doesn\'t encrypt' do
-        document = encryption_client[:users].find(ssn: ssn).first
+        document = encryption_client['users'].find(ssn: ssn).first
         expect(document).to be_nil
       end
 
       it 'still decrypts' do
-        document = encryption_client[:users].find(ssn: encrypted_ssn_binary).first
+        document = encryption_client['users'].find(ssn: encrypted_ssn_binary).first
         # ssn field is still decrypted
         expect(document['ssn']).to eq(ssn)
       end

data/spec/integration/client_side_encryption/auto_encryption_reconnect_spec.rb

@@ -20,7 +20,9 @@ describe 'Client with auto encryption #reconnect' do
             kms_providers: kms_providers,
             key_vault_namespace: key_vault_namespace,
             key_vault_client: key_vault_client_option,
-            schema_map: { 'auto_encryption.users': schema_map }
+            schema_map: { 'auto_encryption.users': schema_map },
+            # Spawn mongocryptd on non-default port for sharded cluster tests
+            extra_options: extra_options,
           },
           database: 'auto_encryption'
         }
@@ -28,7 +30,7 @@ describe 'Client with auto encryption #reconnect' do
     )
   end
 
-  let(:unencrypted_client) { authorized_client.use(:auto_encryption) }
+  let(:unencrypted_client) { authorized_client.use('auto_encryption') }
 
   let(:mongocryptd_client) { client.encrypter.mongocryptd_client }
   let(:key_vault_client) { client.encrypter.key_vault_client }
@@ -36,7 +38,7 @@ describe 'Client with auto encryption #reconnect' do
 
   shared_examples 'a functioning client' do
     it 'can perform an encrypted find command' do
-      doc = client[:users].find(ssn: ssn).first
+      doc = client['users'].find(ssn: ssn).first
       expect(doc).not_to be_nil
       expect(doc['ssn']).to eq(ssn)
     end
@@ -65,7 +67,7 @@ describe 'Client with auto encryption #reconnect' do
 
   shared_examples 'a functioning key vault client' do
     it 'can perform a find command' do
-      doc = key_vault_client.use(key_vault_db)[key_vault_coll].find(_id: data_key_id).first
+      doc = key_vault_client.use(key_vault_db)[key_vault_coll, read_concern: { level: :majority}].find(_id: data_key_id).first
       expect(doc).not_to be_nil
       expect(doc['_id']).to eq(data_key_id)
     end
@@ -73,15 +75,15 @@ describe 'Client with auto encryption #reconnect' do
 
   shared_examples 'an auto-encryption client that reconnects properly' do
     before do
-      authorized_client.use(:admin)[:datakeys].drop
-      authorized_client.use(:admin)[:datakeys].insert_one(data_key)
+      key_vault_collection.drop
+      key_vault_collection.insert_one(data_key)
 
-      unencrypted_client[:users].drop
+      unencrypted_client['users'].drop
       # Use a client without auto_encryption_options to insert an
       # encrypted document into the collection; this ensures that the
       # client with auto_encryption_options must perform decryption
       # to properly read the document.
-      unencrypted_client[:users].insert_one(
+      unencrypted_client['users'].insert_one(
         ssn: BSON::Binary.new(Base64.decode64(encrypted_ssn), :ciphertext)
       )
     end
@@ -200,7 +202,10 @@ describe 'Client with auto encryption #reconnect' do
 
   context 'with custom key vault client option' do
     let(:key_vault_client_option) do
-      Mongo::Client.new(SpecConfig.instance.addresses).use(:test)
+      new_local_client(
+        SpecConfig.instance.addresses,
+        SpecConfig.instance.test_options
+      )
     end
 
     context 'with AWS KMS providers' do

data/spec/integration/client_side_encryption/auto_encryption_spec.rb

@@ -21,15 +21,16 @@ describe 'Auto Encryption' do
           kms_providers: kms_providers,
           key_vault_namespace: key_vault_namespace,
           schema_map: local_schema,
-          bypass_auto_encryption: bypass_auto_encryption
+          bypass_auto_encryption: bypass_auto_encryption,
+          # Spawn mongocryptd on non-default port for sharded cluster tests
+          extra_options: extra_options,
         },
         database: 'auto_encryption'
       ),
     )
   end
 
-  let(:client) { authorized_client.use(:auto_encryption) }
-  let(:admin_client) { authorized_client.use(:admin) }
+  let(:client) { authorized_client.use('auto_encryption') }
 
   let(:bypass_auto_encryption) { false }
 
@@ -45,7 +46,7 @@ describe 'Auto Encryption' do
     let(:local_schema) { nil }
 
     before do
-      client[:users,
+      client['users',
         {
           'validator' => { '$jsonSchema' => schema_map }
         }
@@ -57,27 +58,27 @@ describe 'Auto Encryption' do
     let(:local_schema) { { "auto_encryption.users" => schema_map } }
 
     before do
-      client[:users].create
+      client['users'].create
     end
   end
 
   shared_context 'encrypted document in collection' do
     before do
-      client[:users].insert_one(ssn: encrypted_ssn_binary)
+      client['users'].insert_one(ssn: encrypted_ssn_binary)
     end
   end
 
   shared_context 'multiple encrypted documents in collection' do
     before do
-      client[:users].insert_one(ssn: encrypted_ssn_binary)
-      client[:users].insert_one(ssn: encrypted_ssn_binary)
+      client['users'].insert_one(ssn: encrypted_ssn_binary)
+      client['users'].insert_one(ssn: encrypted_ssn_binary)
     end
   end
 
   before(:each) do
-    client[:users].drop
-    admin_client[:datakeys].drop
-    admin_client[:datakeys].insert_one(data_key)
+    client['users'].drop
+    key_vault_collection.drop
+    key_vault_collection.insert_one(data_key)
   end
 
   shared_examples 'an encrypted command' do
@@ -115,7 +116,7 @@ describe 'Auto Encryption' do
       include_context 'encrypted document in collection'
 
       let(:result) do
-        encryption_client[:users].aggregate([
+        encryption_client['users'].aggregate([
           { '$match' => { 'ssn' => ssn } }
         ]).first
       end
@@ -133,7 +134,7 @@ describe 'Auto Encryption' do
         end
 
         it 'does auto decrypt the response' do
-          result = encryption_client[:users].aggregate([
+          result = encryption_client['users'].aggregate([
             { '$match' => { 'ssn' => encrypted_ssn_binary } }
           ]).first
 
@@ -150,7 +151,7 @@ describe 'Auto Encryption' do
     shared_examples 'it performs an encrypted command' do
       include_context 'multiple encrypted documents in collection'
 
-      let(:result) { encryption_client[:users].count(ssn: ssn) }
+      let(:result) { encryption_client['users'].count(ssn: ssn) }
 
       it 'encrypts the command and finds the documents' do
         expect(result).to eq(2)
@@ -172,7 +173,7 @@ describe 'Auto Encryption' do
     shared_examples 'it performs an encrypted command' do
       include_context 'encrypted document in collection'
 
-      let(:result) { encryption_client[:users].distinct(:ssn) }
+      let(:result) { encryption_client['users'].distinct(:ssn) }
 
       it 'decrypts the SSN field' do
         expect(result.length).to eq(1)
@@ -196,7 +197,7 @@ describe 'Auto Encryption' do
     shared_examples 'it performs an encrypted command' do
       include_context 'encrypted document in collection'
 
-      let(:result) { encryption_client[:users].delete_one(ssn: ssn) }
+      let(:result) { encryption_client['users'].delete_one(ssn: ssn) }
 
       it 'encrypts the SSN field' do
         expect(result.deleted_count).to eq(1)
@@ -218,7 +219,7 @@ describe 'Auto Encryption' do
     shared_examples 'it performs an encrypted command' do
       include_context 'multiple encrypted documents in collection'
 
-      let(:result) { encryption_client[:users].delete_many(ssn: ssn) }
+      let(:result) { encryption_client['users'].delete_many(ssn: ssn) }
 
       it 'decrypts the SSN field' do
         expect(result.deleted_count).to eq(2)
@@ -240,7 +241,7 @@ describe 'Auto Encryption' do
     shared_examples 'it performs an encrypted command' do
       include_context 'encrypted document in collection'
 
-      let(:result) { encryption_client[:users].find(ssn: ssn).first }
+      let(:result) { encryption_client['users'].find(ssn: ssn).first }
 
       it 'encrypts the command and decrypts the response' do
         result.should_not be_nil
@@ -263,7 +264,7 @@ describe 'Auto Encryption' do
     shared_examples 'it performs an encrypted command' do
       include_context 'encrypted document in collection'
 
-      let(:result) { encryption_client[:users].find_one_and_delete(ssn: ssn) }
+      let(:result) { encryption_client['users'].find_one_and_delete(ssn: ssn) }
 
       it 'encrypts the command and decrypts the response' do
         expect(result['ssn']).to eq(ssn)
@@ -277,7 +278,7 @@ describe 'Auto Encryption' do
         end
 
         it 'still decrypts the command' do
-          result = encryption_client[:users].find_one_and_delete(ssn: encrypted_ssn_binary)
+          result = encryption_client['users'].find_one_and_delete(ssn: encrypted_ssn_binary)
           expect(result['ssn']).to eq(ssn)
         end
       end
@@ -294,7 +295,7 @@ describe 'Auto Encryption' do
         include_context 'encrypted document in collection'
 
         let(:result) do
-          encryption_client[:users].find_one_and_replace(
+          encryption_client['users'].find_one_and_replace(
             { ssn: ssn },
             { name: name },
             return_document: :before
@@ -304,7 +305,7 @@ describe 'Auto Encryption' do
         it 'encrypts the command and decrypts the response, returning original document' do
           expect(result['ssn']).to eq(ssn)
 
-          documents = client[:users].find
+          documents = client['users'].find
           expect(documents.count).to eq(1)
           expect(documents.first['ssn']).to be_nil
         end
@@ -312,11 +313,11 @@ describe 'Auto Encryption' do
 
       context 'with :return_document => :after' do
         before do
-          client[:users].insert_one(name: name)
+          client['users'].insert_one(name: name)
         end
 
         let(:result) do
-          encryption_client[:users].find_one_and_replace(
+          encryption_client['users'].find_one_and_replace(
             { name: name },
             { ssn: ssn },
             return_document: :after
@@ -326,7 +327,7 @@ describe 'Auto Encryption' do
         it 'encrypts the command and decrypts the response, returning new document' do
           expect(result['ssn']).to eq(ssn)
 
-          documents = client[:users].find
+          documents = client['users'].find
           expect(documents.count).to eq(1)
           expect(documents.first['ssn']).to eq(encrypted_ssn_binary)
         end
@@ -337,7 +338,7 @@ describe 'Auto Encryption' do
         include_context 'encrypted document in collection'
 
         let(:result) do
-          encryption_client[:users].find_one_and_replace(
+          encryption_client['users'].find_one_and_replace(
             { ssn: encrypted_ssn_binary },
             { name: name },
             :return_document => :before
@@ -347,7 +348,7 @@ describe 'Auto Encryption' do
         it 'does not encrypt the command but still decrypts the response, returning original document' do
           expect(result['ssn']).to eq(ssn)
 
-          documents = client[:users].find
+          documents = client['users'].find
           expect(documents.count).to eq(1)
           expect(documents.first['ssn']).to be_nil
         end
@@ -364,7 +365,7 @@ describe 'Auto Encryption' do
       let(:name) { 'Alan Turing' }
 
       let(:result) do
-        encryption_client[:users].find_one_and_update(
+        encryption_client['users'].find_one_and_update(
           { ssn: ssn },
           { name: name }
         )
@@ -373,7 +374,7 @@ describe 'Auto Encryption' do
       it 'encrypts the command and decrypts the response' do
         expect(result['ssn']).to eq(ssn)
 
-        documents = client[:users].find
+        documents = client['users'].find
         expect(documents.count).to eq(1)
         expect(documents.first['ssn']).to be_nil
       end
@@ -387,7 +388,7 @@ describe 'Auto Encryption' do
 
         it 'still decrypts the response' do
           # Query using the encrypted ssn value so the find will succeed
-          result = encryption_client[:users].find_one_and_update(
+          result = encryption_client['users'].find_one_and_update(
             { ssn: encrypted_ssn_binary },
             { name: name }
           )
@@ -402,7 +403,7 @@ describe 'Auto Encryption' do
 
   describe '#insert_one' do
     let(:query) { { ssn: ssn } }
-    let(:result) { encryption_client[:users].insert_one(query) }
+    let(:result) { encryption_client['users'].insert_one(query) }
 
     shared_examples 'it performs an encrypted command' do
       it 'encrypts the ssn field' do
@@ -411,7 +412,7 @@ describe 'Auto Encryption' do
 
         id = result.inserted_ids.first
 
-        document = client[:users].find(_id: id).first
+        document = client['users'].find(_id: id).first
         document.should_not be_nil
         expect(document['ssn']).to eq(encrypted_ssn_binary)
       end
@@ -421,13 +422,13 @@ describe 'Auto Encryption' do
       include_context 'bypass auto encryption'
 
       it 'does not encrypt the command' do
-        result = encryption_client[:users].insert_one(ssn: ssn)
+        result = encryption_client['users'].insert_one(ssn: ssn)
         expect(result).to be_ok
         expect(result.inserted_ids.length).to eq(1)
 
         id = result.inserted_ids.first
 
-        document = client[:users].find(_id: id).first
+        document = client['users'].find(_id: id).first
         expect(document['ssn']).to eq(ssn)
       end
     end
@@ -461,7 +462,7 @@ describe 'Auto Encryption' do
         expect(result).to be_ok
         id = result.inserted_ids.first
 
-        document = client[:users].find(_id: id).first
+        document = client['users'].find(_id: id).first
         document.should_not be_nil
         # Document was not encrypted
         expect(document['ssn']).to eq(ssn)
@@ -481,7 +482,7 @@ describe 'Auto Encryption' do
 
           id = result.inserted_ids.first
 
-          document = client[:users].find(_id: id).first
+          document = client['users'].find(_id: id).first
           document.should_not be_nil
           # Auto-encryption with key alt names only works with random encryption,
           # so it will not generate the same result on every test run.
@@ -497,7 +498,7 @@ describe 'Auto Encryption' do
 
           id = result.inserted_ids.first
 
-          document = client[:users].find(_id: id).first
+          document = client['users'].find(_id: id).first
           document.should_not be_nil
           # Auto-encryption with key alt names only works with random encryption,
           # so it will not generate the same result on every test run.
@@ -514,7 +515,7 @@ describe 'Auto Encryption' do
       let(:replacement_ssn) { '098-765-4321' }
 
       let(:result) do
-        encryption_client[:users].replace_one(
+        encryption_client['users'].replace_one(
           { ssn: ssn },
           { ssn: replacement_ssn }
         )
@@ -523,7 +524,7 @@ describe 'Auto Encryption' do
       it 'encrypts the ssn field' do
         expect(result.modified_count).to eq(1)
 
-        find_result = encryption_client[:users].find(ssn: '098-765-4321')
+        find_result = encryption_client['users'].find(ssn: '098-765-4321')
         expect(find_result.count).to eq(1)
       end
 
@@ -544,13 +545,13 @@ describe 'Auto Encryption' do
       include_context 'encrypted document in collection'
 
       let(:result) do
-        encryption_client[:users].update_one({ ssn: ssn }, { ssn: '098-765-4321' })
+        encryption_client['users'].update_one({ ssn: ssn }, { ssn: '098-765-4321' })
       end
 
       it 'encrypts the ssn field' do
         expect(result.n).to eq(1)
 
-        find_result = encryption_client[:users].find(ssn: '098-765-4321')
+        find_result = encryption_client['users'].find(ssn: '098-765-4321')
         expect(find_result.count).to eq(1)
       end
 
@@ -569,18 +570,18 @@ describe 'Auto Encryption' do
   describe '#update_many' do
     shared_examples 'it performs an encrypted command' do
       before do
-        client[:users].insert_one(ssn: encrypted_ssn_binary, age: 25)
-        client[:users].insert_one(ssn: encrypted_ssn_binary, age: 43)
+        client['users'].insert_one(ssn: encrypted_ssn_binary, age: 25)
+        client['users'].insert_one(ssn: encrypted_ssn_binary, age: 43)
       end
 
       let(:result) do
-        encryption_client[:users].update_many({ ssn: ssn }, { "$inc" => { :age =>  1 } })
+        encryption_client['users'].update_many({ ssn: ssn }, { "$inc" => { :age =>  1 } })
       end
 
       it 'encrypts the ssn field' do
         expect(result.n).to eq(2)
 
-        updated_documents = encryption_client[:users].find(ssn: ssn)
+        updated_documents = encryption_client['users'].find(ssn: ssn)
         ages = updated_documents.map { |doc| doc['age'] }
         expect(ages).to include(26)
         expect(ages).to include(44)