mongo 2.18.0.beta1 → 2.18.0

data/spec/mongo/collection_spec.rb

@@ -800,5 +800,37 @@ describe Mongo::Collection do
         end
       end
     end
+
+    context 'when the change stream is empty' do
+      require_wired_tiger
+      min_server_fcv '3.6'
+      require_topology :replica_set
+
+      context 'when setting the max_await_time_ms' do
+
+        let(:change_stream) do
+          authorized_collection.watch([], max_await_time_ms: 3000)
+        end
+
+        let(:enum) { change_stream.to_enum }
+
+        it 'sets the option correctly' do
+          expect(change_stream.instance_variable_get(:@cursor)).to receive(:get_more_operation).once.and_wrap_original do |m, *args, &block|
+            m.call(*args).tap do |op|
+              expect(op.max_time_ms).to eq(3000)
+            end
+          end
+          enum.next
+        end
+
+        it "waits the appropriate amount of time" do
+          start_time = Time.now
+          enum.try_next
+          end_time = Time.now
+
+          expect(end_time-start_time).to be >= 3
+        end
+      end
+    end
   end
 end

data/spec/mongo/crypt/auto_encrypter_spec.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'tempfile'
 
 describe Mongo::Crypt::AutoEncrypter do
   require_libmongocrypt
@@ -98,6 +99,62 @@ describe Mongo::Crypt::AutoEncrypter do
     auto_encrypter.close
   end
 
+  describe '#initialize' do
+    include_context 'with local kms_providers'
+
+    let(:auto_encryption_options) do
+      {
+        kms_providers: local_kms_providers,
+        key_vault_namespace: key_vault_namespace,
+        schema_map: { "#{db_name}.#{collection_name}": schema_map },
+      }
+    end
+
+    let(:auto_encrypter) do
+      described_class.new(
+        auto_encryption_options.merge(
+          client: client,
+          # Spawn mongocryptd on non-default port for sharded cluster tests
+          extra_options: extra_options
+        )
+      )
+    end
+
+    context 'when client has an unlimited pool' do
+      let(:client) do
+        new_local_client_nmio(
+          SpecConfig.instance.addresses,
+          SpecConfig.instance.test_options.merge(
+            max_pool_size: 0,
+            database: 'auto_encryption'
+          ),
+        )
+      end
+
+      it 'reuses the client as key_vault_client and metadata_client' do
+        expect(auto_encrypter.key_vault_client).to eq(client)
+        expect(auto_encrypter.metadata_client).to eq(client)
+      end
+    end
+
+    context 'when client has a limited pool' do
+      let(:client) do
+        new_local_client_nmio(
+          SpecConfig.instance.addresses,
+          SpecConfig.instance.test_options.merge(
+            max_pool_size: 20,
+            database: 'auto_encryption'
+          ),
+        )
+      end
+
+      it 'creates new client for key_vault_client and metadata_client' do
+        expect(auto_encrypter.key_vault_client).not_to eq(client)
+        expect(auto_encrypter.metadata_client).not_to eq(client)
+      end
+    end
+  end
+
   context 'with schema map in auto encryption commands' do
     include_context 'without jsonSchema validator'
 
@@ -136,6 +193,59 @@ describe Mongo::Crypt::AutoEncrypter do
     end
   end
 
+  context 'with schema map file in auto encryption commands' do
+    include_context 'without jsonSchema validator'
+
+    let(:schema_map_file) do
+      file = Tempfile.new('schema_map.json')
+      file.write(JSON.dump(
+        {
+          "#{db_name}.#{collection_name}" => schema_map
+        }
+      ))
+      file.flush
+      file
+    end
+
+    after do
+      schema_map_file.close
+    end
+
+    let(:auto_encryption_options) do
+      {
+        kms_providers: kms_providers,
+        kms_tls_options: kms_tls_options,
+        key_vault_namespace: key_vault_namespace,
+        schema_map_path: schema_map_file.path
+      }
+    end
+
+    context 'with AWS KMS providers' do
+      include_context 'with AWS kms_providers'
+      it_behaves_like 'a functioning auto encrypter'
+    end
+
+    context 'with Azure KMS providers' do
+      include_context 'with Azure kms_providers'
+      it_behaves_like 'a functioning auto encrypter'
+    end
+
+    context 'with GCP KMS providers' do
+      include_context 'with GCP kms_providers'
+      it_behaves_like 'a functioning auto encrypter'
+    end
+
+    context 'with KMIP KMS providers' do
+      include_context 'with KMIP kms_providers'
+      it_behaves_like 'a functioning auto encrypter'
+    end
+
+    context 'with local KMS providers' do
+      include_context 'with local kms_providers'
+      it_behaves_like 'a functioning auto encrypter'
+    end
+  end
+
   context 'with schema map collection validator' do
     include_context 'with jsonSchema validator'
 

data/spec/mongo/crypt/binding/context_spec.rb

@@ -255,44 +255,12 @@ describe 'Mongo::Crypt::Binding' do
       end
     end
 
-    describe '#mongocrypt_ctx_setopt_index_type' do
-      let(:result) do
-        Mongo::Crypt::Binding.mongocrypt_ctx_setopt_index_type(
-          context,
-          index_type
-        )
-      end
-
-      before do
-        Mongo::Crypt::Binding.mongocrypt_init(mongocrypt)
-      end
-
-      context 'with equality index type' do
-        let(:index_type) do
-          :equality
-        end
-
-        it 'returns true' do
-          expect(result).to be true
-        end
-      end
-
-      context 'with none index type' do
-        let(:index_type) do
-          :none
-        end
-
-        it 'returns true' do
-          expect(result).to be true
-        end
-      end
-    end
-
     describe '#mongocrypt_ctx_setopt_query_type' do
       let(:result) do
         Mongo::Crypt::Binding.mongocrypt_ctx_setopt_query_type(
           context,
-          query_type
+          query_type,
+          -1
         )
       end
 
@@ -302,7 +270,7 @@ describe 'Mongo::Crypt::Binding' do
 
       context 'with equality query type' do
         let(:query_type) do
-          :equality
+          "equality"
         end
 
         it 'returns true' do

data/spec/mongo/crypt/data_key_context_spec.rb

@@ -23,7 +23,7 @@ describe Mongo::Crypt::DataKeyContext do
 
   let(:key_alt_names) { [] }
 
-  let(:context) { described_class.new(mongocrypt, io, key_document, key_alt_names) }
+  let(:context) { described_class.new(mongocrypt, io, key_document, key_alt_names, nil) }
 
   describe '#initialize' do
     shared_examples 'it properly sets key_alt_names' do

data/spec/mongo/crypt/explicit_encryption_context_spec.rb

@@ -137,7 +137,7 @@ describe Mongo::Crypt::ExplicitEncryptionContext do
               mongocrypt,
               io,
               value,
-              options.merge(query_type: :equality)
+              options.merge(query_type: "equality")
             )
           end.to raise_error(ArgumentError, /query_type is allowed only for "Indexed" algorithm/)
         end
@@ -169,7 +169,12 @@ describe Mongo::Crypt::ExplicitEncryptionContext do
 
         it 'initializes context' do
           expect do
-            context
+            described_class.new(
+              mongocrypt,
+              io,
+              value,
+              options.merge(contention_factor: 0)
+            )
           end.not_to raise_error
         end
 
@@ -180,7 +185,7 @@ describe Mongo::Crypt::ExplicitEncryptionContext do
                 mongocrypt,
                 io,
                 value,
-                options.merge(query_type: :equality)
+                options.merge(query_type: "equality", contention_factor: 0)
               )
             end.not_to raise_error
           end

data/spec/mongo/crypt/handle_spec.rb

@@ -12,8 +12,22 @@ describe Mongo::Crypt::Handle do
   describe '#initialize' do
     let(:credentials) { Mongo::Crypt::KMS::Credentials.new(kms_providers) }
     let(:kms_tls_options) { {} }
-    let(:handle) { described_class.new(credentials, kms_tls_options, schema_map: schema_map) }
-    let(:schema_map) { nil }
+    let(:handle) do
+      described_class.new(
+        credentials,
+        kms_tls_options,
+        schema_map: schema_map,
+        schema_map_path: schema_map_path,
+      )
+    end
+
+    let(:schema_map) do
+      nil
+    end
+
+    let(:schema_map_path) do
+      nil
+    end
 
     shared_examples 'a functioning Mongo::Crypt::Handle' do
       context 'with valid schema map' do
@@ -22,11 +36,33 @@ describe Mongo::Crypt::Handle do
         end
       end
 
+      context 'with valid schema map in a file' do
+        let(:schema_map_path) do
+          schema_map_file_path
+        end
+
+        context 'without schema_map set' do
+          let(:schema_map) do
+            nil
+          end
+
+          it 'does not raise an exception' do
+            expect { handle }.not_to raise_error
+          end
+        end
+
+        context 'with schema_map set' do
+          it 'raises an exception' do
+            expect { handle }.to raise_error(ArgumentError, /Cannot set both schema_map and schema_map_path options/)
+          end
+        end
+      end
+
       context 'with invalid schema map' do
         let(:schema_map) { '' }
 
         it 'raises an exception' do
-          expect { handle }.to raise_error(ArgumentError, /schema_map must be a Hash or nil/)
+          expect { handle }.to raise_error(ArgumentError, /invalid schema_map; schema_map must be a Hash or nil/)
         end
       end
 

data/spec/mongo/crypt/kms/credentials_spec.rb

@@ -13,17 +13,6 @@ describe Mongo::Crypt::KMS::Credentials do
       Mongo::Crypt::KMS::AWS::Credentials.new(kms_provider)
     end
 
-    context 'with empty AWS kms_provider' do
-      let(:kms_provider) do
-        {}
-      end
-
-      it 'raises an exception' do
-        expect do
-          params
-        end.to raise_error(ArgumentError, /The specified KMS provider options are invalid: {}. AWS KMS provider options must be in the format: { access_key_id: 'YOUR-ACCESS-KEY-ID', secret_access_key: 'SECRET-ACCESS-KEY' }/)
-      end
-    end
 
     %i(access_key_id secret_access_key).each do |key|
       context "with nil AWS #{key}" do
@@ -96,18 +85,6 @@ describe Mongo::Crypt::KMS::Credentials do
       Mongo::Crypt::KMS::Azure::Credentials.new(kms_provider)
     end
 
-    context 'with empty Azure kms_provider' do
-      let(:kms_provider) do
-        {}
-      end
-
-      it 'raises an exception' do
-        expect do
-          params
-        end.to raise_error(ArgumentError, /The specified KMS provider options are invalid: {}. Azure KMS provider options must be in the format: { tenant_id: 'TENANT-ID', client_id: 'TENANT_ID', client_secret: 'CLIENT_SECRET' }/)
-      end
-    end
-
     %i(tenant_id client_id client_secret).each do |param|
 
       context "with nil azure #{param}" do
@@ -219,18 +196,6 @@ describe Mongo::Crypt::KMS::Credentials do
       Mongo::Crypt::KMS::GCP::Credentials.new(kms_provider)
     end
 
-    context 'with empty GCP kms_provider' do
-      let(:kms_provider) do
-        {}
-      end
-
-      it 'raises an exception' do
-        expect do
-          params
-        end.to raise_error(ArgumentError, /The specified KMS provider options are invalid: {}. GCP KMS provider options must be in the format: { email: 'EMAIL', private_key: 'PRIVATE-KEY' }/)
-      end
-    end
-
     %i(email private_key).each do |key|
       context "with nil GCP #{key}" do
         let(:kms_provider) do
@@ -331,18 +296,6 @@ describe Mongo::Crypt::KMS::Credentials do
       Mongo::Crypt::KMS::KMIP::Credentials.new(kms_provider)
     end
 
-    context 'with empty KMIP kms_provider' do
-      let(:kms_provider) do
-        {}
-      end
-
-      it 'raises an exception' do
-        expect do
-          params
-        end.to raise_error(ArgumentError, /The specified KMS provider options are invalid: {}. KMIP KMS provider options must be in the format: { endpoint: 'ENDPOINT' }/)
-      end
-    end
-
     context "with nil KMIP endpoint" do
       let(:kms_provider) do
         {

data/spec/mongo/index/view_spec.rb

@@ -909,6 +909,62 @@ describe Mongo::Index::View do
       end
     end
 
+    context 'when providing an invalid wildcard projection expression' do
+      min_server_fcv '4.2'
+
+      it 'raises an exception' do
+        expect {
+          view.create_one({ '$**' => 1 }, wildcard_projection: 5)
+        }.to raise_error(Mongo::Error::OperationFailure, /Error in specification.*wildcardProjection|wildcardProjection.*must be a non-empty object/)
+      end
+    end
+
+    context 'when providing a wildcard projection to an invalid base index' do
+      min_server_fcv '4.2'
+
+      it 'raises an exception' do
+        expect {
+          view.create_one({ 'x' => 1 }, wildcard_projection: { rating: 1 })
+        }.to raise_error(Mongo::Error::OperationFailure, /Error in specification.*wildcardProjection|wildcardProjection.*is only allowed/)
+      end
+    end
+
+    context 'when providing a valid wildcard projection' do
+      min_server_fcv '4.2'
+
+      let!(:result) do
+        view.create_one({ '$**' => 1 }, wildcard_projection: { 'rating' => 1 })
+      end
+
+      let(:indexes) do
+        authorized_collection.indexes.get('$**_1')
+      end
+
+      it 'returns ok' do
+        expect(result).to be_successful
+      end
+
+      it 'creates an index' do
+        expect(indexes).to_not be_nil
+      end
+
+      context 'on server versions <= 4.4' do
+        max_server_fcv '4.4'
+
+        it 'passes wildcardProjection correctly' do
+          expect(indexes[:wildcardProjection]).to eq({ 'rating' => 1 })
+        end
+      end
+
+      context 'on server versions >= 5.0' do
+        min_server_fcv '5.0'
+
+        it 'passes wildcardProjection correctly' do
+          expect(indexes[:wildcardProjection]).to eq({ '_id' => false, 'rating' => true })
+        end
+      end
+    end
+
     context 'when providing hidden option' do
       let(:index) { view.get('with_hidden_1') }
 

data/spec/mongo/operation/create/op_msg_spec.rb

@@ -81,48 +81,6 @@ describe Mongo::Operation::Create::OpMsg do
         described_class.new(user_input).send(:selector, connection)
       end.not_to raise_error
     end
-
-    context 'with encryptedFields' do
-      let(:spec) do
-        {
-          :selector       => { :create => authorized_collection.name },
-          :db_name       => authorized_collection.database.name,
-          :write_concern => write_concern,
-          :session       => session,
-          :encrypted_fields => {
-            'fields' => [
-              {
-                'path' => "name",
-                'bsonType' => "string",
-                'queries' => {
-                  'queryType' => "equality",
-                  'contention' => 10
-                }
-              }
-            ]
-          }
-        }
-      end
-
-      it 'converts contention values to BSON::Int64' do
-        selector = op.send(:selector, connection)
-        expect(selector).to eq({
-          :create => authorized_collection.name,
-          :encryptedFields => {
-            'fields' => [
-              {
-                'path' => "name",
-                'bsonType' => "string",
-                'queries' => {
-                  'queryType' => "equality",
-                  'contention' => BSON::Int64.new(10)
-                }
-              }
-            ]
-          }
-        })
-      end
-    end
   end
 
   describe '#message' do

data/spec/mongo/server/connection_pool_spec.rb

@@ -83,11 +83,21 @@ describe Mongo::Server::ConnectionPool do
 
     context 'when min size exceeds default max size' do
       let (:options) do
-        { min_pool_size: 10 }
+        { min_pool_size: 50 }
       end
 
       it 'sets max size to equal provided min size' do
-        expect(pool.max_size).to eq(10)
+        expect(pool.max_size).to eq(50)
+      end
+    end
+
+    context 'when min size is provided and max size is zero (unlimited)' do
+      let (:options) do
+        { min_size: 10, max_size: 0 }
+      end
+
+      it 'sets max size to zero (unlimited)' do
+        expect(pool.max_size).to eq(0)
       end
     end
 
@@ -155,7 +165,7 @@ describe Mongo::Server::ConnectionPool do
 
     context 'when no pool size option is provided' do
       it 'returns the default size' do
-        expect(pool.max_size).to eq(5)
+        expect(pool.max_size).to eq(20)
       end
     end
 
@@ -165,7 +175,7 @@ describe Mongo::Server::ConnectionPool do
       end
 
       it 'returns max size' do
-        expect(pool.max_size).to eq(5)
+        expect(pool.max_size).to eq(20)
       end
     end
   end
@@ -460,6 +470,18 @@ describe Mongo::Server::ConnectionPool do
       server.pool
     end
 
+    context 'when max_size is zero (unlimited)' do
+      let(:options) do
+        { max_size: 0 }
+      end
+
+      it 'checks out a connection' do
+        expect do
+          pool.check_out
+        end.not_to raise_error
+      end
+    end
+
     context 'when a connection is checked out on a different thread' do
 
       let!(:connection) do

data/spec/mongo/socket/ssl_spec.rb

@@ -376,7 +376,7 @@ describe Mongo::Socket::SSL do
 
           let(:ssl_options) do
             super().merge(
-              :ssl_cert => COMMAND_MONITORING_TESTS.first,
+              :ssl_cert => CRUD_TESTS.first,
               :ssl_key => nil,
             )
           end
@@ -394,7 +394,7 @@ describe Mongo::Socket::SSL do
           let(:ssl_options) do
             super().merge(
               :ssl_cert => nil,
-              :ssl_key => COMMAND_MONITORING_TESTS.first,
+              :ssl_key => CRUD_TESTS.first,
             )
           end
 
@@ -412,7 +412,7 @@ describe Mongo::Socket::SSL do
 
           let(:ssl_options) do
             super().merge(
-              :ssl_cert => COMMAND_MONITORING_TESTS.first,
+              :ssl_cert => CRUD_TESTS.first,
               :ssl_key => nil,
             )
           end

data/spec/runners/crud/requirement.rb

@@ -4,7 +4,7 @@
 module Mongo
   module CRUD
     class Requirement
-      YAML_KEYS = %w(auth minServerVersion maxServerVersion topology topologies serverParameters serverless).freeze
+      YAML_KEYS = %w(auth minServerVersion maxServerVersion topology topologies serverParameters serverless csfle).freeze
 
       def initialize(spec)
         spec = spec.dup
@@ -49,6 +49,7 @@ module Mongo
           nil
         end
         @auth = spec['auth']
+        @csfle = !!spec['csfle'] if spec['csfle']
       end
 
       attr_reader :min_server_version
@@ -112,6 +113,10 @@ module Mongo
         elsif @auth == false
           ok &&= !cc.auth_enabled?
         end
+        if @csfle
+          ok &&= !!(ENV['LIBMONGOCRYPT_PATH'] || ENV['FLE'])
+          ok &&= Gem::Version.new(cc.fcv_ish) >= Gem::Version.new('4.2.0')
+        end
         ok
       end
 

data/spec/runners/crud/test.rb

@@ -96,7 +96,7 @@ module Mongo
         elsif @data.is_a?(Array)
           collection = client[spec.collection_name, write_concern: {w: :majority}]
           collection.delete_many
-          collection.insert_many(@data)
+          collection.insert_many(@data) unless @data.empty?
         elsif @data.is_a?(Hash)
           converter = DataConverter.new
           @data.each do |collection_name, data|

data/spec/runners/transactions/spec.rb

@@ -19,9 +19,9 @@ module Mongo
   module Transactions
 
     class Spec < Mongo::CRUD::Spec
-      def tests
+      def tests(expectations_bson_types: true)
         @tests.map do |test|
-          Mongo::Transactions::TransactionsTest.new(self, @data, test)
+          Mongo::Transactions::TransactionsTest.new(self, @data, test, expectations_bson_types: expectations_bson_types)
         end
       end
     end