mongo 2.12.0.rc0 → 2.12.1

data/spec/integration/crud_spec.rb

@@ -7,6 +7,95 @@ describe 'CRUD operations' do
     collection.delete_many
   end
 
+  describe 'insert' do
+    context 'inserting a BSON::Int64' do
+      before do
+        collection.insert_one(int64: BSON::Int64.new(42))
+      end
+
+      it 'is stored as the correct type' do
+        # 18 is the number that represents the Int64 type for the $type
+        # operator; string aliases in the $type operator are only supported on
+        # server versions 3.2 and newer.
+        result = collection.find(int64: { '$type' => 18 }).first
+        expect(result).not_to be_nil
+        expect(result['int64']).to eq(42)
+      end
+    end
+
+    context 'inserting a BSON::Int32' do
+      before do
+        collection.insert_one(int32: BSON::Int32.new(42))
+      end
+
+      it 'is stored as the correct type' do
+        # 16 is the number that represents the Int32 type for the $type
+        # operator; string aliases in the $type operator are only supported on
+        # server versions 3.2 and newer.
+        result = collection.find(int32: { '$type' => 16 }).first
+        expect(result).not_to be_nil
+        expect(result['int32']).to eq(42)
+      end
+    end
+
+    context 'with automatic encryption' do
+      require_libmongocrypt
+      require_enterprise
+      min_server_fcv '4.2'
+
+      include_context 'define shared FLE helpers'
+      include_context 'with local kms_providers'
+
+      let(:encrypted_collection) do
+        new_local_client(
+          SpecConfig.instance.addresses,
+          SpecConfig.instance.test_options.merge(
+            auto_encryption_options: {
+              kms_providers: kms_providers,
+              key_vault_namespace: key_vault_namespace,
+              schema_map: { 'auto_encryption.users' => schema_map },
+              # Spawn mongocryptd on non-default port for sharded cluster tests
+              extra_options: extra_options,
+            },
+            database: 'auto_encryption'
+          )
+        )['users']
+      end
+
+      let(:collection) { authorized_client.use('auto_encryption')['users'] }
+
+      context 'inserting a BSON::Int64' do
+        before do
+          encrypted_collection.insert_one(ssn: '123-456-7890', int64: BSON::Int64.new(42))
+        end
+
+        it 'is stored as the correct type' do
+          # 18 is the number that represents the Int64 type for the $type
+          # operator; string aliases in the $type operator are only supported on
+          # server versions 3.2 and newer.
+          result = collection.find(int64: { '$type' => 18 }).first
+          expect(result).not_to be_nil
+          expect(result['int64']).to eq(42)
+        end
+      end
+
+      context 'inserting a BSON::Int32' do
+        before do
+          encrypted_collection.insert_one(ssn: '123-456-7890', int32: BSON::Int32.new(42))
+        end
+
+        it 'is stored as the correct type' do
+          # 16 is the number that represents the Int32 type for the $type
+          # operator; string aliases in the $type operator are only supported on
+          # server versions 3.2 and newer.
+          result = collection.find(int32: { '$type' => 16 }).first
+          expect(result).not_to be_nil
+          expect(result['int32']).to eq(42)
+        end
+      end
+    end
+  end
+
   describe 'upsert' do
     context 'with default write concern' do
       it 'upserts' do

data/spec/integration/read_preference_spec.rb

@@ -482,4 +482,30 @@ describe 'Read preference' do
       end
     end
   end
+
+  context 'secondary read with direct connection' do
+    require_topology :replica_set
+
+    let(:address_str) do
+      Mongo::ServerSelector.get(mode: :secondary).
+        select_server(authorized_client.cluster).address.seed
+    end
+
+    let(:secondary_client) do
+      new_local_client([address_str],
+        SpecConfig.instance.all_test_options.merge(connect: :direct))
+    end
+
+    it 'succeeds without read preference' do
+      secondary_client['foo'].find.to_a
+    end
+
+    it 'succeeds with read preference: secondary' do
+      secondary_client['foo', {read: {mode: :secondary}}].find.to_a
+    end
+
+    it 'succeeds with read preference: primary' do
+      secondary_client['foo', {read: {mode: :primary}}].find.to_a
+    end
+  end
 end

data/spec/integration/srv_monitoring_spec.rb

@@ -53,7 +53,7 @@ describe 'SRV Monitoring' do
 
         expect(client.cluster.topology).to be_a(Mongo::Cluster::Topology::Sharded)
 
-        expect(client.cluster.instance_variable_get('@srv_monitor')).to be_a(Mongo::Cluster::SrvMonitor)
+        expect(client.cluster.instance_variable_get('@srv_monitor')).to be_a(Mongo::Srv::Monitor)
 
         # Close the client in the test rather than allowing our post-test cleanup
         # to take care of it, since the client references test doubles.
@@ -101,7 +101,7 @@ describe 'SRV Monitoring' do
 
     before do
       # Expedite the polling process
-      allow_any_instance_of(Mongo::Cluster::SrvMonitor).to receive(:scan_interval).and_return(1)
+      allow_any_instance_of(Mongo::Srv::Monitor).to receive(:scan_interval).and_return(1)
     end
 
     context 'sharded cluster' do

data/spec/kerberos/kerberos_spec.rb

@@ -0,0 +1,87 @@
+require 'lite_spec_helper'
+
+describe 'kerberos authentication' do
+  require_mongo_kerberos
+
+  before(:all) do
+    unless %w(1 yes true).include?(ENV['MONGO_RUBY_DRIVER_KERBEROS_INTEGRATION']&.downcase)
+      skip "Set MONGO_RUBY_DRIVER_KERBEROS_INTEGRATION=1 in environment to run the Kerberos integration tests"
+    end
+  end
+
+  def require_env_value(key)
+    ENV[key].tap do |value|
+      if value.nil? || value.empty?
+        raise "Value for key #{key} is not present in environment as required"
+      end
+    end
+  end
+
+  let(:user) do
+   "#{require_env_value('SASL_USER')}%40#{require_env_value('SASL_HOST').upcase}"
+  end
+
+  let(:host) do
+    "#{require_env_value('SASL_HOST')}"
+  end
+
+  let(:kerberos_db) do
+    "#{require_env_value('KERBEROS_DB')}"
+  end
+
+  let(:auth_source) do
+    "#{require_env_value('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, server_selection_timeout: 6.31)
+  end
+
+  let(:doc) do
+    client.database[:test].find.first
+  end
+
+  shared_examples_for 'correctly authenticates' do
+    it 'correctly authenticates' do
+      expect(doc['kerberos']).to eq(true)
+      expect(doc['authenticated']).to eq('yeah')
+    end
+  end
+
+  it_behaves_like 'correctly authenticates'
+
+  context 'when host is lowercased' do
+    let(:host) do
+      "#{require_env_value('SASL_HOST').downcase}"
+    end
+
+    it_behaves_like 'correctly authenticates'
+  end
+
+  context 'when host is uppercased' do
+    let(:host) do
+      "#{require_env_value('SASL_HOST').upcase}"
+    end
+
+    it_behaves_like 'correctly authenticates'
+  end
+
+  context 'when canonicalize_host_name is true' do
+    let(:host) do
+      "#{require_env_value('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/lite_spec_helper.rb

@@ -23,16 +23,12 @@ AUTH_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/auth/*.yml").sort
 CLIENT_SIDE_ENCRYPTION_TESTS = Dir.glob("#{CURRENT_PATH}/spec_tests/data/client_side_encryption/*.yml").sort
 
 unless ENV['CI']
+  # Load debuggers before loading the driver code, so that breakpoints
+  # can be placed in the driver code on file/class level.
   begin
     require 'byebug'
   rescue LoadError
-    # jruby - try pry
-    begin
-      require 'pry'
-    # jruby likes to raise random error classes, in this case
-    # NameError in addition to LoadError
-    rescue Exception
-    end
+    require 'ruby-debug'
   end
 end
 
@@ -40,8 +36,8 @@ require 'mongo'
 require 'pp'
 
 autoload :Benchmark, 'benchmark'
-autoload :Timecop, 'timecop'
 autoload :IceNine, 'ice_nine'
+autoload :Timecop, 'timecop'
 
 if BSON::Environment.jruby?
   require 'concurrent-ruby'

data/spec/mongo/bulk_write/result_spec.rb

@@ -84,19 +84,23 @@ describe Mongo::BulkWrite::Result do
 
     context 'with top level error' do
       let(:results_document) do
-        {'writeErrors' => {
-          'ok' => 0,
-          'errmsg' => 'not master',
-          'code' => 10107,
-          'codeName' => 'NotMaster',
-        }}
+        {
+          'writeErrors' => [
+            {
+              'ok' => 0,
+              'errmsg' => 'not master',
+              'code' => 10107,
+              'codeName' => 'NotMaster',
+            }
+          ]
+        }
       end
 
       it 'raises BulkWriteError' do
         expect do
           subject.validate!
         # BulkWriteErrors don't have any messages on them
-        end.to raise_error(Mongo::Error::BulkWriteError, nil)
+        end.to raise_error(Mongo::Error::BulkWriteError, /not master/)
       end
     end
 

data/spec/mongo/client_encryption_spec.rb

@@ -1,6 +1,4 @@
-require 'mongo'
-require 'base64'
-require 'lite_spec_helper'
+require 'spec_helper'
 
 describe Mongo::ClientEncryption do
   require_libmongocrypt
@@ -8,7 +6,8 @@ describe Mongo::ClientEncryption do
 
   let(:client) do
     ClientRegistry.instance.new_local_client(
-      [SpecConfig.instance.addresses.first]
+      SpecConfig.instance.addresses,
+      SpecConfig.instance.test_options
     )
   end
 
@@ -345,9 +344,7 @@ describe Mongo::ClientEncryption do
     let(:encrypted_value) { encrypted_ssn }
 
     before do
-      key_vault_collection = client.use(key_vault_db)[key_vault_coll]
       key_vault_collection.drop
-
       key_vault_collection.insert_one(data_key)
     end
 

data/spec/mongo/crypt/auto_encrypter_spec.rb

@@ -9,7 +9,13 @@ describe Mongo::Crypt::AutoEncrypter do
   include_context 'define shared FLE helpers'
 
   let(:auto_encrypter) do
-    described_class.new(auto_encryption_options.merge(client: authorized_client.use(:auto_encryption)))
+    described_class.new(
+      auto_encryption_options.merge(
+        client: authorized_client.use(:auto_encryption),
+        # Spawn mongocryptd on non-default port for sharded cluster tests
+        extra_options: extra_options
+      )
+    )
   end
 
   let(:client) { authorized_client }
@@ -81,7 +87,6 @@ describe Mongo::Crypt::AutoEncrypter do
   end
 
   before do
-    key_vault_collection = client.use(key_vault_db)[key_vault_coll]
     key_vault_collection.drop
     key_vault_collection.insert_one(data_key)
   end
@@ -97,7 +102,7 @@ describe Mongo::Crypt::AutoEncrypter do
       {
         kms_providers: kms_providers,
         key_vault_namespace: key_vault_namespace,
-        schema_map: { "#{db_name}.#{collection_name}": schema_map }
+        schema_map: { "#{db_name}.#{collection_name}": schema_map },
       }
     end
 

data/spec/mongo/crypt/handle_spec.rb

@@ -134,7 +134,7 @@ describe Mongo::Crypt::Handle do
       it 'raises an exception' do
         expect do
           handle
-        end.to raise_error(ArgumentError, /The specified aws kms_providers option is invalid/)
+        end.to raise_error(ArgumentError, /The aws access_key_id option must be a String with at least one character; currently have nil/)
       end
     end
 
@@ -151,7 +151,24 @@ describe Mongo::Crypt::Handle do
       it 'raises an exception' do
         expect do
           handle
-        end.to raise_error(ArgumentError, /The specified aws kms_providers option is invalid/)
+        end.to raise_error(ArgumentError, /The aws access_key_id option must be a String with at least one character; currently have 5/)
+      end
+    end
+
+    context 'with empty string AWS access_key_id' do
+      let(:kms_providers) {
+        {
+          aws: {
+            access_key_id: '',
+            secret_access_key: SpecConfig.instance.fle_aws_secret
+          }
+        }
+      }
+
+      it 'raises an exception' do
+        expect do
+          handle
+        end.to raise_error(ArgumentError, /The aws access_key_id option must be a String with at least one character; it is currently an empty string/)
       end
     end
 
@@ -169,7 +186,7 @@ describe Mongo::Crypt::Handle do
       it 'raises an exception' do
         expect do
           handle
-        end.to raise_error(ArgumentError, /The specified aws kms_providers option is invalid/)
+        end.to raise_error(ArgumentError, /The aws secret_access_key option must be a String with at least one character; currently have nil/)
       end
     end
 
@@ -186,7 +203,24 @@ describe Mongo::Crypt::Handle do
       it 'raises an exception' do
         expect do
           handle
-        end.to raise_error(ArgumentError, /The specified aws kms_providers option is invalid/)
+        end.to raise_error(ArgumentError, /The aws secret_access_key option must be a String with at least one character; currently have 5/)
+      end
+    end
+
+    context 'with empty string AWS secret_access_key' do
+      let(:kms_providers) {
+        {
+          aws: {
+            access_key_id: SpecConfig.instance.fle_aws_key,
+            secret_access_key: ''
+          }
+        }
+      }
+
+      it 'raises an exception' do
+        expect do
+          handle
+        end.to raise_error(ArgumentError, /The aws secret_access_key option must be a String with at least one character; it is currently an empty string/)
       end
     end
 

data/spec/mongo/error/bulk_write_error_spec.rb

@@ -0,0 +1,49 @@
+require 'lite_spec_helper'
+
+describe Mongo::Error::BulkWriteError do
+  let(:result) do
+    {
+      'writeErrors' => [
+        { 'code' => 1, 'errmsg' => 'message1' },
+        { 'code' => 2, 'errmsg' => 'message2' },
+      ]
+    }
+  end
+
+  let(:error) { described_class.new(result) }
+
+  before do
+    error.add_note('note1')
+    error.add_note('note2')
+  end
+
+  describe '#result' do
+    it 'returns the result' do
+      expect(error.result).to eq(result)
+    end
+  end
+
+  describe '#labels' do
+    it 'returns an empty array' do
+      expect(error.labels).to eq([])
+    end
+  end
+
+  describe '#message' do
+    it 'is correct' do
+      expect(error.message).to eq("message1 (1), message2 (2) (note1, note2)")
+    end
+  end
+
+  describe '#to_s' do
+    it 'is correct' do
+      expect(error.to_s).to eq("message1 (1), message2 (2) (note1, note2)")
+    end
+  end
+
+  describe '#inspect' do
+    it 'is correct' do
+      expect(error.inspect).to eq("#<Mongo::Error::BulkWriteError: message1 (1), message2 (2) (note1, note2)>")
+    end
+  end
+end