mongo 2.12.4 → 2.13.2

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/cursor/builder/get_more_command_spec.rb

@@ -10,8 +10,13 @@ describe Mongo::Cursor::Builder::GetMoreCommand do
       end
     end
 
+    let(:description) do
+      Mongo::Server::Description.new(double('description address'),
+        'minWireVersion' => 0, 'maxWireVersion' => 2)
+    end
+
     let(:result) do
-      Mongo::Operation::Result.new(reply)
+      Mongo::Operation::Result.new(reply, description)
     end
 
     let(:cursor) do

data/spec/mongo/cursor/builder/op_get_more_spec.rb

@@ -10,8 +10,13 @@ describe Mongo::Cursor::Builder::OpGetMore do
       end
     end
 
+    let(:description) do
+      Mongo::Server::Description.new(double('description address'),
+        'minWireVersion' => 0, 'maxWireVersion' => 2)
+    end
+
     let(:result) do
-      Mongo::Operation::Result.new(reply)
+      Mongo::Operation::Result.new(reply, description)
     end
 
     let(:view) do

data/spec/mongo/cursor/builder/op_kill_cursors_spec.rb

@@ -8,8 +8,13 @@ describe Mongo::Cursor::Builder::OpKillCursors do
     end
   end
 
+  let(:description) do
+    Mongo::Server::Description.new(double('description address'),
+      'minWireVersion' => 0, 'maxWireVersion' => 2)
+  end
+
   let(:result) do
-    Mongo::Operation::Result.new(reply)
+    Mongo::Operation::Result.new(reply, description)
   end
 
   let(:view) do

data/spec/mongo/cursor_spec.rb

@@ -434,6 +434,14 @@ describe Mongo::Cursor do
   context 'when an implicit session is used' do
     min_server_fcv '3.6'
 
+    let(:subscriber) { EventSubscriber.new }
+
+    let(:subscribed_client) do
+      authorized_client.tap do |client|
+        client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+      end
+    end
+
     let(:collection) do
       subscribed_client[TEST_COLL]
     end
@@ -456,7 +464,7 @@ describe Mongo::Cursor do
     end
 
     let(:find_events) do
-      EventSubscriber.started_events.select { |e| e.command_name == "find" }
+      subscriber.started_events.select { |e| e.command_name == "find" }
     end
 
     context 'when all results are retrieved in the first response' 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
@@ -92,8 +105,8 @@ describe Mongo::Database do
     end
 
     before do
-      database[:users].drop
-      database[:users].create
+      database['users'].drop
+      database['users'].create
     end
 
     let(:actual) do
@@ -153,7 +166,94 @@ describe Mongo::Database do
         expect(collection_names).to include('0_dalmatians')
         expect(collection_names).to include('1_dalmatians')
       end
+    end
 
+    context 'when provided a filter' do
+      min_server_fcv '3.0'
+
+      before do
+        database['users2'].drop
+        database['users2'].create
+      end
+
+      let(:result) do
+        database.collection_names(filter: { name: 'users2' })
+      end
+
+      it 'returns users2 collection' do
+        expect(result.length).to eq(1)
+        expect(result.first).to eq('users2')
+      end
+    end
+
+    context 'when provided authorized_collections or not' do
+
+      context 'on server versions >= 4.0' do
+        min_server_fcv '4.0'
+
+        let(:database) do
+          described_class.new(client, SpecConfig.instance.test_db)
+        end
+
+        let(:subscriber) { EventSubscriber.new }
+
+        let(:client) do
+          authorized_client.tap do |client|
+            client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+          end
+        end
+
+        context 'when authorized_collections is provided' do
+          let(:options) do
+            { authorized_collections: true }
+          end
+
+          let!(:result) do
+            database.collections(options)
+          end
+
+          let(:events) do
+            subscriber.command_started_events('listCollections')
+          end
+
+          it 'passes authorized_collections to the server' do
+            expect(events.length).to eq(1)
+            command = events.first.command
+            expect(command['authorizedCollections']).to eq(true)
+          end
+        end
+
+        context 'when no options are provided' do
+          let!(:result) do
+            database.collection_names
+          end
+
+          let(:events) do
+            subscriber.command_started_events('listCollections')
+          end
+
+          it 'authorized_collections not passed to server' do
+            expect(events.length).to eq(1)
+            command = events.first.command
+            expect(command['nameOnly']).to eq(true)
+            expect(command['authorizedCollections']).to be_nil
+          end
+        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
 
@@ -170,8 +270,8 @@ describe Mongo::Database do
     end
 
     before do
-      database[:acol].drop
-      database[:acol].create
+      database['acol'].drop
+      database['acol'].create
     end
 
     context 'server 3.0+' do
@@ -183,8 +283,8 @@ describe Mongo::Database do
 
       context 'with more than one collection' do
         before do
-          database[:anothercol].drop
-          database[:anothercol].create
+          database['anothercol'].drop
+          database['anothercol'].create
 
           expect(database.collections.length).to be > 1
         end
@@ -239,6 +339,104 @@ describe Mongo::Database do
         end
       end
     end
+
+    context 'when provided authorized_collections or name_only options or not' do
+
+      context 'on server versions >= 4.0' do
+        min_server_fcv '4.0'
+
+        let(:database) do
+          described_class.new(client, SpecConfig.instance.test_db)
+        end
+
+        let(:subscriber) { EventSubscriber.new }
+
+        let(:client) do
+          authorized_client.tap do |client|
+            client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+          end
+        end
+
+        context 'when both are provided' do
+          let(:options) do
+            { name_only: true, authorized_collections: true }
+          end
+
+          let!(:result) do
+            database.list_collections(options)
+          end
+
+          let(:events) do
+            subscriber.command_started_events('listCollections')
+          end
+
+          it 'passes original options to the server' do
+            expect(events.length).to eq(1)
+            command = events.first.command
+            expect(command['nameOnly']).to eq(true)
+            expect(command['authorizedCollections']).to eq(true)
+          end
+        end
+
+        context 'when name_only is provided' do
+          let(:options) do
+            { name_only: false }
+          end
+
+          let!(:result) do
+            database.list_collections(options)
+          end
+
+          let(:events) do
+            subscriber.command_started_events('listCollections')
+          end
+
+          it 'no options passed to server because false' do
+            expect(events.length).to eq(1)
+            command = events.first.command
+            expect(command['nameOnly']).to be_nil
+            expect(command['authorizedCollections']).to be_nil
+          end
+        end
+
+        context 'when no options provided' do
+
+          let!(:result) do
+            database.list_collections
+          end
+
+          let(:events) do
+            subscriber.command_started_events('listCollections')
+          end
+
+          it 'no options passed to server because none provided' do
+            expect(events.length).to eq(1)
+            command = events.first.command
+            expect(command['nameOnly']).to be_nil
+            expect(command['authorizedCollections']).to be_nil
+          end
+        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
@@ -254,8 +452,8 @@ describe Mongo::Database do
       end
 
       before do
-        database[:users].drop
-        database[:users].create
+        database['users'].drop
+        database['users'].create
       end
 
       it 'returns collection objects for each name' do
@@ -304,6 +502,109 @@ describe Mongo::Database do
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end
+
+    context 'when provided a filter' do
+      min_server_fcv '3.0'
+
+      let(:database) do
+        described_class.new(authorized_client, SpecConfig.instance.test_db)
+      end
+
+      let(:collection2) do
+        Mongo::Collection.new(database, 'users2')
+      end
+
+      before do
+        database['users1'].drop
+        database['users1'].create
+
+        database['users2'].drop
+        database['users2'].create
+      end
+
+      let(:result) do
+        database.collections(filter: { name: 'users2' })
+      end
+
+      it 'returns users2 collection' do
+        expect(result.length).to eq(1)
+        expect(database.collections).to include(collection2)
+      end
+    end
+
+    context 'when provided authorized_collections or not' do
+
+      context 'on server versions >= 4.0' do
+        min_server_fcv '4.0'
+
+        let(:database) do
+          described_class.new(client, SpecConfig.instance.test_db)
+        end
+
+        let(:subscriber) { EventSubscriber.new }
+
+        let(:client) do
+          authorized_client.tap do |client|
+            client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+          end
+        end
+
+        context 'when authorized_collections are provided' do
+          let(:options) do
+            { authorized_collections: false }
+          end
+
+          let!(:result) do
+            database.collections(options)
+          end
+
+          let(:events) do
+            subscriber.command_started_events('listCollections')
+          end
+
+          it 'authorized_collections not passed to server because false' do
+            expect(events.length).to eq(1)
+            command = events.first.command
+            expect(command['nameOnly']).to eq(true)
+            expect(command['authorizedCollections']).to be_nil
+          end
+        end
+
+        context 'when no options are provided' do
+          let!(:result) do
+            database.collections
+          end
+
+          let(:events) do
+            subscriber.command_started_events('listCollections')
+          end
+
+          it 'authorized_collections not passed to server because not provided' do
+            expect(events.length).to eq(1)
+            command = events.first.command
+            expect(command['authorizedCollections']).to be_nil
+          end
+        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
@@ -335,8 +636,12 @@ describe Mongo::Database do
         client.start_session
       end
 
+      let(:subscriber) { EventSubscriber.new }
+
       let(:client) do
-        subscribed_client
+        authorized_client.tap do |client|
+          client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+        end
       end
 
       it_behaves_like 'an operation using a session'
@@ -344,7 +649,7 @@ describe Mongo::Database do
 
 
       let(:full_command) do
-        EventSubscriber.started_events.find { |cmd| cmd.command_name == 'ismaster' }.command
+        subscriber.started_events.find { |cmd| cmd.command_name == 'ismaster' }.command
       end
 
       it 'does not add a afterClusterTime field' do