mongo 2.12.4 → 2.13.2

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/client_spec.rb

@@ -527,6 +527,17 @@ describe Mongo::Client do
     end
   end
 
+  shared_context 'ensure test db exists' do
+    before(:all) do
+      # Ensure the database we are querying exists.
+      # When the entire test suite is run, it will generally have been
+      # created by a previous test, but if this test is run on a fresh
+      # deployment the database won't exist.
+      client = ClientRegistry.instance.global_client('authorized')
+      client['any-collection-name'].insert_one(any: :value)
+    end
+  end
+
   describe '#database_names' do
 
     it 'returns a list of database names' do
@@ -538,6 +549,8 @@ describe Mongo::Client do
     context 'when filter criteria is present' do
       min_server_fcv '3.6'
 
+      include_context 'ensure test db exists'
+
       let(:result) do
         root_authorized_client.database_names(filter)
       end
@@ -565,6 +578,8 @@ describe Mongo::Client do
     context 'when filter criteria is present' do
       min_server_fcv '3.6'
 
+      include_context 'ensure test db exists'
+
       let(:result) do
         root_authorized_client.list_databases(filter)
       end
@@ -580,29 +595,66 @@ describe Mongo::Client do
     end
 
     context 'when name_only is true' do
+      min_server_fcv '3.6'
+
+      let(:command) do
+        Utils.get_command_event(root_authorized_client, 'listDatabases') do |client|
+          client.list_databases({}, true)
+        end.command
+      end
+
+      it 'sends the command with the nameOnly flag set to true' do
+        expect(command[:nameOnly]).to be(true)
+      end
+    end
+
+    context 'when authorized_databases is provided' do
+      min_server_fcv '4.0'
 
       let(:client_options) do
         root_authorized_client.options.merge(heartbeat_frequency: 100, monitoring: true)
       end
 
+      let(:subscriber) { EventSubscriber.new }
+
       let(:client) do
         ClientRegistry.instance.new_local_client(
           SpecConfig.instance.addresses, client_options
         ).tap do |cl|
-          cl.subscribe(Mongo::Monitoring::COMMAND, EventSubscriber.clear_events!)
+          cl.subscribe(Mongo::Monitoring::COMMAND, subscriber)
         end
       end
 
       let(:command) do
-        EventSubscriber.started_events.find { |c| c.command_name == 'listDatabases' }.command
+        subscriber.started_events.find { |c| c.command_name == 'listDatabases' }.command
+      end
+
+      let(:authDb) do
+        { authorized_databases: true }
+      end
+
+      let(:noAuthDb) do
+        { authorized_databases: false }
       end
 
       before do
-        client.list_databases({}, true)
+        client.list_databases({}, true, authDb)
+        client.list_databases({}, true, noAuthDb)
       end
 
-      it 'sends the command with the nameOnly flag set to true' do
-        expect(command[:nameOnly]).to be(true)
+      let(:events) do
+        subscriber.command_started_events('listDatabases')
+      end
+
+      it 'sends the command with the authorizedDatabases flag set to true' do
+        expect(events.length).to eq(2)
+        command = events.first.command
+        expect(command[:authorizedDatabases]).to be(true)
+      end
+
+      it 'sends the command with the authorizedDatabases flag set to nil' do
+        command = events.last.command
+        expect(command[:authorizedDatabases]).to be_nil
       end
     end
   end
@@ -632,6 +684,8 @@ describe Mongo::Client do
     context 'when filter criteria is present' do
       min_server_fcv '3.6'
 
+      include_context 'ensure test db exists'
+
       let(:result) do
         client.list_mongo_databases(filter)
       end

data/spec/mongo/cluster/topology/replica_set_spec.rb

@@ -150,7 +150,13 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
     end
 
     let(:cluster) do
-      double('cluster', servers: servers, single?: false, sharded?: false, unknown?: false)
+      double('cluster',
+        servers: servers,
+        single?: false,
+        replica_set?: true,
+        sharded?: false,
+        unknown?: false,
+      )
     end
 
     context 'when the read preference is primary' do
@@ -162,7 +168,11 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
       context 'when a primary exists' do
 
         let(:servers) do
-          [ double('server', primary?: true) ]
+          [ double('server',
+            primary?: true,
+            # for runs with linting enabled
+            average_round_trip_time: 42,
+          ) ]
         end
 
         it 'returns true' do
@@ -191,7 +201,12 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
       context 'when a primary exists' do
 
         let(:servers) do
-          [ double('server', primary?: true, secondary?: false) ]
+          [ double('server',
+            primary?: true,
+            secondary?: false,
+            # for runs with linting enabled
+            average_round_trip_time: 42,
+          ) ]
         end
 
         it 'returns true' do
@@ -260,7 +275,12 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
       context 'when a secondary does not exist' do
 
         let(:servers) do
-          [ double('server', secondary?: false, primary?: true) ]
+          [ double('server',
+            secondary?: false,
+            primary?: true,
+            # for runs with linting enabled
+            average_round_trip_time: 42,
+          ) ]
         end
 
         it 'returns true' do
@@ -289,7 +309,12 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
       context 'when a primary exists' do
 
         let(:servers) do
-          [ double('server', primary?: true, secondary?: false) ]
+          [ double('server',
+            primary?: true,
+            secondary?: false,
+            # for runs with linting enabled
+            average_round_trip_time: 42,
+          ) ]
         end
 
         it 'returns true' do
@@ -319,15 +344,28 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
     context 'when a primary server exists' do
 
       let(:primary) do
-        double('server', :primary? => true)
+        double('server',
+          :primary? => true,
+          # for runs with linting enabled
+          average_round_trip_time: 42,
+        )
       end
 
       let(:secondary) do
-        double('server', :primary? => false)
+        double('server',
+          :primary? => false,
+          # for runs with linting enabled
+          average_round_trip_time: 42,
+        )
       end
 
       let(:cluster) do
-        double('cluster', servers: [ primary, secondary ])
+        double('cluster',
+          single?: false,
+          replica_set?: true,
+          sharded?: false,
+          servers: [ primary, secondary ],
+        )
       end
 
       it 'returns true' do
@@ -342,7 +380,12 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
       end
 
       let(:cluster) do
-        double('cluster', servers: [ server ])
+        double('cluster',
+          single?: false,
+          replica_set?: true,
+          sharded?: false,
+          servers: [ server ],
+        )
       end
 
       it 'returns false' do

data/spec/mongo/cluster/topology/single_spec.rb

@@ -87,8 +87,10 @@ describe Mongo::Cluster::Topology::Single do
       topology.servers([ mongos, standalone, standalone_two, replica_set ])
     end
 
-    it 'returns only the first standalone server' do
-      expect(servers).to eq([ standalone ])
+    it 'returns all data-bearing non-unknown servers' do
+      # mongos and replica_set do not have ok: 1 in their descriptions,
+      # and are considered unknown.
+      expect(servers).to eq([ standalone, standalone_two ])
     end
   end
 

data/spec/mongo/cluster_spec.rb

@@ -14,8 +14,9 @@ describe Mongo::Cluster do
   end
 
   let(:cluster_without_io) do
-    described_class.new(SpecConfig.instance.addresses, monitoring,
-      SpecConfig.instance.test_options.merge(monitoring_io: false))
+    register_cluster(
+      described_class.new(SpecConfig.instance.addresses, monitoring,
+        SpecConfig.instance.test_options.merge(monitoring_io: false)))
   end
 
   let(:cluster) { cluster_without_io }
@@ -342,13 +343,13 @@ describe Mongo::Cluster do
       end
 
       let(:monitoring) { Mongo::Monitoring.new }
-      let(:subscriber) { Mongo::SDAMMonitoring::TestSubscriber.new }
+      let(:subscriber) { EventSubscriber.new }
 
       it 'publishes server closed event once' do
         monitoring.subscribe(Mongo::Monitoring::SERVER_CLOSED, subscriber)
         expect(cluster.disconnect!).to be(true)
         expect(subscriber.first_event('server_closed_event')).not_to be nil
-        subscriber.events.clear
+        subscriber.succeeded_events.clear
         expect(cluster.disconnect!).to be(true)
         expect(subscriber.first_event('server_closed_event')).to be nil
       end
@@ -593,7 +594,23 @@ describe Mongo::Cluster do
     end
   end
 
-  describe '#sessions_supported?' do
+  describe '#validate_session_support!' do
+    shared_examples 'supports sessions' do
+      it 'supports sessions' do
+        lambda do
+          cluster.validate_session_support!
+        end.should_not raise_error
+      end
+    end
+
+    shared_examples 'does not support sessions' do
+      it 'does not support sessions' do
+        lambda do
+          cluster.validate_session_support!
+        end.should raise_error(Mongo::Error::SessionsNotSupported)
+      end
+    end
+
     context 'when client has not contacted any servers' do
 
       let(:cluster) do
@@ -602,9 +619,7 @@ describe Mongo::Cluster do
             monitoring_io: false, server_selection_timeout: 0.183))
       end
 
-      it 'is false' do
-        expect(cluster.send(:sessions_supported?)).to be false
-      end
+      it_behaves_like 'does not support sessions'
     end
 
     context 'when client has contacted servers and then disconnected' do
@@ -627,22 +642,20 @@ describe Mongo::Cluster do
         cluster.servers_list.map(&:unknown!)
       end
 
-      it 'is true' do
-        expect(cluster.send(:sessions_supported?)).to be true
-      end
+      it_behaves_like 'supports sessions'
     end
 
     context 'in server < 3.6' do
       max_server_version '3.4'
 
+      let(:cluster) { client.cluster }
+
       context 'in single topology' do
         require_topology :single
 
         let(:client) { ClientRegistry.instance.global_client('authorized') }
 
-        it 'is false' do
-          expect(client.cluster.send(:sessions_supported?)).to be false
-        end
+        it_behaves_like 'does not support sessions'
       end
 
       context 'in single topology with replica set name set' do
@@ -654,9 +667,7 @@ describe Mongo::Cluster do
               connect: :direct, replica_set: ClusterConfig.instance.replica_set_name))
         end
 
-        it 'is false' do
-          expect(client.cluster.send(:sessions_supported?)).to be false
-        end
+        it_behaves_like 'does not support sessions'
       end
 
       context 'in replica set topology' do
@@ -664,9 +675,7 @@ describe Mongo::Cluster do
 
         let(:client) { ClientRegistry.instance.global_client('authorized') }
 
-        it 'is false' do
-          expect(client.cluster.send(:sessions_supported?)).to be false
-        end
+        it_behaves_like 'does not support sessions'
       end
 
       context 'in sharded topology' do
@@ -674,15 +683,15 @@ describe Mongo::Cluster do
 
         let(:client) { ClientRegistry.instance.global_client('authorized') }
 
-        it 'is false' do
-          expect(client.cluster.send(:sessions_supported?)).to be false
-        end
+        it_behaves_like 'does not support sessions'
       end
     end
 
     context 'in server 3.6+' do
       min_server_fcv '3.6'
 
+      let(:cluster) { client.cluster }
+
       context 'in single topology' do
         require_topology :single
 
@@ -690,10 +699,8 @@ describe Mongo::Cluster do
 
         # Contrary to the session spec, 3.6 and 4.0 standalone servers
         # report a logical session timeout and thus are considered to
-        # support sessions
-        it 'is true' do
-          expect(client.cluster.send(:sessions_supported?)).to be true
-        end
+        # support sessions.
+        it_behaves_like 'supports sessions'
       end
 
       context 'in single topology with replica set name set' do
@@ -705,9 +712,7 @@ describe Mongo::Cluster do
               connect: :direct, replica_set: ClusterConfig.instance.replica_set_name))
         end
 
-        it 'is true' do
-          expect(client.cluster.send(:sessions_supported?)).to be true
-        end
+        it_behaves_like 'supports sessions'
       end
 
       context 'in replica set topology' do
@@ -715,9 +720,7 @@ describe Mongo::Cluster do
 
         let(:client) { ClientRegistry.instance.global_client('authorized') }
 
-        it 'is true' do
-          expect(client.cluster.send(:sessions_supported?)).to be true
-        end
+        it_behaves_like 'supports sessions'
       end
 
       context 'in sharded topology' do
@@ -725,9 +728,7 @@ describe Mongo::Cluster do
 
         let(:client) { ClientRegistry.instance.global_client('authorized') }
 
-        it 'is true' do
-          expect(client.cluster.send(:sessions_supported?)).to be true
-        end
+        it_behaves_like 'supports sessions'
       end
     end
   end