mongo 2.17.2 → 2.18.1

data/spec/mongo/collection/view/writable_spec.rb

@@ -49,10 +49,24 @@ describe Mongo::Collection::View::Writable do
           client[authorized_collection.name]
         end
 
-        it 'raises a client-side error' do
-          expect do
-            view.find_one_and_delete(hint: '_id_')
-          end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+        context "on 4.4+ servers" do
+          min_server_version '4.4'
+
+          it "doesn't raise an error" do
+            expect do
+              view.find_one_and_delete(hint: '_id_')
+            end.to_not raise_error(Mongo::Error::UnsupportedOption)
+          end
+        end
+
+        context "on <=4.2 servers" do
+          max_server_version '4.2'
+
+          it 'raises a client-side error' do
+            expect do
+              view.find_one_and_delete(hint: '_id_')
+            end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+          end
         end
       end
     end
@@ -269,10 +283,24 @@ describe Mongo::Collection::View::Writable do
           client[authorized_collection.name]
         end
 
-        it 'raises a client-side error' do
-          expect do
-            view.find_one_and_replace({ field: 'testing' }, { hint: '_id_' })
-          end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+        context "on 4.4+ servers" do
+          min_server_version '4.4'
+
+          it "doesn't raise an error" do
+            expect do
+              view.find_one_and_replace({ field: 'testing' }, { hint: '_id_' })
+            end.to_not raise_error(Mongo::Error::UnsupportedOption)
+          end
+        end
+
+        context "on <=4.2 servers" do
+          max_server_version '4.2'
+
+          it 'raises a client-side error' do
+            expect do
+              view.find_one_and_replace({ field: 'testing' }, { hint: '_id_' })
+            end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+          end
         end
       end
     end
@@ -512,10 +540,24 @@ describe Mongo::Collection::View::Writable do
           client[authorized_collection.name]
         end
 
-        it 'raises a client-side error' do
-          expect do
-            view.find_one_and_update({ '$set' => { field: 'testing' } }, { hint: '_id_' })
-          end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+        context "on 4.4+ servers" do
+          min_server_version '4.4'
+
+          it "doesn't raise an error" do
+            expect do
+              view.find_one_and_update({ '$set' => { field: 'testing' } }, { hint: '_id_' })
+            end.to_not raise_error(Mongo::Error::UnsupportedOption)
+          end
+        end
+
+        context "on <=4.2 servers" do
+          max_server_version '4.2'
+
+          it 'raises a client-side error' do
+            expect do
+              view.find_one_and_update({ '$set' => { field: 'testing' } }, { hint: '_id_' })
+            end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+          end
         end
       end
     end
@@ -728,10 +770,24 @@ describe Mongo::Collection::View::Writable do
           client[authorized_collection.name]
         end
 
-        it 'raises a client-side error' do
-          expect do
-            view.delete_many(hint: '_id_')
-          end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+        context "on 4.4+ servers" do
+          min_server_version '4.4'
+
+          it "doesn't raise an error" do
+            expect do
+              view.delete_many(hint: '_id_')
+            end.to_not raise_error(Mongo::Error::UnsupportedOption)
+          end
+        end
+
+        context "on <=4.2 servers" do
+          max_server_version '4.2'
+
+          it 'raises a client-side error' do
+            expect do
+              view.delete_many(hint: '_id_')
+            end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+          end
         end
       end
     end
@@ -915,10 +971,24 @@ describe Mongo::Collection::View::Writable do
           client[authorized_collection.name]
         end
 
-        it 'raises a client-side error' do
-          expect do
-            view.delete_many(hint: '_id_')
-          end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+        context "on 4.4+ servers" do
+          min_server_version '4.4'
+
+          it "doesn't raise an error" do
+            expect do
+              view.delete_one(hint: '_id_')
+            end.to_not raise_error(Mongo::Error::UnsupportedOption)
+          end
+        end
+
+        context "on <=4.2 servers" do
+          max_server_version '4.2'
+
+          it 'raises a client-side error' do
+            expect do
+              view.delete_one(hint: '_id_')
+            end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+          end
         end
       end
     end
@@ -1103,10 +1173,24 @@ describe Mongo::Collection::View::Writable do
           client[authorized_collection.name]
         end
 
-        it 'raises a client-side error' do
-          expect do
-            view.delete_many(hint: '_id_')
-          end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+        context "on 4.2+ servers" do
+          min_server_version '4.2'
+
+          it "doesn't raise an error" do
+            expect do
+              view.replace_one({ field: 'testing' }, { hint: '_id_' })
+            end.to_not raise_error(Mongo::Error::UnsupportedOption)
+          end
+        end
+
+        context "on <=4.0 servers" do
+          max_server_version '4.0'
+
+          it 'raises a client-side error' do
+            expect do
+              view.replace_one({ field: 'testing' }, { hint: '_id_' })
+            end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+          end
         end
       end
     end
@@ -1360,10 +1444,24 @@ describe Mongo::Collection::View::Writable do
           client[authorized_collection.name]
         end
 
-        it 'raises a client-side error' do
-          expect do
-            view.delete_many(hint: '_id_')
-          end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+        context "on 4.2+ servers" do
+          min_server_version '4.2'
+
+          it "doesn't raise an error" do
+            expect do
+              view.update_many({ '$set' => { field: 'testing' } }, { hint: '_id_' })
+            end.to_not raise_error(Mongo::Error::UnsupportedOption)
+          end
+        end
+
+        context "on <=4.0 servers" do
+          max_server_version '4.0'
+
+          it 'raises a client-side error' do
+            expect do
+              view.update_many({ '$set' => { field: 'testing' } }, { hint: '_id_' })
+            end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+          end
         end
       end
     end
@@ -1623,10 +1721,24 @@ describe Mongo::Collection::View::Writable do
           client[authorized_collection.name]
         end
 
-        it 'raises a client-side error' do
-          expect do
-            view.update_one({ '$set' => { field: 'testing' } }, { hint: '_id_' })
-          end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+        context "on 4.2+ servers" do
+          min_server_version '4.2'
+
+          it "doesn't raise an error" do
+            expect do
+              view.update_one({ '$set' => { field: 'testing' } }, { hint: '_id_' })
+            end.to_not raise_error(Mongo::Error::UnsupportedOption)
+          end
+        end
+
+        context "on <=4.0 servers" do
+          max_server_version '4.0'
+
+          it 'raises a client-side error' do
+            expect do
+              view.update_one({ '$set' => { field: 'testing' } }, { hint: '_id_' })
+            end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+          end
         end
       end
     end

data/spec/mongo/collection_crud_spec.rb

@@ -410,16 +410,22 @@ describe Mongo::Collection do
       it_behaves_like 'an implicit session with an unacknowledged write'
     end
 
-    context 'when a document contains invalid keys' do
+    context 'when a document contains dotted keys' do
 
       let(:docs) do
         [ { 'first.name' => 'test1' }, { name: 'test2' } ]
       end
 
-      it 'raises a BSON::String::IllegalKey exception' do
+      let(:view) { authorized_collection.find({}, { sort: { name: 1 } }) }
+
+      it 'inserts the documents correctly' do
         expect {
           authorized_collection.insert_many(docs)
-        }.to raise_exception(BSON::String::IllegalKey)
+        }.to_not raise_error
+
+        expect(view.count).to eq(2)
+        expect(view.first['first.name']).to eq('test1')
+        expect(view.to_a[1]['name']).to eq('test2')
       end
     end
 
@@ -714,16 +720,19 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the document contains invalid keys' do
+    context 'when the document contains dotted keys' do
 
       let(:doc) do
         { 'testing.test' => 'value' }
       end
 
-      it 'raises a BSON::String::IllegalKey exception' do
+      it 'inserts the document correctly' do
         expect {
           authorized_collection.insert_one(doc)
-        }.to raise_exception(BSON::String::IllegalKey)
+        }.to_not raise_error
+
+        expect(authorized_collection.count).to eq(1)
+        expect(authorized_collection.find.first['testing.test']).to eq('value')
       end
     end
 
@@ -2096,16 +2105,36 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the replace fails' do
+    context 'when the replace has an invalid key' do
 
-      let(:result) do
-        authorized_collection.replace_one(selector, { '$s' => 'test1' })
+      context "when validate_update_replace is true" do
+
+        config_override :validate_update_replace, true
+
+        let(:result) do
+          authorized_collection.replace_one(selector, { '$s' => 'test1' })
+        end
+
+        it 'raises an InvalidReplacementDocument error' do
+          expect {
+            result
+          }.to raise_exception(Mongo::Error::InvalidReplacementDocument)
+        end
       end
 
-      it 'raises an OperationFailure' do
-        expect {
-          result
-        }.to raise_exception(Mongo::Error::OperationFailure)
+      context "when validate_update_replace is false" do
+
+        config_override :validate_update_replace, false
+
+        let(:result) do
+          authorized_collection.replace_one(selector, { '$set' => { 'test1' => 1 } })
+        end
+
+        it 'does not raise an error' do
+          expect {
+            result
+          }.to_not raise_exception
+        end
       end
     end
 
@@ -4362,4 +4391,25 @@ describe Mongo::Collection do
       end
     end
   end
+
+  context 'when unacknowledged writes is used on find_one_and_update' do
+
+    let(:selector) do
+      { name: 'BANG' }
+    end
+
+    let(:collection_with_unacknowledged_write_concern) do
+      authorized_collection.with(write: { w: 0 })
+    end
+
+    let(:result) do
+      collection_with_unacknowledged_write_concern.find_one_and_update(selector,
+        { '$set' => { field: 'testing' }},
+        write_concern: { w: 0 })
+    end
+
+    it 'does not raise an exception' do
+      expect(result).to be_nil
+    end
+  end
 end

data/spec/mongo/collection_spec.rb

@@ -800,5 +800,37 @@ describe Mongo::Collection do
         end
       end
     end
+
+    context 'when the change stream is empty' do
+      require_wired_tiger
+      min_server_fcv '3.6'
+      require_topology :replica_set
+
+      context 'when setting the max_await_time_ms' do
+
+        let(:change_stream) do
+          authorized_collection.watch([], max_await_time_ms: 3000)
+        end
+
+        let(:enum) { change_stream.to_enum }
+
+        it 'sets the option correctly' do
+          expect(change_stream.instance_variable_get(:@cursor)).to receive(:get_more_operation).once.and_wrap_original do |m, *args, &block|
+            m.call(*args).tap do |op|
+              expect(op.max_time_ms).to eq(3000)
+            end
+          end
+          enum.next
+        end
+
+        it "waits the appropriate amount of time" do
+          start_time = Time.now
+          enum.try_next
+          end_time = Time.now
+
+          expect(end_time-start_time).to be >= 3
+        end
+      end
+    end
   end
 end

data/spec/mongo/config/options_spec.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Mongo::Config::Options do
+
+  let(:config) do
+    Mongo::Config
+  end
+
+  describe "#defaults" do
+
+    it "returns the default options" do
+      expect(config.defaults).to_not be_empty
+    end
+  end
+
+  describe "#option" do
+
+    context "when a default is provided" do
+
+      after do
+        config.reset
+      end
+
+      it "defines a getter" do
+        expect(config.validate_update_replace).to be false
+      end
+
+      it "defines a setter" do
+        expect(config.validate_update_replace = true).to be true
+        expect(config.validate_update_replace).to be true
+      end
+
+      it "defines a presence check" do
+        expect(config.validate_update_replace?).to be false
+      end
+    end
+
+    context 'when option is not a boolean' do
+      before do
+        config.validate_update_replace = 'foo'
+      end
+
+      after do
+        config.reset
+      end
+
+      context 'presence check' do
+        it 'is a boolean' do
+          expect(config.validate_update_replace?).to be true
+        end
+      end
+    end
+  end
+
+  describe "#reset" do
+
+    before do
+      config.validate_update_replace = true
+      config.reset
+    end
+
+    it "resets the settings to the defaults" do
+      expect(config.validate_update_replace).to be false
+    end
+  end
+
+  describe "#settings" do
+
+    it "returns the settings" do
+      expect(config.settings).to_not be_empty
+    end
+  end
+end

data/spec/mongo/config_spec.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Mongo::Config do
+
+  shared_examples "a config option" do
+
+    before do
+      Mongo::Config.reset
+    end
+
+    context 'when the value is false' do
+
+      before do
+        Mongo.send("#{option}=", false)
+      end
+
+      it "is set to false" do
+        expect(Mongo.send(option)).to be(false)
+      end
+    end
+
+    context 'when the value is true' do
+
+      before do
+        Mongo.send("#{option}=", true)
+      end
+
+      it "is set to true" do
+        expect(Mongo.send(option)).to be(true)
+      end
+    end
+
+    context "when it is not set in the config" do
+
+      it "it is set to its default" do
+        expect(Mongo.send(option)).to be(default)
+      end
+    end
+  end
+
+
+  context 'when setting the validate_update_replace option in the config' do
+    let(:option) { :validate_update_replace }
+    let(:default) { false }
+
+    it_behaves_like "a config option"
+  end
+
+  describe "#options=" do
+
+    context "when an option" do
+
+      before do
+        described_class.options = { validate_update_replace: true }
+      end
+
+      it "assigns the option correctly" do
+        expect(described_class.validate_update_replace).to be true
+      end
+    end
+
+    context "when provided a non-existent option" do
+
+      it "raises an error" do
+        expect {
+          described_class.options = { bad_option: true }
+        }.to raise_error(Mongo::Error::InvalidConfigOption)
+      end
+    end
+  end
+end

data/spec/mongo/crypt/auto_decryption_context_spec.rb

@@ -8,7 +8,8 @@ describe Mongo::Crypt::AutoDecryptionContext do
   require_libmongocrypt
   include_context 'define shared FLE helpers'
 
-  let(:mongocrypt) { Mongo::Crypt::Handle.new(kms_providers, logger: logger) }
+  let(:credentials) { Mongo::Crypt::KMS::Credentials.new(kms_providers) }
+  let(:mongocrypt) { Mongo::Crypt::Handle.new(credentials, logger: logger) }
   let(:context) { described_class.new(mongocrypt, io, command) }
 
   let(:logger) { nil }
@@ -62,6 +63,21 @@ describe Mongo::Crypt::AutoDecryptionContext do
       it_behaves_like 'a functioning AutoDecryptionContext'
     end
 
+    context 'when mongocrypt is initialized with Azure KMS provider options' do
+      include_context 'with Azure kms_providers'
+      it_behaves_like 'a functioning AutoDecryptionContext'
+    end
+
+    context 'when mongocrypt is initialized with GCP KMS provider options' do
+      include_context 'with GCP kms_providers'
+      it_behaves_like 'a functioning AutoDecryptionContext'
+    end
+
+    context 'when mongocrypt is initialized with KMIP KMS provider options' do
+      include_context 'with KMIP kms_providers'
+      it_behaves_like 'a functioning AutoDecryptionContext'
+    end
+
     context 'with verbose logging' do
       include_context 'with local kms_providers'