mongo 2.13.1 → 2.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd4f9d74906d6f99fd038c0a3b4cfe0ee5cc3a7a4b327debf9c57649112b2cbb
-  data.tar.gz: 052b3f3af1749d9f26d8e3655359650653b4bf71e9198a3d2116afde6d576eb3
+  metadata.gz: e1730c9274095cd8113fe9ac6d8f48b82ea3228aeb0b327988ab580105c745e3
+  data.tar.gz: d8a224877facc2e078dceb63c01eb9351f558ec9ea8a42b9264b909a77855d56
 SHA512:
-  metadata.gz: c016d60512a77572e58ae6553dc9e61ecf6574abc724785858c43987aa84d7b79199589a9be7da702d6385d48f70f65fe135caa36176f9cf6fb638c3e156afc4
-  data.tar.gz: a5c0dbab135a661a3cec5b0eab3300308693474d4c6662b0a18dd33b303f86753390eb0880232794a09ba511824f5d863f7bf428a8af1ca7b7b511458c078049
+  metadata.gz: 93e0f291aa4e52e81decda048473b8330eac80c17251cde83fb66592800d066d14010142893fabb00d896cdf409aa0bc7dd25feba3ca27b443d94cd44a6542e6
+  data.tar.gz: 6e19b5c2a3f846ae7ffb0feab92b92bbfb0d88d21536d8e66eaccfc63f3dc8236cf7672b6aa23e9d51696135138529819f7fd3fff122c4d1608f8bf6081086b8

data/lib/mongo/address.rb

@@ -286,7 +286,7 @@ module Mongo
       rescue IOError, SystemCallError => e
         raise Error::SocketError, "#{e.class}: #{e} (for #{self})"
       rescue OpenSSL::SSL::SSLError => e
-        raise Error::SocketError, "#{e.class}: #{e} (for #{self}) (#{SSL_ERROR})"
+        raise Error::SocketError, "#{e.class}: #{e} (for #{self})"
       end
     end
   end

data/lib/mongo/database/view.rb

@@ -100,7 +100,7 @@ module Mongo
       #
       # @return [ Array<Hash> ] Info for each collection in the database.
       #
-      # @since 2.0.5 
+      # @since 2.0.5
       def list_collections(options = {})
         session = client.send(:get_session)
         collections_info(session, ServerSelector.primary, options)

data/lib/mongo/operation/collections_info/command.rb

@@ -27,6 +27,11 @@ module Mongo
 
         private
 
+        def get_result(connection, client, options = {})
+          # This is a Mongo::Operation::CollectionsInfo::Result
+          Result.new(*dispatch_message(connection, client), db_name)
+        end
+
         def selector(connection)
           {}
         end

data/lib/mongo/operation/collections_info/result.rb

@@ -22,6 +22,21 @@ module Mongo
       # @since 2.1.0
       class Result < Operation::Result
 
+        # Initialize a new result.
+        #
+        # @param [ Array<Protocol::Message> | nil ] replies The wire protocol replies, if any.
+        # @param [ Server::Description ] connection_description
+        #   Server description of the server that performed the operation that
+        #   this result is for.
+        # @param [ String ] database_name The name of the database that the
+        #   query was sent to.
+        #
+        # @api private
+        def initialize(replies, connection_description, database_name)
+          super(replies, connection_description)
+          @database_name = database_name
+        end
+
         # Get the namespace for the cursor.
         #
         # @example Get the namespace.
@@ -31,7 +46,7 @@ module Mongo
         #
         # @since 2.1.0
         def namespace
-          Database::NAMESPACES
+          "#{@database_name}.#{Database::NAMESPACES}"
         end
       end
     end

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.13.1'.freeze
+  VERSION = '2.13.2'.freeze
 end

data/spec/integration/bson_symbol_spec.rb

@@ -25,8 +25,10 @@ describe 'Symbol encoding to BSON' do
   end
 
   it 'round-trips symbol values using the same byte buffer' do
-    if BSON::Environment.jruby?
-      pending 'https://jira.mongodb.org/browse/RUBY-2128'
+    if BSON::Environment.jruby? && (BSON::VERSION.split('.').map(&:to_i) <=> [4, 11, 0]) < 0
+      skip 'This test is only relevant to bson versions that increment ByteBuffer '\
+       'read and write positions separately in JRuby, as implemented in ' \
+       'bson version 4.11.0. For more information, see https://jira.mongodb.org/browse/RUBY-2128'
     end
 
     Hash.from_bson(hash.to_bson).should == hash

data/spec/integration/sdam_error_handling_spec.rb

@@ -19,6 +19,7 @@ describe 'SDAM error handling' do
     new_local_client(SpecConfig.instance.addresses,
       SpecConfig.instance.all_test_options.merge(
         socket_timeout: 3, connect_timeout: 3,
+        heartbeat_frequency: 100,
         # Uncomment to print all events to stdout:
         #sdam_proc: Utils.subscribe_all_sdam_proc(diagnostic_subscriber),
         **Utils.disable_retries_client_options)
@@ -28,6 +29,14 @@ describe 'SDAM error handling' do
   let(:server) { client.cluster.next_primary }
 
   shared_examples_for 'marks server unknown' do
+    before do
+      server.monitor.stop!
+    end
+
+    after do
+      client.close
+    end
+
     it 'marks server unknown' do
       expect(server).not_to be_unknown
       RSpec::Mocks.with_temporary_scope do
@@ -38,6 +47,14 @@ describe 'SDAM error handling' do
   end
 
   shared_examples_for 'does not mark server unknown' do
+    before do
+      server.monitor.stop!
+    end
+
+    after do
+      client.close
+    end
+
     it 'does not mark server unknown' do
       expect(server).not_to be_unknown
       RSpec::Mocks.with_temporary_scope do

data/spec/integration/sdam_events_spec.rb

@@ -69,7 +69,8 @@ describe 'SDAM events' do
         succeeded_events = subscriber.select_succeeded_events(Mongo::Monitoring::Event::ServerHeartbeatSucceeded)
         # Since we gracefully close the client, we expect each heartbeat
         # to complete.
-        started_events.length.should == succeeded_events.length
+        started_events.length.should > 1
+        (succeeded_events.length-1..succeeded_events.length).should include(started_events.length)
       end
     end
 
@@ -105,10 +106,12 @@ describe 'SDAM events' do
         (succeeded_awaited = events.select(&:awaited?)).should_not be_empty
         (succeeded_regular = events.reject(&:awaited?)).should_not be_empty
 
-        # Since we gracefully close the client, we expect each heartbeat
-        # to complete.
-        started_awaited.length.should == succeeded_awaited.length
-        started_regular.length.should == succeeded_regular.length
+        # There may be in-flight ismasters that don't complete, both
+        # regular and awaited.
+        started_awaited.length.should > 1
+        (succeeded_awaited.length-1..succeeded_awaited.length).should include(started_awaited.length)
+        started_regular.length.should > 1
+        (succeeded_regular.length-1..succeeded_regular.length).should include(started_regular.length)
       end
     end
   end

data/spec/lite_spec_helper.rb

@@ -104,7 +104,7 @@ RSpec.configure do |config|
     end
   end
 
-  if SpecConfig.instance.ci?
+  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.

data/spec/mongo/client_encryption_spec.rb

@@ -268,7 +268,7 @@ describe Mongo::ClientEncryption do
         it_behaves_like 'it creates a data key'
       end
 
-      context 'with invalid endpoint' do
+      context 'with https' do
         let(:options) do
           {
             master_key: {
@@ -279,20 +279,26 @@ describe Mongo::ClientEncryption do
           }
         end
 
-        let(:expected_message) do
-          # RUBY-2129: This error message could be more specific and inform the user
-          # that there is a problem with their KMS endpoint
-          if BSON::Environment.jruby?
-            /getservbyname.* failed/
-          else
-            /SocketError/
-          end
+        it_behaves_like 'it creates a data key'
+      end
+
+      context 'with invalid endpoint' do
+        let(:options) do
+          {
+            master_key: {
+              key: aws_arn,
+              region: aws_region,
+              endpoint: "invalid-nonsense-endpoint.com"
+            }
+          }
         end
 
         it 'raises an exception' do
+          # RUBY-2129: This error message could be more specific and inform the user
+          # that there is a problem with their KMS endpoint
           expect do
             data_key_id
-          end.to raise_error(Mongo::Error::KmsError, expected_message)
+          end.to raise_error(Mongo::Error::KmsError, /SocketError/)
         end
       end
 

data/spec/mongo/crypt/data_key_context_spec.rb

@@ -188,7 +188,7 @@ describe Mongo::Crypt::DataKeyContext do
       end
 
       context 'with valid endpoint' do
-        let(:options) { { master_key: { region: 'us-east-2', key: 'arn', endpoint: 'endpoint/to/kms' } } }
+        let(:options) { { master_key: { region: 'us-east-2', key: 'arn', endpoint: 'kms.us-east-2.amazonaws.com:443' } } }
 
         it 'does not raise an exception' do
           expect do

data/spec/mongo/database_spec.rb

@@ -2,6 +2,19 @@ require 'spec_helper'
 
 describe Mongo::Database do
 
+  shared_context 'more than 100 collections' do
+    let(:client) do
+      root_authorized_client.use('many-collections')
+    end
+
+    before do
+      120.times do |i|
+        client["coll-#{i}"].drop
+        client["coll-#{i}"].create
+      end
+    end
+  end
+
   describe '#==' do
 
     let(:database) do
@@ -228,6 +241,20 @@ describe Mongo::Database do
         end
       end
     end
+
+    context 'when there are more than 100 collections' do
+      include_context 'more than 100 collections'
+
+      let(:collection_names) do
+        client.database.collection_names.sort
+      end
+
+      it 'lists all collections' do
+        collection_names.length.should == 120
+        collection_names.should include('coll-0')
+        collection_names.should include('coll-119')
+      end
+    end
   end
 
   describe '#list_collections' do
@@ -391,6 +418,25 @@ describe Mongo::Database do
         end
       end
     end
+
+    context 'when there are more than 100 collections' do
+      include_context 'more than 100 collections'
+
+      let(:collections) do
+        client.database.list_collections
+      end
+
+      let(:collection_names) do
+        # 2.6 server prefixes collection names with database name
+        collections.map { |info| info['name'].sub(/^many-collections\./, '') }.sort
+      end
+
+      it 'lists all collections' do
+        collections.length.should == 120
+        collection_names.should include('coll-0')
+        collection_names.should include('coll-119')
+      end
+    end
   end
 
   describe '#collections' do
@@ -541,6 +587,24 @@ describe Mongo::Database do
         end
       end
     end
+
+    context 'when there are more than 100 collections' do
+      include_context 'more than 100 collections'
+
+      let(:collections) do
+        client.database.collections
+      end
+
+      let(:collection_names) do
+        collections.map(&:name).sort
+      end
+
+      it 'lists all collections' do
+        collections.length.should == 120
+        collection_names.should include('coll-0')
+        collection_names.should include('coll-119')
+      end
+    end
   end
 
   describe '#command' do

data/spec/mongo/server/app_metadata_shared.rb

@@ -10,7 +10,7 @@ shared_examples 'app metadata document' do
 
   it 'includes operating system information' do
     document[:client][:os][:type].should == 'linux'
-    if BSON::Environment.jruby?
+    if BSON::Environment.jruby? || RUBY_VERSION >= '3.0'
       document[:client][:os][:name].should == 'linux'
     else
       document[:client][:os][:name].should == 'linux-gnu'

data/spec/shared/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2020 MongoDB, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/spec/shared/lib/mrss/child_process_helper.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+autoload :ChildProcess, 'childprocess'
+autoload :Tempfile, 'tempfile'
+
+module Mrss
+  module ChildProcessHelper
+    class SpawnError < StandardError; end
+
+    module_function def call(cmd, env: nil, cwd: nil)
+      process = ChildProcess.new(*cmd)
+      process.io.inherit!
+      if cwd
+        process.cwd = cwd
+      end
+      if env
+        env.each do |k, v|
+          process.environment[k.to_s] = v
+        end
+      end
+      process.start
+      process.wait
+      process
+    end
+
+    module_function def check_call(cmd, env: nil, cwd: nil)
+      process = call(cmd, env: env, cwd: cwd)
+      unless process.exit_code == 0
+        raise SpawnError, "Failed to execute: #{cmd}"
+      end
+    end
+
+    module_function def get_output(cmd, env: nil, cwd: nil)
+      process = ChildProcess.new(*cmd)
+      process.io.inherit!
+      if cwd
+        process.cwd = cwd
+      end
+      if env
+        env.each do |k, v|
+          process.environment[k.to_s] = v
+        end
+      end
+
+      output = ''
+      r, w = IO.pipe
+
+      begin
+        process.io.stdout = w
+        process.start
+        w.close
+
+        thread = Thread.new do
+          begin
+            loop do
+              output << r.readpartial(16384)
+            end
+          rescue EOFError
+          end
+        end
+
+        process.wait
+        thread.join
+      ensure
+        r.close
+      end
+
+      [process, output]
+    end
+
+    module_function def check_output(*args)
+      process, output = get_output(*args)
+      unless process.exit_code == 0
+        raise SpawnError,"Failed to execute: #{args}"
+      end
+      output
+    end
+  end
+end

data/spec/shared/lib/mrss/constraints.rb

@@ -0,0 +1,303 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+module Mrss
+  module Constraints
+    def min_server_version(version)
+      unless version =~ /\A\d+\.\d+\z/
+        raise ArgumentError, "Version can only be major.minor: #{version}"
+      end
+
+      before(:all) do
+        if version > ClusterConfig.instance.server_version
+          skip "Server version #{version} or higher required, we have #{ClusterConfig.instance.server_version}"
+        end
+      end
+    end
+
+    def max_server_version(version)
+      unless version =~ /\A\d+\.\d+\z/
+        raise ArgumentError, "Version can only be major.minor: #{version}"
+      end
+
+      before(:all) do
+        if version < ClusterConfig.instance.short_server_version
+          skip "Server version #{version} or lower required, we have #{ClusterConfig.instance.server_version}"
+        end
+      end
+    end
+
+    def min_server_fcv(version)
+      unless version =~ /\A\d+\.\d+\z/
+        raise ArgumentError, "FCV can only be major.minor: #{version}"
+      end
+
+      before(:all) do
+        unless ClusterConfig.instance.fcv_ish >= version
+          skip "FCV #{version} or higher required, we have #{ClusterConfig.instance.fcv_ish} (server #{ClusterConfig.instance.server_version})"
+        end
+      end
+    end
+
+    def max_server_fcv(version)
+      unless version =~ /\A\d+\.\d+\z/
+        raise ArgumentError, "Version can only be major.minor: #{version}"
+      end
+
+      before(:all) do
+        if version < ClusterConfig.instance.fcv_ish
+          skip "FCV #{version} or lower required, we have #{ClusterConfig.instance.fcv_ish} (server #{ClusterConfig.instance.server_version})"
+        end
+      end
+    end
+
+    def require_topology(*topologies)
+      invalid_topologies = topologies - [:single, :replica_set, :sharded]
+
+      unless invalid_topologies.empty?
+        raise ArgumentError, "Invalid topologies requested: #{invalid_topologies.join(', ')}"
+      end
+
+      before(:all) do
+        unless topologies.include?(topology = ClusterConfig.instance.topology)
+          skip "Topology #{topologies.join(' or ')} required, we have #{topology}"
+        end
+      end
+    end
+
+    def max_example_run_time(timeout)
+      around do |example|
+        TimeoutInterrupt.timeout(timeout, TimeoutInterrupt::Error.new("Test execution terminated after #{timeout} seconds")) do
+          example.run
+        end
+      end
+    end
+
+    def require_transaction_support
+      before(:all) do
+        case ClusterConfig.instance.topology
+        when :single
+          skip 'Transactions tests require a replica set (4.0+) or a sharded cluster (4.2+)'
+        when :replica_set
+          unless ClusterConfig.instance.server_version >= '4.0'
+            skip 'Transactions tests in a replica set topology require server 4.0+'
+          end
+        when :sharded
+          unless ClusterConfig.instance.server_version >= '4.2'
+            skip 'Transactions tests in a sharded cluster topology require server 4.2+'
+          end
+        else
+          raise NotImplementedError
+        end
+      end
+    end
+
+    # Fail command fail point was added to mongod in 4.0 and to mongos in 4.2.
+    def require_fail_command
+      require_transaction_support
+    end
+
+    def require_tls
+      before(:all) do
+        unless SpecConfig.instance.ssl?
+          skip "SSL not enabled"
+        end
+      end
+    end
+
+    def require_no_tls
+      before(:all) do
+        if SpecConfig.instance.ssl?
+          skip "SSL enabled"
+        end
+      end
+    end
+
+    def require_no_retry_writes
+      before(:all) do
+        if SpecConfig.instance.retry_writes?
+          skip "Retry writes is enabled"
+        end
+      end
+    end
+
+    def require_compression
+      before(:all) do
+        if SpecConfig.instance.compressors.nil?
+          skip "Compression is not enabled"
+        end
+      end
+    end
+
+    def require_zlib_compression
+      before(:all) do
+        compressors = SpecConfig.instance.compressors
+        unless compressors && compressors.include?('zlib')
+          skip "Zlib compression is not enabled"
+        end
+      end
+    end
+
+    def require_snappy_compression
+      before(:all) do
+        compressors = SpecConfig.instance.compressors
+        unless compressors && compressors.include?('snappy')
+          skip "Snappy compression is not enabled"
+        end
+      end
+    end
+
+    def require_no_compression
+      before(:all) do
+        if SpecConfig.instance.compressors
+          skip "Compression is enabled"
+        end
+      end
+    end
+
+    def ruby_version_gte(version)
+      before(:all) do
+        if RUBY_VERSION < version
+          skip "Ruby version #{version} or higher required"
+        end
+      end
+    end
+
+    def ruby_version_lt(version)
+      before(:all) do
+        if RUBY_VERSION >= version
+          skip "Ruby version less than #{version} required"
+        end
+      end
+    end
+
+    def require_auth(*values)
+      before(:all) do
+        if values.any?
+          unless values.include?(ENV['AUTH'])
+            msg = values.map { |v| "AUTH=#{v}" }.join(' or ')
+            skip "This test requires #{msg}"
+          end
+        else
+          unless ENV['AUTH'] == 'auth' || SpecConfig.instance.user || ClusterConfig.instance.auth_enabled?
+            skip "Auth required"
+          end
+        end
+      end
+    end
+
+    def require_no_auth
+      before(:all) do
+        if (ENV['AUTH'] && ENV['AUTH'] != 'noauth') || SpecConfig.instance.user || ClusterConfig.instance.auth_enabled?
+          skip "Auth not allowed"
+        end
+      end
+    end
+
+    def require_x509_auth
+      before(:all) do
+        unless SpecConfig.instance.x509_auth?
+          skip "X.509 auth required"
+        end
+      end
+    end
+
+    def require_no_external_user
+      before(:all) do
+        if SpecConfig.instance.external_user?
+          skip "External user configurations are not compatible with this test"
+        end
+      end
+    end
+
+    # Can the driver specify a write concern that won't be overridden?
+    # (mongos 4.0+ overrides the write concern)
+    def require_set_write_concern
+      before(:all) do
+        if ClusterConfig.instance.topology == :sharded && ClusterConfig.instance.short_server_version >= '4.0'
+          skip "mongos 4.0+ overrides write concern"
+        end
+      end
+    end
+
+    def require_multi_shard
+      before(:all) do
+        if ClusterConfig.instance.topology == :sharded && SpecConfig.instance.addresses.length == 1
+          skip 'Test requires a minimum of two shards if run in sharded topology'
+        end
+      end
+    end
+
+    def require_no_multi_shard
+      before(:all) do
+        if ClusterConfig.instance.topology == :sharded && SpecConfig.instance.addresses.length > 1
+          skip 'Test requires a single shard if run in sharded topology'
+        end
+      end
+    end
+
+    def require_wired_tiger
+      before(:all) do
+        if ClusterConfig.instance.storage_engine != :wired_tiger
+          skip 'Test requires WiredTiger storage engine'
+        end
+      end
+    end
+
+    def require_wired_tiger_on_36
+      before(:all) do
+        if ClusterConfig.instance.short_server_version >= '3.6'
+          if ClusterConfig.instance.storage_engine != :wired_tiger
+            skip 'Test requires WiredTiger storage engine on 3.6+ servers'
+          end
+        end
+      end
+    end
+
+    def require_mmapv1
+      before(:all) do
+        if ClusterConfig.instance.storage_engine != :mmapv1
+          skip 'Test requires MMAPv1 storage engine'
+        end
+      end
+    end
+
+    def require_enterprise
+      before(:all) do
+        unless ClusterConfig.instance.enterprise?
+          skip 'Test requires enterprise build of MongoDB'
+        end
+      end
+    end
+
+    # Integration tests for SRV polling require internet connectivity to
+    # look up SRV records and a sharded cluster configured on default port on
+    # localhost (localhost:27017, localhost:27018).
+    def require_default_port_deployment
+      # Because the DNS records at test1.test.build.10gen.cc point to
+      # localhost:27017 & localhost:27018, the test suite must have been
+      # configured to use these addresses
+      before(:all) do
+        have_default_port = SpecConfig.instance.addresses.any? do |address|
+          %w(127.0.0.1 127.0.0.1:27017 localhost localhost:27017).include?(address)
+        end
+        unless have_default_port
+          skip 'This test requires the test suite to be configured for localhost:27017'
+        end
+      end
+    end
+
+    # Some tests perform assertions on what the driver is logging.
+    # Some test configurations, for example OCSP with unknown response,
+    # produce warnings due to optional checks failing.
+    # This constraint skips tests that issue logging assertions on configurations
+    # that may produce non-test-originated log entries.
+    def require_warning_clean
+      before(:all) do
+        if ENV['OCSP_STATUS'] == 'unknown'
+          skip 'Unknown OCSP status is not global warning-clean'
+        end
+      end
+    end
+  end
+end