mongo 2.17.1 → 2.18.1

data/spec/mongo/auth/scram256/conversation_spec.rb

@@ -31,32 +31,32 @@ describe Mongo::Auth::Scram256::Conversation do
 
   describe '#start' do
 
-    let(:query) do
-      conversation.start(nil)
+    let(:msg) do
+      conversation.start(connection)
     end
 
     before do
       expect(SecureRandom).to receive(:base64).once.and_return('rOprNGfwEbeRWgbNEkqO')
     end
 
-    let(:selector) do
-      query.selector
+    let(:command) do
+      msg.payload['command']
     end
 
     it 'sets the sasl start flag' do
-      expect(selector[:saslStart]).to eq(1)
+      expect(command[:saslStart]).to eq(1)
     end
 
     it 'sets the auto authorize flag' do
-      expect(selector[:autoAuthorize]).to eq(1)
+      expect(command[:autoAuthorize]).to eq(1)
     end
 
     it 'sets the mechanism' do
-      expect(selector[:mechanism]).to eq('SCRAM-SHA-256')
+      expect(command[:mechanism]).to eq('SCRAM-SHA-256')
     end
 
     it 'sets the payload' do
-      expect(selector[:payload].data).to eq('n,,n=user,r=rOprNGfwEbeRWgbNEkqO')
+      expect(command[:payload].data).to eq('n,,n=user,r=rOprNGfwEbeRWgbNEkqO')
     end
   end
 
@@ -75,26 +75,26 @@ describe Mongo::Auth::Scram256::Conversation do
         )
       end
 
-      let(:query) do
+      let(:msg) do
         conversation.continue(continue_document, connection)
       end
 
-      let(:selector) do
-        query.selector
+      let(:command) do
+        msg.payload['command']
       end
 
       it 'sets the conversation id' do
-        expect(selector[:conversationId]).to eq(1)
+        expect(command[:conversationId]).to eq(1)
       end
 
       it 'sets the payload' do
-        expect(selector[:payload].data).to eq(
+        expect(command[:payload].data).to eq(
           'c=biws,r=rOprNGfwEbeRWgbNEkqO%hvYDpWUa2RaTCAfuxFIlj)hNlF$k0,p=dHzbZapWIk4jUhN+Ute9ytag9zjfMHgsqmmiz7AndVQ='
         )
       end
 
       it 'sets the continue flag' do
-        expect(selector[:saslContinue]).to eq(1)
+        expect(command[:saslContinue]).to eq(1)
       end
     end
 
@@ -133,26 +133,26 @@ describe Mongo::Auth::Scram256::Conversation do
         BSON::Binary.new(' v=6rriTRBi23WpRR/wtup+mMhUZUn/dB5nLTJRsjl95G4=')
       end
 
-      let(:query) do
+      let(:msg) do
         conversation.continue(continue_document, connection)
         conversation.process_continue_response(finalize_document)
         conversation.finalize(connection)
       end
 
-      let(:selector) do
-        query.selector
+      let(:command) do
+        msg.payload['command']
       end
 
       it 'sets the conversation id' do
-        expect(selector[:conversationId]).to eq(1)
+        expect(command[:conversationId]).to eq(1)
       end
 
       it 'sets the empty payload' do
-        expect(selector[:payload].data).to eq('')
+        expect(command[:payload].data).to eq('')
       end
 
       it 'sets the continue flag' do
-        expect(selector[:saslContinue]).to eq(1)
+        expect(command[:saslContinue]).to eq(1)
       end
     end
 

data/spec/mongo/auth/scram_negotiation_spec.rb

@@ -9,6 +9,7 @@ require 'spec_helper'
 describe 'SCRAM-SHA auth mechanism negotiation' do
   min_server_fcv '4.0'
   require_no_external_user
+  require_topology :single, :replica_set, :sharded
   # Test uses global assertions
   clean_slate
 

data/spec/mongo/bulk_write/result_spec.rb

@@ -8,7 +8,7 @@ describe Mongo::BulkWrite::Result do
     {'n_inserted' => 2, 'n' => 3, 'inserted_ids' => [1, 2]}
   end
 
-  let(:subject) { described_class.new(results_document) }
+  let(:subject) { described_class.new(results_document, true) }
 
   describe 'construction' do
     it 'works' do
@@ -124,4 +124,18 @@ describe Mongo::BulkWrite::Result do
       end
     end
   end
+
+  describe "#acknowledged?" do
+
+    [true, false].each do |b|
+      context "when acknowledged is passed as #{b}" do
+
+        let(:result) { described_class.new(results_document, b) }
+
+        it "acknowledged? is #{b}" do
+          expect(result.acknowledged?).to be b
+        end
+      end
+    end
+  end
 end

data/spec/mongo/bulk_write_spec.rb

@@ -55,6 +55,19 @@ describe Mongo::BulkWrite do
         end
       end
 
+      context 'when providing no requests' do
+
+        let(:requests) do
+          []
+        end
+
+        it 'raises an exception' do
+          expect {
+            bulk_write.execute
+          }.to raise_error(ArgumentError, /Bulk write requests cannot be empty/)
+        end
+      end
+
       context 'when the operations do not need to be split' do
 
         context 'when a write error occurs' do
@@ -257,10 +270,24 @@ describe Mongo::BulkWrite do
                 )
               end
 
-              it 'raises a client-side error' do
-                expect do
-                  bulk_write.execute
-                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 raises an error" do
+                  expect do
+                    bulk_write.execute
+                  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
+                    bulk_write.execute
+                  end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+                end
               end
             end
 
@@ -420,10 +447,24 @@ describe Mongo::BulkWrite do
                   )
                 end
 
-                it 'raises a client-side error' do
-                  expect do
-                    bulk_write.execute
-                  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 raises an error" do
+                    expect do
+                      bulk_write.execute
+                    end.to_not raise_error(Mongo::Error::UnsupportedOption)
+                  end
+                end
+
+                context "on <=4.2 servers" do
+                  max_server_version '4.0'
+
+                  it 'raises a client-side error' do
+                    expect do
+                      bulk_write.execute
+                    end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+                  end
                 end
               end
             end
@@ -502,10 +543,24 @@ describe Mongo::BulkWrite do
                   )
                 end
 
-                it 'raises a client-side error' do
-                  expect do
-                    bulk_write.execute
-                  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 raises an error" do
+                    expect do
+                      bulk_write.execute
+                    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
+                      bulk_write.execute
+                    end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+                  end
                 end
               end
             end
@@ -787,10 +842,24 @@ describe Mongo::BulkWrite do
                 )
               end
 
-              it 'raises a client-side error' do
-                expect do
-                  bulk_write.execute
-                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 raises an error" do
+                  expect do
+                    bulk_write.execute
+                  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
+                    bulk_write.execute
+                  end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+                end
               end
             end
           end
@@ -1105,10 +1174,24 @@ describe Mongo::BulkWrite do
                 )
               end
 
-              it 'raises a client-side error' do
-                expect do
-                  bulk_write.execute
-                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 raises an error" do
+                  expect do
+                    bulk_write.execute
+                  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
+                    bulk_write.execute
+                  end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+                end
               end
             end
           end
@@ -2390,4 +2473,42 @@ describe Mongo::BulkWrite do
       end
     end
   end
+
+  describe "#acknowledged?" do
+    let(:requests) { [ { insert_one: { x: 1 } } ] }
+    let(:options) { {} }
+    let(:bulk_write) do
+      described_class.new(
+        collection,
+        requests,
+        options
+      )
+    end
+    let(:result) { bulk_write.execute }
+
+    context "when using unacknowledged writes with one request" do
+     let(:options) { { write_concern: { w: 0 } } }
+
+      it 'acknowledged? returns false' do
+        expect(result.acknowledged?).to be false
+      end
+    end
+
+    context "when using unacknowledged writes with multiple requests" do
+     let(:options) { { write_concern: { w: 0 } } }
+     let(:requests) { [ { insert_one: { x: 1 } }, { insert_one: { x: 1 } } ] }
+
+      it 'acknowledged? returns false' do
+        expect(result.acknowledged?).to be false
+      end
+    end
+
+    context "when not using unacknowledged writes" do
+      let(:options) { { write_concern: { w: 1 } } }
+
+      it 'acknowledged? returns true' do
+        expect(result.acknowledged?).to be true
+      end
+    end
+  end
 end

data/spec/mongo/client_construction_spec.rb

@@ -211,7 +211,7 @@ describe Mongo::Client do
             let(:kms_providers) { nil }
 
             it 'raises an exception' do
-              expect { client }.to raise_error(ArgumentError, /kms_providers option must not be nil/)
+              expect { client }.to raise_error(ArgumentError, /KMS providers options must not be nil/)
             end
           end
 
@@ -219,7 +219,7 @@ describe Mongo::Client do
             let(:kms_providers) { { random_key: 'hello' } }
 
             it 'raises an exception' do
-              expect { client }.to raise_error(ArgumentError, /kms_providers option must have one of the following keys: :aws, :local/)
+              expect { client }.to raise_error(ArgumentError, /KMS providers options must have one of the following keys: :aws, :azure, :gcp, :kmip, :local/)
             end
           end
 
@@ -227,7 +227,7 @@ describe Mongo::Client do
             let(:kms_providers) { { local: { wrong_key: 'hello' } } }
 
             it 'raises an exception' do
-              expect { client }.to raise_error(ArgumentError, /kms_providers with :local key must be in the format: { local: { key: 'MASTER-KEY' } }/)
+              expect { client }.to raise_error(ArgumentError, /Local KMS provider options must be in the format: { key: 'MASTER-KEY' }/)
             end
           end
 
@@ -235,7 +235,7 @@ describe Mongo::Client do
             let(:kms_providers) { { aws: { wrong_key: 'hello' } } }
 
             it 'raises an exception' do
-              expect { client }.to raise_error(ArgumentError, /kms_providers with :aws key must be in the format: { aws: { access_key_id: 'YOUR-ACCESS-KEY-ID', secret_access_key: 'SECRET-ACCESS-KEY' } }/)
+              expect { client }.to raise_error(ArgumentError, / AWS KMS provider options must be in the format: { access_key_id: 'YOUR-ACCESS-KEY-ID', secret_access_key: 'SECRET-ACCESS-KEY' }/)
             end
           end
 
@@ -285,9 +285,9 @@ describe Mongo::Client do
                 }
               end
 
-              it 'sets key_vault_client as a clone of self with no encryption options' do
+              it 'sets key_vault_client with no encryption options' do
                 key_vault_client = client.encrypter.key_vault_client
-                expect(key_vault_client).to eq(client)
+                expect(key_vault_client.options['auto_encryption_options']).to be_nil
               end
 
               it 'sets bypass_auto_encryption to false' do
@@ -447,7 +447,8 @@ describe Mongo::Client do
             end.should_not raise_error
           end
 
-          it 'fails operations due to very small timeout', retry: 3 do
+          retry_test
+          it 'fails operations due to very small timeout' do
             lambda do
               client.database.command(ping: 1)
             end.should raise_error(Mongo::Error::SocketTimeoutError)
@@ -843,6 +844,20 @@ describe Mongo::Client do
               expect(client.options[:max_pool_size]).to eq(options[:max_pool_size])
             end
           end
+
+          context 'when max_pool_size is zero (unlimited)' do
+            let(:options) do
+              {
+                  :min_pool_size => 10,
+                  :max_pool_size => 0
+              }
+            end
+
+            it 'sets the option' do
+              expect(client.options[:min_pool_size]).to eq(options[:min_pool_size])
+              expect(client.options[:max_pool_size]).to eq(options[:max_pool_size])
+            end
+          end
         end
 
         context 'when max_pool_size is not provided' do
@@ -851,7 +866,7 @@ describe Mongo::Client do
 
             let(:options) do
               {
-                  :min_pool_size => 10
+                  :min_pool_size => 30
               }
             end
 
@@ -890,6 +905,24 @@ describe Mongo::Client do
         end
       end
 
+      context 'when max_pool_size is provided' do
+        let(:client) do
+          new_local_client_nmio(['127.0.0.1:27017'], options)
+        end
+
+        context 'when max_pool_size is 0 (unlimited)' do
+          let(:options) do
+            {
+                :max_pool_size => 0
+            }
+          end
+
+          it 'sets the option' do
+            expect(client.options[:max_pool_size]).to eq(options[:max_pool_size])
+          end
+        end
+      end
+
       context 'when max_pool_size and min_pool_size are both nil' do
 
         let(:client) do
@@ -1080,6 +1113,17 @@ describe Mongo::Client do
                 expect(client.options[:max_pool_size]).to eq(10)
               end
             end
+
+            context 'when max_pool_size is 0 (unlimited)' do
+              let(:uri) do
+                'mongodb://127.0.0.1:27017/?minPoolSize=10&maxPoolSize=0'
+              end
+
+              it 'sets the option' do
+                expect(client.options[:min_pool_size]).to eq(10)
+                expect(client.options[:max_pool_size]).to eq(0)
+              end
+            end
           end
 
           context 'when max_pool_size is not provided' do
@@ -1087,7 +1131,7 @@ describe Mongo::Client do
             context 'when the min_pool_size is greater than the default max_pool_size' do
 
               let(:uri) do
-                'mongodb://127.0.0.1:27017/?minPoolSize=10'
+                'mongodb://127.0.0.1:27017/?minPoolSize=30'
               end
 
               it 'raises an Exception' do
@@ -1513,6 +1557,139 @@ describe Mongo::Client do
             end
           end
         end
+
+        context 'srv_max_hosts > 0 and load_balanced: true' do
+          let(:client) do
+            new_local_client_nmio(['127.0.0.1:27017'],
+               srv_max_hosts: 1, load_balanced: true)
+          end
+
+          it 'it is rejected' do
+            expect do
+              client
+            end.to raise_error(ArgumentError, /:srv_max_hosts > 0 cannot be used with :load_balanced=true/)
+          end
+        end
+
+        context 'srv_max_hosts > 0 and replica_set' do
+          let(:client) do
+            new_local_client_nmio(['127.0.0.1:27017'],
+              srv_max_hosts: 1, replica_set: 'rs')
+          end
+
+          it 'it is rejected' do
+            expect do
+              client
+            end.to raise_error(ArgumentError, /:srv_max_hosts > 0 cannot be used with :replica_set option/)
+          end
+        end
+
+        context 'srv_max_hosts < 0' do
+          let(:client) do
+            new_local_client_nmio(['127.0.0.1:27017'],
+               srv_max_hosts: -1)
+          end
+
+          it 'is accepted and does not add the srv_max_hosts to uri_options' do
+            lambda do
+              client
+            end.should_not raise_error
+            expect(client.options).to_not have_key(:srv_max_hosts)
+          end
+        end
+
+        context 'srv_max_hosts invalid type' do
+          let(:client) do
+            new_local_client_nmio(['127.0.0.1:27017'],
+               srv_max_hosts: 'foo')
+          end
+
+          it 'is accepted and does not add the srv_max_hosts to uri_options' do
+            lambda do
+              client
+            end.should_not raise_error
+            expect(client.options).to_not have_key(:srv_max_hosts)
+          end
+        end
+
+        context 'srv_max_hosts with non-SRV URI' do
+          let(:client) do
+            new_local_client_nmio(['127.0.0.1:27017'],
+               srv_max_hosts: 1)
+          end
+
+          it 'is rejected' do
+            lambda do
+              client
+            end.should raise_error(ArgumentError, /:srv_max_hosts cannot be used on non-SRV URI/)
+          end
+        end
+
+        context 'srv_service_name with non-SRV URI' do
+          let(:client) do
+            new_local_client_nmio(['127.0.0.1:27017'],
+               srv_service_name: "customname")
+          end
+
+          it 'is rejected' do
+            lambda do
+              client
+            end.should raise_error(ArgumentError, /:srv_service_name cannot be used on non-SRV URI/)
+          end
+        end
+      end
+
+      context 'with SRV lookups mocked at Resolver' do
+        let(:srv_result) do
+          double('srv result').tap do |result|
+            allow(result).to receive(:empty?).and_return(false)
+            allow(result).to receive(:address_strs).and_return(
+              [ClusterConfig.instance.primary_address_str])
+          end
+        end
+
+        let(:client) do
+          allow_any_instance_of(Mongo::Srv::Resolver).to receive(:get_records).and_return(srv_result)
+          allow_any_instance_of(Mongo::Srv::Resolver).to receive(:get_txt_options_string)
+
+          new_local_client_nmio('mongodb+srv://foo.a.b', options)
+        end
+
+        context "when setting srv_max_hosts" do
+          let(:srv_max_hosts) { 1 }
+          let(:options) { { srv_max_hosts: srv_max_hosts } }
+
+          it 'is accepted and sets srv_max_hosts' do
+            lambda do
+              client
+            end.should_not raise_error
+            expect(client.options[:srv_max_hosts]).to eq(srv_max_hosts)
+          end
+        end
+
+        context "when setting srv_max_hosts to 0" do
+          let(:srv_max_hosts) { 0 }
+          let(:options) { { srv_max_hosts: srv_max_hosts } }
+
+          it 'is accepted sets srv_max_hosts' do
+            lambda do
+              client
+            end.should_not raise_error
+            expect(client.options[:srv_max_hosts]).to eq(srv_max_hosts)
+          end
+        end
+
+        context "when setting srv_service_name" do
+          let(:srv_service_name) { 'customname' }
+          let(:options) { { srv_service_name: srv_service_name } }
+
+          it 'is accepted and sets srv_service_name' do
+            lambda do
+              client
+            end.should_not raise_error
+            expect(client.options[:srv_service_name]).to eq(srv_service_name)
+          end
+        end
       end
 
       context ':bg_error_backtrace option' do