mongo 2.15.0 → 2.18.1

data/spec/integration/versioned_api_examples_spec.rb

@@ -9,9 +9,10 @@ describe 'Versioned API examples' do
   # the tests to simple configurations
   require_no_auth
   require_no_tls
+  min_server_version("5.0")
 
   let(:uri_string) do
-    "mongodb://#{SpecConfig.instance.addresses.join(',')}"
+    "mongodb://#{SpecConfig.instance.addresses.join(',')}/versioned-api-examples"
   end
 
   it 'Versioned API example 1' do
@@ -66,4 +67,54 @@ describe 'Versioned API examples' do
     # Do not leak clients.
     client.close
   end
+
+  # See also RUBY-2922 for count in versioned api v1.
+  context 'servers that exclude count from versioned api' do
+    max_server_version '5.0.8'
+
+    it "Versioned API Strict Migration Example" do
+      client = Mongo::Client.new(uri_string, server_api: {version: "1", strict: true})
+      client[:sales].drop
+
+      # Start Versioned API Example 5
+
+      client[:sales].insert_many([
+        { _id: 1, item: "abc", price: 10, quantity: 2,  date: DateTime.parse("2021-01-01T08:00:00Z") },
+        { _id: 2, item: "jkl", price: 20, quantity: 1,  date: DateTime.parse("2021-02-03T09:00:00Z") },
+        { _id: 3, item: "xyz", price: 5,  quantity: 5,  date: DateTime.parse("2021-02-03T09:05:00Z") },
+        { _id: 4, item: "abc", price: 10, quantity: 10, date: DateTime.parse("2021-02-15T08:00:00Z") },
+        { _id: 5, item: "xyz", price: 5,  quantity: 10, date: DateTime.parse("2021-02-15T09:05:00Z") },
+        { _id: 6, item: "xyz", price: 5,  quantity: 5,  date: DateTime.parse("2021-02-15T12:05:10Z") },
+        { _id: 7, item: "xyz", price: 5,  quantity: 10, date: DateTime.parse("2021-02-15T14:12:12Z") },
+        { _id: 8, item: "abc", price: 10, quantity: 5,  date: DateTime.parse("2021-03-16T20:20:13Z") }
+      ])
+
+      # End Versioned API Example 5
+
+      expect do
+        client.database.command(count: :sales)
+      end.to raise_error(Mongo::Error::OperationFailure)
+
+      # Start Versioned API Example 6
+
+      # Mongo::Error::OperationFailure:
+      #   [323:APIStrictError]: Provided apiStrict:true, but the command count is not in API Version 1. Information on supported commands and migrations in API Version 1 can be found at https://dochub.mongodb.org/core/manual-versioned-api
+
+      # End Versioned API Example 6
+
+      # Start Versioned API Example 7
+
+      client[:sales].count_documents
+
+      # End Versioned API Example 7
+
+      # Start Versioned API Example 8
+
+      # 8
+
+      # End Versioned API Example 8
+      # Do not leak clients.
+      client.close
+    end
+  end
 end

data/spec/integration/x509_auth_spec.rb

@@ -38,7 +38,7 @@ describe 'X.509 auth integration tests' do
       "C=US,ST=New York,L=New York City,O=MongoDB,OU=x509,CN=localhost".freeze
     end
 
-    let(:subscriber) { EventSubscriber.new }
+    let(:subscriber) { Mrss::EventSubscriber.new }
 
     shared_examples 'authenticates successfully' do
       it 'authenticates successfully' do

data/spec/lite_spec_helper.rb

@@ -10,13 +10,8 @@ SERVER_DISCOVERY_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/sdam/**/*.yml
 SDAM_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/sdam_monitoring/*.yml").sort
 SERVER_SELECTION_RTT_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/server_selection_rtt/*.yml").sort
 CRUD_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/crud/**/*.yml").sort
-CRUD2_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/crud_v2/**/*.yml").sort
-RETRYABLE_WRITES_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/retryable_writes/**/*.yml").sort
-RETRYABLE_READS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/retryable_reads/**/*.yml").sort
-COMMAND_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/command_monitoring/**/*.yml").sort
 CONNECTION_STRING_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/connection_string/*.yml").sort
 URI_OPTIONS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/uri_options/*.yml").sort
-DNS_SEEDLIST_DISCOVERY_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/dns_seedlist_discovery/*.yml").sort
 GRIDFS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/gridfs/*.yml").sort
 TRANSACTIONS_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/transactions/*.yml").sort
 TRANSACTIONS_API_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/transactions_api/*.yml").sort
@@ -37,7 +32,10 @@ else
   begin
     require 'byebug'
   rescue LoadError
-    require 'ruby-debug'
+    begin
+      require 'ruby-debug'
+    rescue LoadError
+    end
   end
 end
 
@@ -56,6 +54,8 @@ autoload :IceNine, 'ice_nine'
 autoload :Timecop, 'timecop'
 autoload :ChildProcess, 'childprocess'
 
+require 'rspec/retry'
+
 if BSON::Environment.jruby?
   require 'concurrent-ruby'
   PossiblyConcurrentArray = Concurrent::Array
@@ -78,24 +78,28 @@ end
 
 require 'mrss/lite_constraints'
 require 'support/matchers'
-require 'support/event_subscriber'
+require 'mrss/event_subscriber'
 require 'support/common_shortcuts'
 require 'support/client_registry'
 require 'support/client_registry_macros'
+require 'support/mongos_macros'
+require 'support/macros'
 require 'support/crypt'
 require 'support/json_ext_formatter'
 require 'support/sdam_formatter_integration'
 require 'support/background_thread_registry'
-require 'support/session_registry'
+require 'mrss/session_registry'
 require 'support/local_resource_registry'
 
-if SpecConfig.instance.mri?
+if SpecConfig.instance.mri? && !SpecConfig.instance.windows?
   require 'timeout_interrupt'
 else
   require 'timeout'
   TimeoutInterrupt = Timeout
 end
 
+Mrss.patch_mongo_for_session_registry
+
 class ExampleTimeout < StandardError; end
 
 RSpec.configure do |config|
@@ -103,6 +107,8 @@ RSpec.configure do |config|
   config.include(CommonShortcuts::InstanceMethods)
   config.extend(Mrss::LiteConstraints)
   config.include(ClientRegistryMacros)
+  config.include(MongosMacros)
+  config.extend(Mongo::Macros)
 
   if SpecConfig.instance.ci?
     SdamFormatterIntegration.subscribe
@@ -119,14 +125,17 @@ RSpec.configure do |config|
   end
 
   if SpecConfig.instance.ci? && !%w(1 true yes).include?(ENV['INTERACTIVE']&.downcase)
-    # Allow a max of 30 seconds per test.
     # Tests should take under 10 seconds ideally but it seems
     # we have some that run for more than 10 seconds in CI.
     config.around(:each) do |example|
       timeout = if %w(1 true yes).include?(ENV['STRESS']&.downcase)
         210
       else
-        45
+        if BSON::Environment.jruby?
+          90
+        else
+          45
+        end
       end
       TimeoutInterrupt.timeout(timeout, ExampleTimeout) do
         example.run
@@ -158,6 +167,13 @@ RSpec.configure do |config|
 end
 
 if SpecConfig.instance.active_support?
+  require "active_support/version"
+  if ActiveSupport.version >= Gem::Version.new(7)
+    # ActiveSupport wants us to require ALL of it all of the time.
+    # See: https://github.com/rails/rails/issues/43851,
+    # https://github.com/rails/rails/issues/43889, etc.
+    require 'active_support'
+  end
   require "active_support/time"
   require 'mongo/active_support'
 end

data/spec/mongo/address/ipv6_spec.rb

@@ -89,6 +89,13 @@ describe Mongo::Address::IPv6 do
 
   describe '#socket' do
 
+    # In JRuby 9.3.2.0 Socket::PF_INET6 is nil, causing IPv6 tests to fail.
+    # https://github.com/jruby/jruby/issues/7069
+    # JRuby 9.2 works correctly, this test is skipped on all JRuby versions
+    # because we intend to remove JRuby support altogether and therefore
+    # adding logic to condition on JRuby versions does not make sense.
+    fails_on_jruby
+
     let(:address) do
       '[::1]'
     end

data/spec/mongo/address/unix_spec.rb

@@ -28,6 +28,7 @@ describe Mongo::Address::Unix do
   end
 
   describe '#socket' do
+    require_unix_socket
 
     let(:address) do
       "/tmp/mongodb-#{SpecConfig.instance.any_port}.sock"

data/spec/mongo/address_spec.rb

@@ -228,6 +228,13 @@ describe Mongo::Address do
 
     context 'when providing a DNS entry that resolves to both IPv6 and IPv4' do
 
+      # In JRuby 9.3.2.0 Socket::PF_INET6 is nil, causing IPv6 tests to fail.
+      # https://github.com/jruby/jruby/issues/7069
+      # JRuby 9.2 works correctly, this test is skipped on all JRuby versions
+      # because we intend to remove JRuby support altogether and therefore
+      # adding logic to condition on JRuby versions does not make sense.
+      fails_on_jruby
+
       let(:custom_hostname) do
         'not_localhost'
       end

data/spec/mongo/auth/cr_spec.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'support/shared/auth_context'
 
 describe Mongo::Auth::CR do
 
@@ -9,9 +10,7 @@ describe Mongo::Auth::CR do
     authorized_client.cluster.next_primary
   end
 
-  let(:connection) do
-    Mongo::Server::Connection.new(server, SpecConfig.instance.test_options)
-  end
+  include_context 'auth unit tests'
 
   describe '#login' do
 

data/spec/mongo/auth/ldap_spec.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'support/shared/auth_context'
 
 describe Mongo::Auth::LDAP do
 
@@ -9,9 +10,7 @@ describe Mongo::Auth::LDAP do
     authorized_client.cluster.next_primary
   end
 
-  let(:connection) do
-    Mongo::Server::Connection.new(server, SpecConfig.instance.test_options)
-  end
+  include_context 'auth unit tests'
 
   let(:user) do
     Mongo::Auth::User.new(

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

@@ -33,32 +33,32 @@ describe Mongo::Auth::Scram::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('NDA2NzU3MDY3MDYwMTgy')
     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-1')
+      expect(command[:mechanism]).to eq('SCRAM-SHA-1')
     end
 
-    it 'sets the payload' do
-      expect(selector[:payload].data).to eq('n,,n=user,r=NDA2NzU3MDY3MDYwMTgy')
+    it 'sets the command' do
+      expect(command[:payload].data).to eq('n,,n=user,r=NDA2NzU3MDY3MDYwMTgy')
     end
   end
 
@@ -77,26 +77,26 @@ describe Mongo::Auth::Scram::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(
+      it 'sets the command' do
+        expect(command[:payload].data).to eq(
           'c=biws,r=NDA2NzU3MDY3MDYwMTgyt7/+IWaw1HaZZ5NmPJUTWapLpH2Gg+d8,p=qYUYNy6SQ9Jucq9rFA9nVgXQdbM='
         )
       end
 
       it 'sets the continue flag' do
-        expect(selector[:saslContinue]).to eq(1)
+        expect(command[:saslContinue]).to eq(1)
       end
     end
 
@@ -135,26 +135,26 @@ describe Mongo::Auth::Scram::Conversation do
         BSON::Binary.new('v=gwo9E8+uifshm7ixj441GvIfuUY=')
       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('')
+      it 'sets the empty command' do
+        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/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/auth/scram_spec.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'support/shared/auth_context'
 
 describe Mongo::Auth::Scram do
   require_no_external_user
@@ -10,9 +11,7 @@ describe Mongo::Auth::Scram do
     authorized_client.cluster.next_primary
   end
 
-  let(:connection) do
-    Mongo::Server::Connection.new(server, SpecConfig.instance.monitoring_options)
-  end
+  include_context 'auth unit tests'
 
   let(:cache_mod) { Mongo::Auth::CredentialCache }
 

data/spec/mongo/auth/user/view_spec.rb

@@ -23,7 +23,7 @@ describe Mongo::Auth::User::View do
   shared_context 'testing write concern' do
 
     let(:subscriber) do
-      EventSubscriber.new
+      Mrss::EventSubscriber.new
     end
 
     let(:client) do

data/spec/mongo/auth/x509_spec.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'support/shared/auth_context'
 
 describe Mongo::Auth::X509 do
 
@@ -9,9 +10,7 @@ describe Mongo::Auth::X509 do
     authorized_client.cluster.next_primary
   end
 
-  let(:connection) do
-    Mongo::Server::Connection.new(server, SpecConfig.instance.test_options)
-  end
+  include_context 'auth unit tests'
 
   let(:user) do
     Mongo::Auth::User.new(database: '$external')

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