mongo 2.18.2 → 2.19.3

data/spec/runners/transactions/test.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #
@@ -29,6 +29,9 @@ module Mongo
 
       attr_reader :results
 
+      # @return [ Crud::Spec ] the top-level YAML specification object
+      attr_reader :spec
+
       # Instantiate the new CRUDTest.
       #
       # @example Create the test.
@@ -38,6 +41,9 @@ module Mongo
       # @param [ Array<Hash> ] data The documents the collection
       # must have before the test runs.
       # @param [ Hash ] test The test specification.
+      # @param [ true | false | Proc ] expectations_bson_types Whether bson
+      #   types should be expected. If a Proc is given, it is invoked with the
+      #   test as its argument, and should return true or false.
       #
       # @since 2.6.0
       def initialize(crud_spec, data, test, expectations_bson_types: true)
@@ -71,15 +77,19 @@ module Mongo
           Operation.new(self, op)
         end
 
+        if expectations_bson_types.respond_to?(:call)
+          expectations_bson_types = expectations_bson_types[self]
+        end
+
         mode = if expectations_bson_types then :bson else nil end
         @expectations = BSON::ExtJSON.parse_obj(test['expectations'], mode: mode)
 
         if test['outcome']
-          @outcome = Mongo::CRUD::Outcome.new(BSON::ExtJSON.parse_obj(test['outcome'], mode: :bson))
+          @outcome = Mongo::CRUD::Outcome.new(BSON::ExtJSON.parse_obj(test['outcome'], mode: mode))
         end
 
         @expected_results = operations.map do |o|
-          o = BSON::ExtJSON.parse_obj(o)
+          o = BSON::ExtJSON.parse_obj(o, mode: :bson)
 
           # We check both o.key('error') and o['error'] to provide a better
           # error message in case error: false is ever needed in the tests
@@ -132,6 +142,37 @@ module Mongo
             test_client.subscribe(Mongo::Monitoring::CONNECTION_POOL, sdam_subscriber)
           end
 
+          if kms_providers = @client_options.dig(:auto_encryption_options, :kms_providers)
+            @client_options[:auto_encryption_options][:kms_providers] = kms_providers.map do |provider, opts|
+              case provider
+              when :aws_temporary
+                [
+                  :aws,
+                  {
+                    access_key_id: SpecConfig.instance.fle_aws_temp_key,
+                    secret_access_key: SpecConfig.instance.fle_aws_temp_secret,
+                    session_token: SpecConfig.instance.fle_aws_temp_session_token,
+                  }
+                ]
+              when :aws_temporary_no_session_token
+                [
+                  :aws,
+                  {
+                    access_key_id: SpecConfig.instance.fle_aws_temp_key,
+                    secret_access_key: SpecConfig.instance.fle_aws_temp_secret,
+                  }
+                ]
+              else
+                [provider, opts]
+              end
+            end.to_h
+          end
+
+          if @client_options[:auto_encryption_options] && SpecConfig.instance.crypt_shared_lib_path
+            @client_options[:auto_encryption_options][:extra_options] ||= {}
+            @client_options[:auto_encryption_options][:extra_options][:crypt_shared_lib_path] = SpecConfig.instance.crypt_shared_lib_path
+          end
+
           ClientRegistry.instance.new_local_client(
             SpecConfig.instance.addresses,
             SpecConfig.instance.authorized_test_options.merge(

data/spec/runners/transactions.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 # Copyright (C) 2014-2020 MongoDB Inc.
 #

data/spec/runners/unified/assertions.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 module Unified
 
@@ -8,102 +8,106 @@ module Unified
 
     def assert_result_matches(actual, expected)
       if Hash === expected
-        use_all(expected, 'expected result', expected) do |expected|
-          %w(deleted inserted matched modified upserted).each do |k|
-            if count = expected.use("#{k}Count")
-              if Hash === count || count > 0
-                actual_count = case actual
-                when Mongo::BulkWrite::Result, Mongo::Operation::Delete::Result, Mongo::Operation::Update::Result
-                  actual.send("#{k}_count")
-                else
-                  actual["n_#{k}"]
+        if expected.keys == ["$$unsetOrMatches"]
+          assert_result_matches(actual, UsingHash[expected.values.first])
+        else
+          use_all(expected, 'expected result', expected) do |expected|
+            %w(deleted inserted matched modified upserted).each do |k|
+              if count = expected.use("#{k}Count")
+                if Hash === count || count > 0
+                  actual_count = case actual
+                  when Mongo::BulkWrite::Result, Mongo::Operation::Delete::Result, Mongo::Operation::Update::Result
+                    actual.send("#{k}_count")
+                  else
+                    actual["n_#{k}"]
+                  end
+                  assert_value_matches(actual_count, count, "#{k} count")
                 end
-                assert_value_matches(actual_count, count, "#{k} count")
               end
             end
-          end
-          %w(inserted upserted).each do |k|
-            expected_v = expected.use("#{k}Ids")
-            next unless expected_v
-            actual_v = case actual
-            when Mongo::BulkWrite::Result, Mongo::Operation::Update::Result
-              # Ruby driver returns inserted ids as an array of ids.
-              # The yaml file specifies them as a map from operation.
-              if Hash === expected_v && expected_v.keys == %w($$unsetOrMatches)
-                expected_v = expected_v.values.first.values
-              elsif Hash === expected_v
-                expected_v = expected_v.values
-              end
-              actual.send("#{k}_ids")
-            else
-              actual["#{k}_ids"]
-            end
-            if expected_v
-              if expected_v.empty?
-                if actual_v && !actual_v.empty?
-                  raise Error::ResultMismatch, "Actual not empty"
+            %w(inserted upserted).each do |k|
+              expected_v = expected.use("#{k}Ids")
+              next unless expected_v
+              actual_v = case actual
+              when Mongo::BulkWrite::Result, Mongo::Operation::Update::Result
+                # Ruby driver returns inserted ids as an array of ids.
+                # The yaml file specifies them as a map from operation.
+                if Hash === expected_v && expected_v.keys == %w($$unsetOrMatches)
+                  expected_v = expected_v.values.first.values
+                elsif Hash === expected_v
+                  expected_v = expected_v.values
                 end
+                actual.send("#{k}_ids")
               else
-                if actual_v != expected_v
-                  raise Error::ResultMismatch, "Mismatch: actual #{actual_v}, expected #{expected_v}"
+                actual["#{k}_ids"]
+              end
+              if expected_v
+                if expected_v.empty?
+                  if actual_v && !actual_v.empty?
+                    raise Error::ResultMismatch, "Actual not empty"
+                  end
+                else
+                  if actual_v != expected_v
+                    raise Error::ResultMismatch, "Mismatch: actual #{actual_v}, expected #{expected_v}"
+                  end
                 end
               end
             end
-          end
 
-          %w(acknowledged).each do |k|
-            expected_v = expected.use(k)
-            next unless expected_v
-            actual_v = case actual
-            when Mongo::BulkWrite::Result, Mongo::Operation::Result
-              if Hash === expected_v && expected_v.keys == %w($$unsetOrMatches)
-                expected_v = expected_v.values.first
-              end
-              actual.send("#{k}?")
-            else
-              actual[k]
-            end
-            if expected_v
-              if expected_v.empty?
-                if actual_v && !actual_v.empty?
-                  raise Error::ResultMismatch, "Actual not empty"
+            %w(acknowledged).each do |k|
+              expected_v = expected.use(k)
+              next unless expected_v
+              actual_v = case actual
+              when Mongo::BulkWrite::Result, Mongo::Operation::Result
+                if Hash === expected_v && expected_v.keys == %w($$unsetOrMatches)
+                  expected_v = expected_v.values.first
                 end
+                actual.send("#{k}?")
               else
-                if actual_v != expected_v
-                  raise Error::ResultMismatch, "Mismatch: actual #{actual_v}, expected #{expected_v}"
+                actual[k]
+              end
+              if expected_v
+                if expected_v.empty?
+                  if actual_v && !actual_v.empty?
+                    raise Error::ResultMismatch, "Actual not empty"
+                  end
+                else
+                  if actual_v != expected_v
+                    raise Error::ResultMismatch, "Mismatch: actual #{actual_v}, expected #{expected_v}"
+                  end
                 end
               end
             end
-          end
 
-          %w(bulkWriteResult).each do |k|
-            expected_v = expected.use(k)
-            next unless expected_v
-            actual_v = case actual
-            when Mongo::Crypt::RewrapManyDataKeyResult
-              actual.send(Utils.underscore(k))
-            else
-              raise Error::ResultMismatch, "Mismatch: actual #{actual_v}, expected #{expected_v}"
-            end
-            if expected_v
-              if expected_v.empty?
-                if actual_v && !actual_v.empty?
-                  raise Error::ResultMismatch, "Actual not empty"
-                end
+            %w(bulkWriteResult).each do |k|
+              expected_v = expected.use(k)
+              next unless expected_v
+              actual_v = case actual
+              when Mongo::Crypt::RewrapManyDataKeyResult
+                actual.send(Utils.underscore(k))
               else
-                %w(deleted inserted matched modified upserted).each do |k|
-                  if count = expected_v.use("#{k}Count")
-                    if Hash === count || count > 0
-                      actual_count = actual_v.send("#{k}_count")
-                      assert_value_matches(actual_count, count, "#{k} count")
+                raise Error::ResultMismatch, "Mismatch: actual #{actual_v}, expected #{expected_v}"
+              end
+              if expected_v
+                if expected_v.empty?
+                  if actual_v && !actual_v.empty?
+                    raise Error::ResultMismatch, "Actual not empty"
+                  end
+                else
+                  %w(deleted inserted matched modified upserted).each do |k|
+                    if count = expected_v.use("#{k}Count")
+                      if Hash === count || count > 0
+                        actual_count = actual_v.send("#{k}_count")
+                        assert_value_matches(actual_count, count, "#{k} count")
+                      end
                     end
                   end
                 end
               end
             end
+            assert_matches(actual, expected, 'result')
+            expected.clear
           end
-          assert_matches(actual, expected, 'result')
-          expected.clear
         end
       else
         assert_matches(actual, expected, 'result')
@@ -118,7 +122,7 @@ module Unified
         spec = UsingHash[spec]
         collection = client.use(spec.use!('databaseName'))[spec.use!('collectionName')]
         expected_docs = spec.use!('documents')
-        actual_docs = collection.find({}, order: :_id).to_a
+        actual_docs = collection.find({}, sort: { _id: 1 }).to_a
         assert_documents_match(actual_docs, expected_docs)
         unless spec.empty?
           raise NotImplementedError, "Unhandled keys: #{spec}"
@@ -156,7 +160,7 @@ module Unified
         else
           false
         end
-        actual_events = subscriber.wanted_events(@observe_sensitive)
+        actual_events = subscriber.wanted_events(@observe_sensitive[client_id])
         case spec.use('eventType')
         when nil, 'command'
           actual_events.select! do |event|
@@ -205,6 +209,9 @@ module Unified
       if reply = spec.use('reply')
         assert_matches(actual.reply, reply, 'Command reply does not match expectation')
       end
+      if interrupt_in_use_connections = spec.use('interruptInUseConnections')
+        assert_matches(actual.options[:interrupt_in_use_connections], interrupt_in_use_connections, 'Command interrupt_in_use_connections does not match expectation')
+      end
       unless spec.empty?
         raise NotImplementedError, "Unhandled keys: #{spec}"
       end
@@ -216,6 +223,12 @@ module Unified
       end
     end
 
+    def assert_gte(actual, expected, msg)
+      unless actual >= expected
+        raise Error::ResultMismatch, "#{msg}: expected #{expected}, actual #{actual}"
+      end
+    end
+
     def assert_matches(actual, expected, msg)
       if actual.nil?
         if expected.is_a?(Hash) && expected.keys == ["$$unsetOrMatches"]
@@ -241,6 +254,10 @@ module Unified
           actual_v = actual.inserted_id
           expected_v = expected.values.first.values.first
           assert_value_matches(actual_v, expected_v, 'inserted_id')
+        elsif expected.keys == %w(insertedId)
+          actual_v = actual.inserted_id
+          expected_v = expected.values.first
+          assert_value_matches(actual_v, expected_v, 'inserted_id')
         else
           if expected.empty?
             # This needs to be a match assertion. Check type only

data/spec/runners/unified/change_stream_operations.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 module Unified
 
@@ -27,8 +27,9 @@ module Unified
           opts[:show_expanded_events] = args.use!('showExpandedEvents')
         end
         cs = object.watch(pipeline, **opts)
-        name = op.use!('saveResultAsEntity')
-        entities.set(:change_stream, name, cs)
+        if name = op.use('saveResultAsEntity')
+          entities.set(:change_stream, name, cs)
+        end
       end
     end
 
@@ -37,5 +38,15 @@ module Unified
       object = entities.get(:change_stream, object_id)
       object.to_enum.next
     end
+
+    def close(op)
+      object_id = op.use!('object')
+      # The Ruby driver unified spec runner does not currently implement
+      # find cursors as created by createFindCursor. This will be done
+      # as part of CSOT implementation. When this is done, the line(s) below
+      # should be changed to retrieve such cursor instances and close them.
+      object = entities.get(:csot_cursor, object_id)
+      object.close
+    end
   end
 end

data/spec/runners/unified/client_side_encryption_operations.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 module Unified
   module ClientSideEncryptionOperations

data/spec/runners/unified/crud_operations.rb

@@ -1,11 +1,19 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 module Unified
 
   module CrudOperations
 
     def find(op)
+      get_find_view(op).to_a
+    end
+
+    def find_one(op)
+      get_find_view(op).first
+    end
+
+    def get_find_view(op)
       collection = entities.get(:collection, op.use!('object'))
       use_arguments(op) do |args|
         opts = {
@@ -37,7 +45,7 @@ module Unified
         if projection = args.use('projection')
           req = req.projection(projection)
         end
-        result = req.to_a
+        req
       end
     end
 
@@ -93,6 +101,7 @@ module Unified
           let: args.use('let'),
           comment: args.use('comment'),
           hint: args.use('hint'),
+          upsert: args.use('upsert'),
         }
         if return_document = args.use('returnDocument')
           opts[:return_document] = return_document.downcase.to_sym

data/spec/runners/unified/ddl_operations.rb

@@ -1,18 +1,26 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 module Unified
 
   module DdlOperations
 
     def list_databases(op)
+      list_dbs(op, name_only: false)
+    end
+
+    def list_database_names(op)
+      list_dbs(op, name_only: false)
+    end
+
+    def list_dbs(op, name_only: false)
       client = entities.get(:client, op.use!('object'))
       use_arguments(op) do |args|
         opts = {}
         if session = args.use('session')
           opts[:session] = entities.get(:session, session)
         end
-        client.list_databases({}, false, **opts)
+        client.list_databases(args.use('filter') || {}, name_only, **opts)
       end
     end
 
@@ -39,11 +47,22 @@ module Unified
         if view_on = args.use('viewOn')
           collection_opts[:view_on] = view_on
         end
+        if pipeline = args.use('pipeline')
+          collection_opts[:pipeline] = pipeline
+        end
         database[args.use!('collection'), collection_opts].create(**opts)
       end
     end
 
     def list_collections(op)
+      list_colls(op, name_only: false)
+    end
+
+    def list_collection_names(op)
+      list_colls(op, name_only: true)
+    end
+
+    def list_colls(op, name_only: false)
       database = entities.get(:database, op.use!('object'))
       use_arguments(op) do |args|
         opts = {}
@@ -53,7 +72,7 @@ module Unified
         if filter = args.use('filter')
           opts[:filter] = filter
         end
-        database.list_collections(**opts)
+        database.list_collections(**opts.merge(name_only: name_only))
       end
     end
 
@@ -122,10 +141,13 @@ module Unified
         if session = args.use('session')
           opts[:session] = entities.get(:session, session)
         end
+        if args.key?('unique')
+          opts[:unique] = args.use('unique')
+        end
 
         collection.indexes.create_one(
           args.use!('keys'),
-          name: args.use!('name'),
+          name: args.use('name'),
           **opts,
         )
       end
@@ -175,5 +197,59 @@ module Unified
         end
       end
     end
+
+    def create_entities(op)
+      consume_test_runner(op)
+      use_arguments(op) do |args|
+        generate_entities(args.use!('entities'))
+      end
+    end
+
+    def record_topology_description(op)
+      consume_test_runner(op)
+      use_arguments(op) do |args|
+        client = entities.get(:client, args.use!('client'))
+        entities.set(:topology, args.use!('id'), client.cluster.topology)
+      end
+    end
+
+    def assert_topology_type(op)
+      consume_test_runner(op)
+      use_arguments(op) do |args|
+        topology = entities.get(:topology, args.use!('topologyDescription'))
+        type = args.use!('topologyType')
+        unless topology.display_name == type
+          raise Error::ResultMismatch, "Expected topology type to be #{type}, but got #{topology.class}"
+        end
+      end
+    end
+
+    def retrieve_primary(topology)
+      topology.server_descriptions.detect { |k, desc| desc.primary? }&.first
+    end
+
+    def wait_for_primary_change(op)
+      consume_test_runner(op)
+      use_arguments(op) do |args|
+        client = entities.get(:client, args.use!('client'))
+        topology = entities.get(:topology, args.use!('priorTopologyDescription'))
+        timeout_ms = args.use('timeoutMS') || 10000
+        old_primary = retrieve_primary(topology)
+
+        deadline = Mongo::Utils.monotonic_time + timeout_ms / 1000.0
+        loop do
+          client.cluster.scan!
+          new_primary = client.cluster.next_primary.address
+          if new_primary && old_primary != new_primary
+            break
+          end
+          if Mongo::Utils.monotonic_time >= deadline
+            raise "Did not receive a change in primary from #{old_primary} in 10 seconds"
+          else
+            sleep 0.1
+          end
+        end
+      end
+    end
   end
 end

data/spec/runners/unified/entity_map.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 module Unified
   class EntityMap

data/spec/runners/unified/error.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 module Unified
 

data/spec/runners/unified/event_subscriber.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'mrss/event_subscriber'
 
@@ -30,8 +30,14 @@ module Unified
         events
       else
         events.reject do |event|
-          event.respond_to?(:command_name) &&
-            %w(authenticate getnonce saslStart saslContinue).include?(event.command_name)
+          if event.respond_to?(:command_name)
+            # event could be a command started event or command succeeded event
+            command = event.respond_to?(:command) ? event.command : event.started_event.command
+            %w(authenticate getnonce saslStart saslContinue).include?(event.command_name) ||
+              # if the command is empty that means we used speculativeAuth and we should
+              # reject the event.
+              (%w(hello ismaster isMaster).include?(event.command_name) && command.empty?)
+          end
         end
       end
     end

data/spec/runners/unified/exceptions.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 module Unified
 

data/spec/runners/unified/grid_fs_operations.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 module Unified
 

data/spec/runners/unified/search_index_operations.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Unified
+  # The definitions of available search index operations, as used by the
+  # unified tests.
+  module SearchIndexOperations
+    def create_search_index(op)
+      collection = entities.get(:collection, op.use!('object'))
+
+      use_arguments(op) do |args|
+        model = args.use('model')
+        name = model.use('name')
+        definition = model.use('definition')
+        collection.search_indexes.create_one(definition, name: name)
+      end
+    end
+
+    def create_search_indexes(op)
+      collection = entities.get(:collection, op.use!('object'))
+
+      use_arguments(op) do |args|
+        models = args.use('models')
+        collection.search_indexes.create_many(models)
+      end
+    end
+
+    def drop_search_index(op)
+      collection = entities.get(:collection, op.use!('object'))
+
+      use_arguments(op) do |args|
+        collection.search_indexes.drop_one(
+          id: args.use('id'),
+          name: args.use('name')
+        )
+      end
+    end
+
+    def list_search_indexes(op)
+      collection = entities.get(:collection, op.use!('object'))
+
+      use_arguments(op) do |args|
+        agg_opts = args.use('aggregationOptions') || {}
+        collection.search_indexes(
+          id: args.use('id'),
+          name: args.use('name'),
+          aggregate: ::Utils.underscore_hash(agg_opts)
+        ).to_a
+      end
+    end
+
+    def update_search_index(op)
+      collection = entities.get(:collection, op.use!('object'))
+
+      use_arguments(op) do |args|
+        collection.search_indexes.update_one(
+          args.use('definition'),
+          id: args.use('id'),
+          name: args.use('name')
+        )
+      end
+    end
+  end
+end