mongo 2.6.4 → 2.7.0.rc0

data/lib/mongo/uri/srv_protocol.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018 MongoDB, Inc.
+# Copyright (C) 2017-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.

data/lib/mongo/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB, Inc.
+# Copyright (C) 2014-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.6.4'.freeze
+  VERSION = '2.7.0.rc0'.freeze
 end

data/lib/mongo/write_concern.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018 MongoDB, Inc.
+# Copyright (C) 2015-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'mongo/write_concern/normalizable'
+require 'mongo/write_concern/base'
 require 'mongo/write_concern/acknowledged'
 require 'mongo/write_concern/unacknowledged'
 
 module Mongo
 
-  # Base module for all write concern specific behaviour.
+  # Base module for all write concern specific behavior.
   #
   # @since 2.0.0
   module WriteConcern
@@ -54,9 +54,9 @@ module Mongo
     # @since 2.0.0
     DEFAULT = { }.freeze
 
-    # Get a write concern mode for the provided options.
+    # Create a write concern object for the provided options.
     #
-    # @example Get a write concern mode.
+    # @example Get a write concern.
     #   Mongo::WriteConcern.get(:w => 1)
     #
     # @param [ Hash ] options The options to instantiate with.
@@ -72,7 +72,7 @@ module Mongo
     #
     # @return [ Unacknowledged, Acknowledged ] The appropriate concern.
     #
-    # @raise [ Error::InvalidWriteConcern ] If the write concern is invalid.
+    # @raise [ Error::InvalidWriteConcern ] If the options are invalid.
     #
     # @since 2.0.0
     def get(options)

data/lib/mongo/write_concern/acknowledged.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB, Inc.
+# Copyright (C) 2014-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -19,9 +19,7 @@ module Mongo
     # appropriate options on each write operation.
     #
     # @since 2.0.0
-    class Acknowledged
-      include Normalizable
-
+    class Acknowledged < Base
       # Get the get last error command for the concern.
       #
       # @example Get the gle command.

data/lib/mongo/write_concern/{normalizable.rb → base.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB, Inc.
+# Copyright (C) 2014-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -15,11 +15,10 @@
 module Mongo
   module WriteConcern
 
-    # Defines default behavior for write concerns and provides a factory
-    # interface to get a proper object from options.
+    # Defines common behavior for write concerns.
     #
-    # @since 2.0.0
-    module Normalizable
+    # @since 2.7.0
+    class Base
 
       # @return [ Hash ] The write concern options.
       attr_reader :options
@@ -29,7 +28,7 @@ module Mongo
       # @api private
       #
       # @example Instantiate a new write concern mode.
-      #   Mongo::WriteConcern.new(:w => 1)
+      #   Mongo::WriteConcern::Acknowledged.new(:w => 1)
       #
       # @param [ Hash ] options The options to instantiate with.
       #

data/lib/mongo/write_concern/unacknowledged.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB, Inc.
+# Copyright (C) 2014-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -19,9 +19,7 @@ module Mongo
     # network and connection exceptions.
     #
     # @since 2.0.0
-    class Unacknowledged
-      include Normalizable
-
+    class Unacknowledged < Base
       # The noop constant for the gle.
       #
       # @since 2.0.0

data/mongo.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |s|
   s.require_paths     = ['lib']
   s.bindir            = 'bin'
 
-  s.add_dependency 'bson', '>=4.3.0', '<5.0.0'
+  s.add_dependency 'bson', '>=4.4.2', '<5.0.0'
 end

data/spec/enterprise_auth/kerberos_spec.rb

@@ -0,0 +1,57 @@
+require 'mongo'
+
+describe 'kerberos authentication' do
+  let(:user) do
+   "#{ENV['SASL_USER']}%40#{ENV['SASL_HOST'].upcase}"
+  end
+
+  let(:host) do
+    "#{ENV['SASL_HOST']}"
+  end
+
+  let(:kerberos_db) do
+    "#{ENV['KERBEROS_DB']}"
+  end
+
+  let(:auth_source) do
+    "#{ENV['SASL_DB']}"
+  end
+
+  let(:uri) do
+    uri = "mongodb://#{user}@#{host}/#{kerberos_db}?authMechanism=GSSAPI&authSource=#{auth_source}"
+  end
+
+  let(:client) do
+    Mongo::Client.new(uri)
+  end
+
+  before do
+    skip 'ENTERPRISE_AUTH_TESTS env var not specified' unless ENV['ENTERPRISE_AUTH_TESTS']
+  end
+
+  let(:doc) do
+    require 'mongo_kerberos'
+
+    client.database[:test].find.first
+  end
+
+  it 'correctly authenticates' do
+    expect(doc['kerberos']).to eq(true)
+    expect(doc['authenticated']).to eq('yeah')
+  end
+
+  context 'when canonicalize_host_name is true' do
+    let(:host) do
+      "#{ENV['IP_ADDR']}"
+    end
+
+    let(:uri) do
+      uri = "mongodb://#{user}@#{host}/#{kerberos_db}?authMechanism=GSSAPI&authSource=#{auth_source}&authMechanismProperties=CANONICALIZE_HOST_NAME:true"
+    end
+
+    it 'correctly authenticates when using the IP' do
+      expect(doc['kerberos']).to eq(true)
+      expect(doc['authenticated']).to eq('yeah')
+    end
+  end
+end

data/spec/integration/bulk_insert_spec.rb

@@ -3,7 +3,9 @@ require 'spec_helper'
 describe 'Bulk insert' do
   include PrimarySocket
 
-  FAIL_POINT_BASE_COMMAND = { 'configureFailPoint' => "failCommand" }
+  let(:fail_point_base_command) do
+    { 'configureFailPoint' => "failCommand" }
+  end
 
   let(:collection_name) { 'bulk_insert_spec' }
   let(:collection) { authorized_client[collection_name] }
@@ -57,7 +59,7 @@ describe 'Bulk insert' do
       require_topology :single, :replica_set
 
       it 'is an empty array' do
-        collection.client.use(:admin).command(FAIL_POINT_BASE_COMMAND.merge(
+        collection.client.use(:admin).command(fail_point_base_command.merge(
           :mode => {:times => 1},
           :data => {:failCommands => ['insert'], errorCode: 100}))
         begin

data/spec/integration/change_stream_examples_spec.rb

@@ -16,7 +16,6 @@ describe 'change streams examples in Ruby', if: test_change_streams? do
 
   after do
     client.close
-    inventory.drop
   end
 
   context 'example 1 - basic watching'do
@@ -48,7 +47,7 @@ describe 'change streams examples in Ruby', if: test_change_streams? do
       expect(change['fullDocument']['_id']).not_to be_nil
       expect(change['fullDocument']['x']).to eq(1)
       expect(change['ns']).not_to be_nil
-      expect(change['ns']['db']).to eq(TEST_DB)
+      expect(change['ns']['db']).to eq(SpecConfig.instance.test_db)
       expect(change['ns']['coll']).to eq(inventory.name)
       expect(change['documentKey']).not_to be_nil
       expect(change['documentKey']['_id']).to eq(change['fullDocument']['_id'])
@@ -87,7 +86,7 @@ describe 'change streams examples in Ruby', if: test_change_streams? do
       expect(change['fullDocument']['_id']).to eq(1)
       expect(change['fullDocument']['x']).to eq(5)
       expect(change['ns']).not_to be_nil
-      expect(change['ns']['db']).to eq(TEST_DB)
+      expect(change['ns']['db']).to eq(SpecConfig.instance.test_db)
       expect(change['ns']['coll']).to eq(inventory.name)
       expect(change['documentKey']).not_to be_nil
       expect(change['documentKey']['_id']).to eq(1)
@@ -114,7 +113,7 @@ describe 'change streams examples in Ruby', if: test_change_streams? do
       expect(next_change['fullDocument']['_id']).not_to be_nil
       expect(next_change['fullDocument']['x']).to eq(1)
       expect(next_change['ns']).not_to be_nil
-      expect(next_change['ns']['db']).to eq(TEST_DB)
+      expect(next_change['ns']['db']).to eq(SpecConfig.instance.test_db)
       expect(next_change['ns']['coll']).to eq(inventory.name)
       expect(next_change['documentKey']).not_to be_nil
       expect(next_change['documentKey']['_id']).to eq(next_change['fullDocument']['_id'])
@@ -130,7 +129,7 @@ describe 'change streams examples in Ruby', if: test_change_streams? do
       expect(next_next_change['fullDocument']['_id']).not_to be_nil
       expect(next_next_change['fullDocument']['x']).to eq(2)
       expect(next_next_change['ns']).not_to be_nil
-      expect(next_next_change['ns']['db']).to eq(TEST_DB)
+      expect(next_next_change['ns']['db']).to eq(SpecConfig.instance.test_db)
       expect(next_next_change['ns']['coll']).to eq(inventory.name)
       expect(next_next_change['documentKey']).not_to be_nil
       expect(next_next_change['documentKey']['_id']).to eq(next_next_change['fullDocument']['_id'])
@@ -181,7 +180,7 @@ describe 'change streams examples in Ruby', if: test_change_streams? do
       expect(change['fullDocument']['_id']).not_to be_nil
       expect(change['fullDocument']['username']).to eq('alice')
       expect(change['ns']).not_to be_nil
-      expect(change['ns']['db']).to eq(TEST_DB)
+      expect(change['ns']['db']).to eq(SpecConfig.instance.test_db)
       expect(change['ns']['coll']).to eq(inventory.name)
       expect(change['documentKey']).not_to be_nil
       expect(change['documentKey']['_id']).to eq(change['fullDocument']['_id'])

data/spec/integration/change_stream_spec.rb

@@ -1,16 +1,18 @@
 require 'spec_helper'
 
-describe 'Change stream integration' do
+describe 'Change stream integration', retry: 4 do
   only_mri
   max_example_run_time 7
 
-  FAIL_POINT_BASE_COMMAND = { 'configureFailPoint' => "failCommand" }
+  let(:fail_point_base_command) do
+    { 'configureFailPoint' => "failCommand" }
+  end
 
   # There is value in not clearing fail points between tests because
   # their triggering will distinguish fail points not being set vs
   # them not being triggered
   def clear_fail_point(collection)
-    collection.client.use(:admin).command(FAIL_POINT_BASE_COMMAND.merge(mode: "off"))
+    collection.client.use(:admin).command(fail_point_base_command.merge(mode: "off"))
   end
 
   class << self
@@ -68,7 +70,7 @@ describe 'Change stream integration' do
       clear_fail_point_before
 
       before do
-        authorized_collection.client.use(:admin).command(FAIL_POINT_BASE_COMMAND.merge(
+        authorized_collection.client.use(:admin).command(fail_point_base_command.merge(
           :mode => {:times => 1},
           :data => {:failCommands => ['aggregate'], errorCode: 100}))
       end
@@ -86,7 +88,7 @@ describe 'Change stream integration' do
 
       context 'error on first getMore' do
         before do
-          authorized_collection.client.use(:admin).command(FAIL_POINT_BASE_COMMAND.merge(
+          authorized_collection.client.use(:admin).command(fail_point_base_command.merge(
             :mode => {:times => 1},
             :data => {:failCommands => ['getMore'], errorCode: 100}))
         end
@@ -105,7 +107,7 @@ describe 'Change stream integration' do
           change_stream.to_enum.next
           authorized_collection.insert_one(:a => 1)
 
-          authorized_collection.client.use(:admin).command(FAIL_POINT_BASE_COMMAND.merge(
+          authorized_collection.client.use(:admin).command(fail_point_base_command.merge(
             :mode => {:times => 1},
             :data => {:failCommands => ['getMore'], errorCode: 100}))
         end
@@ -120,7 +122,7 @@ describe 'Change stream integration' do
 
       context 'error of first getMores' do
         before do
-          authorized_collection.client.use(:admin).command(FAIL_POINT_BASE_COMMAND.merge(
+          authorized_collection.client.use(:admin).command(fail_point_base_command.merge(
             :mode => {:times => 2},
             :data => {:failCommands => ['getMore'], errorCode: 100}))
         end
@@ -141,7 +143,7 @@ describe 'Change stream integration' do
           change_stream.to_enum.next
           authorized_collection.insert_one(:a => 1)
 
-          authorized_collection.client.use(:admin).command(FAIL_POINT_BASE_COMMAND.merge(
+          authorized_collection.client.use(:admin).command(fail_point_base_command.merge(
             :mode => {:times => 2},
             :data => {:failCommands => ['getMore'], errorCode: 100}))
         end
@@ -159,12 +161,13 @@ describe 'Change stream integration' do
       it 'next raises error' do
         change_stream
 
+        sleep 0.5
         authorized_collection.insert_one(:a => 1)
         sleep 0.5
 
         enum = change_stream.to_enum
 
-        authorized_collection.client.use(:admin).command(FAIL_POINT_BASE_COMMAND.merge(
+        authorized_collection.client.use(:admin).command(fail_point_base_command.merge(
           :mode => {:times => 2},
           :data => {:failCommands => ['getMore', 'aggregate'], errorCode: 101}))
 
@@ -217,7 +220,7 @@ describe 'Change stream integration' do
 
       context 'error on first getMore' do
         before do
-          authorized_collection.client.use(:admin).command(FAIL_POINT_BASE_COMMAND.merge(
+          authorized_collection.client.use(:admin).command(fail_point_base_command.merge(
             :mode => {:times => 1},
             :data => {:failCommands => ['getMore'], errorCode: 100}))
         end
@@ -232,7 +235,7 @@ describe 'Change stream integration' do
           change_stream.to_enum.next
           authorized_collection.insert_one(:a => 1)
 
-          authorized_collection.client.use(:admin).command(FAIL_POINT_BASE_COMMAND.merge(
+          authorized_collection.client.use(:admin).command(fail_point_base_command.merge(
             :mode => {:times => 1},
             :data => {:failCommands => ['getMore'], errorCode: 100}))
         end
@@ -246,7 +249,7 @@ describe 'Change stream integration' do
       clear_fail_point_before
 
       before do
-        authorized_collection.client.use(:admin).command(FAIL_POINT_BASE_COMMAND.merge(
+        authorized_collection.client.use(:admin).command(fail_point_base_command.merge(
           :mode => {:times => 2},
           :data => {:failCommands => ['getMore'], errorCode: 100}))
       end
@@ -270,7 +273,7 @@ describe 'Change stream integration' do
 
           enum = change_stream.to_enum
 
-          authorized_collection.client.use(:admin).command(FAIL_POINT_BASE_COMMAND.merge(
+          authorized_collection.client.use(:admin).command(fail_point_base_command.merge(
             :mode => {:times => 3},
             :data => {:failCommands => ['getMore', 'aggregate'], errorCode: 101}))
 
@@ -293,7 +296,7 @@ describe 'Change stream integration' do
 
           enum = change_stream.to_enum
 
-          authorized_collection.client.use(:admin).command(FAIL_POINT_BASE_COMMAND.merge(
+          authorized_collection.client.use(:admin).command(fail_point_base_command.merge(
             :mode => {:times => 3},
             :data => {:failCommands => ['getMore', 'aggregate'], errorCode: 101}))
 

data/spec/integration/client_connectivity_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+# This test is for checking connectivity of the test client to the
+# test cluster. In other words, it is a test that the test suite is
+# configured correctly.
+describe 'Client connectivity' do
+  shared_examples_for 'is correctly configured' do
+    it 'is configured with the correct database' do
+      expect(client.options[:database]).to eq(SpecConfig.instance.test_db)
+    end
+
+    it 'has correct database in the cluster' do
+      expect(client.cluster.options[:database]).to eq(SpecConfig.instance.test_db)
+    end
+  end
+
+  context 'no auth' do
+    let(:client) { ClientRegistry.instance.global_client('basic') }
+
+    it_behaves_like 'is correctly configured'
+
+    it 'connects and is usable' do
+      resp = client.database.command(ismaster: 1)
+      expect(resp).to be_a(Mongo::Operation::Result)
+    end
+  end
+
+  context 'with auth' do
+    let(:client) { ClientRegistry.instance.global_client('authorized') }
+
+    it_behaves_like 'is correctly configured'
+
+    it 'connects and is usable' do
+      client['connectivity_spec'].insert_one(foo: 1)
+      expect(client['connectivity_spec'].find(foo: 1).first['foo']).to eq(1)
+    end
+  end
+end

data/spec/integration/client_construction_spec.rb

@@ -0,0 +1,94 @@
+require 'spec_helper'
+
+# Create a client with all possible configurations (forcing/discovering each
+# topology type) and ensure the resulting client is usable.
+describe 'Client construction' do
+  let(:base_options) do
+    SpecConfig.instance.test_options.merge(
+      database: SpecConfig.instance.test_db,
+      user: SpecConfig.instance.test_user.name,
+      password: SpecConfig.instance.test_user.password)
+  end
+
+  context 'in single topology' do
+    require_topology :single
+
+    it 'discovers standalone' do
+      options = base_options.dup
+      options.delete(:connect)
+      client = ClientRegistry.instance.new_local_client([SpecConfig.instance.addresses.first],
+        options)
+      client['client_construction'].insert_one(test: 1)
+      expect(client.cluster.topology).to be_a(Mongo::Cluster::Topology::Single)
+      expect(client.options[:connect]).to be nil
+    end
+
+    it 'connects directly' do
+      client = ClientRegistry.instance.new_local_client([SpecConfig.instance.addresses.first],
+        base_options.merge(connect: :direct))
+      client['client_construction'].insert_one(test: 1)
+      expect(client.cluster.topology).to be_a(Mongo::Cluster::Topology::Single)
+      expect(client.options[:connect]).to eq :direct
+    end
+  end
+
+  context 'in replica set topology' do
+    require_topology :replica_set
+
+    it 'discovers replica set' do
+      options = base_options.dup
+      options.delete(:connect)
+      options.delete(:replica_set)
+      client = ClientRegistry.instance.new_local_client([SpecConfig.instance.addresses.first],
+        options)
+      client['client_construction'].insert_one(test: 1)
+      expect(client.cluster.topology).to be_a(Mongo::Cluster::Topology::ReplicaSetWithPrimary)
+      expect(client.options[:connect]).to be nil
+      expect(client.options[:replica_set]).to be nil
+    end
+
+    it 'forces replica set' do
+      replica_set_name = ClusterConfig.instance.replica_set_name
+      expect(replica_set_name).not_to be nil
+      client = ClientRegistry.instance.new_local_client([SpecConfig.instance.addresses.first],
+        base_options.merge(connect: :replica_set,
+          replica_set: replica_set_name))
+      client['client_construction'].insert_one(test: 1)
+      expect(client.cluster.topology).to be_a(Mongo::Cluster::Topology::ReplicaSetWithPrimary)
+      expect(client.options[:connect]).to be :replica_set
+      expect(client.options[:replica_set]).to eq(replica_set_name)
+    end
+
+    it 'connects directly' do
+      primary_address = ClusterConfig.instance.primary_address
+      client = ClientRegistry.instance.new_local_client([primary_address],
+        base_options.merge(connect: :direct))
+      client['client_construction'].insert_one(test: 1)
+      expect(client.cluster.topology).to be_a(Mongo::Cluster::Topology::Single)
+      expect(client.options[:connect]).to eq :direct
+    end
+  end
+
+  context 'in sharded topology' do
+    require_topology :sharded
+
+    it 'connects to sharded cluster' do
+      options = base_options.dup
+      options.delete(:connect)
+      client = ClientRegistry.instance.new_local_client([SpecConfig.instance.addresses.first],
+        base_options.merge(connect: :sharded))
+      client['client_construction'].insert_one(test: 1)
+      expect(client.cluster.topology).to be_a(Mongo::Cluster::Topology::Sharded)
+      expect(client.options[:connect]).to be :sharded
+    end
+
+    it 'connects directly' do
+      primary_address = ClusterConfig.instance.primary_address
+      client = ClientRegistry.instance.new_local_client([SpecConfig.instance.addresses.first],
+        base_options.merge(connect: :direct))
+      client['client_construction'].insert_one(test: 1)
+      expect(client.cluster.topology).to be_a(Mongo::Cluster::Topology::Single)
+      expect(client.options[:connect]).to eq :direct
+    end
+  end
+end