mongo 2.17.1 → 2.18.1

data/spec/runners/unified/assertions.rb

@@ -51,6 +51,57 @@ module Unified
             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"
+                end
+              else
+                if actual_v != expected_v
+                  raise Error::ResultMismatch, "Mismatch: actual #{actual_v}, expected #{expected_v}"
+                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
+              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
@@ -99,6 +150,12 @@ module Unified
         client = entities.get(:client, client_id)
         subscriber = @subscribers.fetch(client)
         expected_events = spec.use!('events')
+        ignore_extra_events = if ignore = spec.use('ignoreExtraEvents')
+          # Ruby treats 0 as truthy, whereas the spec tests use it as falsy.
+          ignore == 0 ? false : ignore
+        else
+          false
+        end
         actual_events = subscriber.wanted_events(@observe_sensitive)
         case spec.use('eventType')
         when nil, 'command'
@@ -107,10 +164,12 @@ module Unified
           end
         when 'cmap'
           actual_events.select! do |event|
-            event.class.name.sub(/.*::/, '') =~ /^Pool/
+            event.class.name.sub(/.*::/, '') =~ /^(?:Pool|Connection)/
           end
         end
-        unless actual_events.length == expected_events.length
+
+        if (!ignore_extra_events && actual_events.length != expected_events.length) ||
+           (ignore_extra_events && actual_events.length < expected_events.length)
           raise Error::ResultMismatch, "Event count mismatch: expected #{expected_events.length}, actual #{actual_events.length}\nExpected: #{expected_events}\nActual: #{actual_events}"
         end
         expected_events.each_with_index do |event, i|
@@ -131,6 +190,9 @@ module Unified
       if spec.use('hasServiceId')
         actual.service_id.should_not be nil
       end
+      if spec.use('hasServerConnectionId')
+        actual.server_connection_id.should_not be nil
+      end
       if db_name = spec.use('databaseName')
         assert_eq(actual.database_name, db_name, 'Database names differ')
       end
@@ -155,8 +217,12 @@ module Unified
     end
 
     def assert_matches(actual, expected, msg)
-      if actual.nil? && !expected.nil?
-        raise Error::ResultMismatch, "#{msg}: expected #{expected} but got nil"
+      if actual.nil?
+        if expected.is_a?(Hash) && expected.keys == ["$$unsetOrMatches"]
+          return
+        elsif !expected.nil?
+          raise Error::ResultMismatch, "#{msg}: expected #{expected} but got nil"
+        end
       end
 
       case expected
@@ -179,7 +245,7 @@ module Unified
           if expected.empty?
             # This needs to be a match assertion. Check type only
             # and allow BulkWriteResult and generic operation result.
-            unless Hash === actual || Mongo::BulkWrite::Result === actual || Mongo::Operation::Result === actual
+            unless Hash === actual || Mongo::BulkWrite::Result === actual || Mongo::Operation::Result === actual || Mongo::Crypt::RewrapManyDataKeyResult === actual
               raise Error::ResultMismatch, "#{msg}: expected #{expected}, actual #{actual}"
             end
           else
@@ -208,10 +274,18 @@ module Unified
     end
 
     def assert_type(object, type)
+      ok = [*type].reduce(false) { |acc, x| acc || type_matches?(object, x) }
+
+      unless ok
+        raise Error::ResultMismatch, "Object #{object} is not of type #{type}"
+      end
+    end
+
+    def type_matches?(object, type)
       ok = case type
       when 'object'
         Hash === object
-      when %w(int long)
+      when 'int', 'long'
         Integer === object || BSON::Int32 === object || BSON::Int64 === object
       when 'objectId'
         BSON::ObjectId === object
@@ -219,12 +293,15 @@ module Unified
         Time === object
       when 'double'
         Float === object
+      when 'string'
+        String === object
+      when 'binData'
+        BSON::Binary === object
+      when 'array'
+        Array === object
       else
         raise NotImplementedError, "Unhandled type #{type}"
       end
-      unless ok
-        raise Error::ResultMismatch, "Object #{object} is not of type #{type}"
-      end
     end
 
     def assert_value_matches(actual, expected, msg)
@@ -235,8 +312,10 @@ module Unified
         case operator
         when '$$unsetOrMatches'
           if actual
-            unless actual == expected_v
-              raise Error::ResultMismatch, "Mismatch for #{msg}: expected #{expected}, have #{actual}"
+            if Mongo::BulkWrite::Result === actual || Mongo::Operation::Result === actual
+              assert_result_matches(actual, UsingHash[expected_v])
+            else
+              assert_matches(actual, expected_v, msg)
             end
           end
         when '$$matchesHexBytes'

data/spec/runners/unified/change_stream_operations.rb

@@ -14,6 +14,18 @@ module Unified
         if batch_size = args.use('batchSize')
           opts[:batch_size] = batch_size
         end
+        if comment = args.use('comment')
+          opts[:comment] = comment
+        end
+        if full_document = args.use('fullDocument')
+          opts[:full_document] = full_document
+        end
+        if full_document_before_change = args.use('fullDocumentBeforeChange')
+          opts[:full_document_before_change] = full_document_before_change
+        end
+        if args.key?('showExpandedEvents')
+          opts[:show_expanded_events] = args.use!('showExpandedEvents')
+        end
         cs = object.watch(pipeline, **opts)
         name = op.use!('saveResultAsEntity')
         entities.set(:change_stream, name, cs)

data/spec/runners/unified/client_side_encryption_operations.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+module Unified
+  module ClientSideEncryptionOperations
+    def create_data_key(op)
+      client_encryption = entities.get(:clientEncryption, op.use!('object'))
+      use_arguments(op) do |args|
+        opts = Utils.shallow_snakeize_hash(args.use('opts')) || {}
+        opts[:master_key] = Utils.shallow_snakeize_hash(opts[:master_key]) if opts[:master_key]
+        opts[:key_material] = opts[:key_material].data if opts[:key_material]
+        client_encryption.create_data_key(
+          args.use!('kmsProvider'),
+          opts,
+        )
+      end
+    end
+
+    def add_key_alt_name(op)
+      client_encryption = entities.get(:clientEncryption, op.use!('object'))
+      use_arguments(op) do |args|
+        client_encryption.add_key_alt_name(
+          args.use!('id'),
+          args.use!('keyAltName')
+        )
+      end
+    end
+
+    def delete_key(op)
+      client_encryption = entities.get(:clientEncryption, op.use!('object'))
+      use_arguments(op) do |args|
+        client_encryption.delete_key(
+          args.use!('id')
+        )
+      end
+    end
+
+    def get_key(op)
+      client_encryption = entities.get(:clientEncryption, op.use!('object'))
+      use_arguments(op) do |args|
+        client_encryption.get_key(
+          args.use!('id')
+        )
+      end
+    end
+
+    def get_key_by_alt_name(op)
+      client_encryption = entities.get(:clientEncryption, op.use!('object'))
+      use_arguments(op) do |args|
+        client_encryption.get_key_by_alt_name(
+          args.use!('keyAltName')
+        )
+      end
+    end
+
+    def get_keys(op)
+      client_encryption = entities.get(:clientEncryption, op.use!('object'))
+      client_encryption.get_keys.to_a
+    end
+
+    def remove_key_alt_name(op)
+      client_encryption = entities.get(:clientEncryption, op.use!('object'))
+      use_arguments(op) do |args|
+        client_encryption.remove_key_alt_name(
+          args.use!('id'),
+          args.use!('keyAltName')
+        )
+      end
+    end
+
+    def rewrap_many_data_key(op)
+      client_encryption = entities.get(:clientEncryption, op.use!('object'))
+      use_arguments(op) do |args|
+        opts = Utils.shallow_snakeize_hash(args.use('opts')) || {}
+        opts[:master_key] = Utils.shallow_snakeize_hash(opts[:master_key]) if opts[:master_key]
+        client_encryption.rewrap_many_data_key(
+          args.use!('filter'),
+          opts
+        )
+      end
+    end
+  end
+end

data/spec/runners/unified/crud_operations.rb

@@ -10,6 +10,16 @@ module Unified
       use_arguments(op) do |args|
         opts = {
           let: args.use('let'),
+          comment: args.use('comment'),
+          allow_disk_use: args.use('allowDiskUse'),
+          show_disk_loc: args.use('showRecordId'),
+          return_key: args.use('returnKey'),
+          projection: args.use('projection'),
+          skip: args.use('skip'),
+          hint: args.use('hint'),
+          max_value: args.use('max'),
+          max_time_ms: args.use('maxTimeMS'),
+          min_value: args.use('min'),
         }
         if session = args.use('session')
           opts[:session] = entities.get(:session, session)
@@ -24,6 +34,9 @@ module Unified
         if limit = args.use('limit')
           req = req.limit(limit)
         end
+        if projection = args.use('projection')
+          req = req.projection(projection)
+        end
         result = req.to_a
       end
     end
@@ -35,6 +48,9 @@ module Unified
         if session = args.use('session')
           opts[:session] = entities.get(:session, session)
         end
+        if comment = args.use('comment')
+          opts[:comment] = comment
+        end
         collection.find(args.use!('filter')).count_documents(**opts)
       end
     end
@@ -46,6 +62,9 @@ module Unified
         if max_time_ms = args.use('maxTimeMS')
           opts[:max_time_ms] = max_time_ms
         end
+        if comment = args.use('comment')
+          opts[:comment] = comment
+        end
         collection.estimated_document_count(**opts)
       end
     end
@@ -57,6 +76,9 @@ module Unified
         if session = args.use('session')
           opts[:session] = entities.get(:session, session)
         end
+        if comment = args.use('comment')
+          opts[:comment] = comment
+        end
         req = collection.find(args.use!('filter'), **opts).distinct(args.use!('fieldName'), **opts)
         result = req.to_a
       end
@@ -69,6 +91,8 @@ module Unified
         update = args.use!('update')
         opts = {
           let: args.use('let'),
+          comment: args.use('comment'),
+          hint: args.use('hint'),
         }
         if return_document = args.use('returnDocument')
           opts[:return_document] = return_document.downcase.to_sym
@@ -87,6 +111,8 @@ module Unified
         update = args.use!('replacement')
         opts = {
           let: args.use('let'),
+          comment: args.use('comment'),
+          hint: args.use('hint'),
         }
         if session = args.use('session')
           opts[:session] = entities.get(:session, session)
@@ -101,6 +127,8 @@ module Unified
         filter = args.use!('filter')
         opts = {
           let: args.use('let'),
+          comment: args.use('comment'),
+          hint: args.use('hint'),
         }
         if session = args.use('session')
           opts[:session] = entities.get(:session, session)
@@ -112,7 +140,9 @@ module Unified
     def insert_one(op)
       collection = entities.get(:collection, op.use!('object'))
       use_arguments(op) do |args|
-        opts = {}
+        opts = {
+          comment: args.use('comment')
+        }
         if session = args.use('session')
           opts[:session] = entities.get(:session, session)
         end
@@ -123,7 +153,9 @@ module Unified
     def insert_many(op)
       collection = entities.get(:collection, op.use!('object'))
       use_arguments(op) do |args|
-        opts = {}
+        opts = {
+          comment: args.use('comment')
+        }
         unless (ordered = args.use('ordered')).nil?
           opts[:ordered] = ordered
         end
@@ -139,6 +171,9 @@ module Unified
       use_arguments(op) do |args|
         opts = {
           let: args.use('let'),
+          comment: args.use('comment'),
+          hint: args.use('hint'),
+          upsert: args.use('upsert'),
         }
         if session = args.use('session')
           opts[:session] = entities.get(:session, session)
@@ -152,6 +187,8 @@ module Unified
       use_arguments(op) do |args|
         opts = {
           let: args.use('let'),
+          comment: args.use('comment'),
+          hint: args.use('hint'),
         }
         collection.update_many(args.use!('filter'), args.use!('update'), **opts)
       end
@@ -163,7 +200,10 @@ module Unified
         collection.replace_one(
           args.use!('filter'),
           args.use!('replacement'),
+          comment: args.use('comment'),
           upsert: args.use('upsert'),
+          let: args.use('let'),
+          hint: args.use('hint')
         )
       end
     end
@@ -173,6 +213,8 @@ module Unified
       use_arguments(op) do |args|
         opts = {
           let: args.use('let'),
+          comment: args.use('comment'),
+          hint: args.use('hint'),
         }
         if session = args.use('session')
           opts[:session] = entities.get(:session, session)
@@ -186,6 +228,8 @@ module Unified
       use_arguments(op) do |args|
         opts = {
           let: args.use('let'),
+          comment: args.use('comment'),
+          hint: args.use('hint'),
         }
         collection.delete_many(args.use!('filter'), **opts)
       end
@@ -198,8 +242,14 @@ module Unified
           convert_bulk_write_spec(req)
         end
         opts = {}
-        if ordered = args.use('ordered')
-          opts[:ordered] = true
+        if args.key?('ordered')
+          opts[:ordered] = args.use!('ordered')
+        end
+        if comment = args.use('comment')
+          opts[:comment] = comment
+        end
+        if let = args.use('let')
+          opts[:let] = let
         end
         collection.bulk_write(requests, **opts)
       end
@@ -215,6 +265,15 @@ module Unified
       if session = args.use('session')
         opts[:session] = entities.get(:session, session)
       end
+      if comment = args.use('comment')
+        opts[:comment] = comment
+      end
+      if batch_size = args.use('batchSize')
+        opts[:batch_size] = batch_size
+      end
+      if args.key?('allowDiskUse')
+        opts[:allow_disk_use] = args.use('allowDiskUse')
+      end
       unless args.empty?
         raise NotImplementedError, "Unhandled spec keys: #{args} in #{test_spec}"
       end
@@ -237,16 +296,20 @@ module Unified
           filter: spec.use('filter'),
           update: spec.use('update'),
           upsert: spec.use('upsert'),
+          array_filters: spec.use('arrayFilters'),
+          hint: spec.use('hint'),
         }
       when 'replaceOne'
         {
           filter: spec.use('filter'),
           replacement: spec.use('replacement'),
           upsert: spec.use('upsert'),
+          hint: spec.use('hint'),
         }
       when 'deleteOne', 'deleteMany'
         {
           filter: spec.use('filter'),
+          hint: spec.use('hint'),
         }
       else
         raise NotImplementedError, "Unknown operation #{op}"

data/spec/runners/unified/ddl_operations.rb

@@ -30,6 +30,15 @@ module Unified
         if expire_after_seconds = args.use('expireAfterSeconds')
           collection_opts[:expire_after] = expire_after_seconds
         end
+        if clustered_index = args.use('clusteredIndex')
+          collection_opts[:clustered_index] = clustered_index
+        end
+        if change_stream_pre_and_post_images = args.use('changeStreamPreAndPostImages')
+          collection_opts[:change_stream_pre_and_post_images] = change_stream_pre_and_post_images
+        end
+        if view_on = args.use('viewOn')
+          collection_opts[:view_on] = view_on
+        end
         database[args.use!('collection'), collection_opts].create(**opts)
       end
     end
@@ -41,6 +50,9 @@ module Unified
         if session = args.use('session')
           opts[:session] = entities.get(:session, session)
         end
+        if filter = args.use('filter')
+          opts[:filter] = filter
+        end
         database.list_collections(**opts)
       end
     end
@@ -53,6 +65,23 @@ module Unified
       end
     end
 
+    def rename(op)
+      collection = entities.get(:collection, op.use!('object'))
+      use_arguments(op) do |args|
+        to = args.use!('to')
+        cmd = {
+          renameCollection: "#{collection.database.name}.#{collection.name}",
+          to: "#{collection.database.name}.#{to}"
+        }
+
+        if args.key?("dropTarget")
+          cmd[:dropTarget] = args.use("dropTarget")
+        end
+
+        collection.client.use(:admin).command(**cmd)
+      end
+    end
+
     def assert_collection_exists(op, state = true)
       consume_test_runner(op)
       use_arguments(op) do |args|
@@ -102,6 +131,22 @@ module Unified
       end
     end
 
+    def drop_index(op)
+      collection = entities.get(:collection, op.use!('object'))
+      use_arguments(op) do |args|
+        opts = {}
+        if session = args.use('session')
+          opts[:session] = entities.get(:session, session)
+        end
+
+        collection.indexes.drop_one(
+          args.use!('name'),
+          **opts,
+        )
+      end
+    end
+
+
     def assert_index_exists(op)
       consume_test_runner(op)
       use_arguments(op) do |args|

data/spec/runners/unified/error.rb

@@ -23,6 +23,7 @@ module Unified
     class InvalidTest < Error
     end
 
+    class UnsupportedOperation < Error
+    end
   end
-
 end

data/spec/runners/unified/grid_fs_operations.rb

@@ -20,6 +20,18 @@ module Unified
       end
     end
 
+    def download_by_name(op)
+      bucket = entities.get(:bucket, op.use!('object'))
+      use_arguments(op) do |args|
+        opts = {}
+        if revision = args.use('revision')
+          opts[:revision] = revision
+        end
+        stream = bucket.open_download_stream_by_name(args.use!('filename'), opts)
+        stream.read
+      end
+    end
+
     def upload(op)
       bucket = entities.get(:bucket, op.use!('object'))
       use_arguments(op) do |args|
@@ -27,6 +39,15 @@ module Unified
         if chunk_size = args.use('chunkSizeBytes')
           opts[:chunk_size] = chunk_size
         end
+        if metadata = args.use('metadata')
+          opts[:metadata] = metadata
+        end
+        if content_type = args.use('contentType')
+          opts[:content_type] = content_type
+        end
+        if disable_md5 = args.use('disableMD5')
+          opts[:disable_md5] = disable_md5
+        end
         contents = transform_contents(args.use!('source'))
         file_id = nil
         bucket.open_upload_stream(args.use!('filename'), **opts) do |stream|

data/spec/runners/unified/support_operations.rb

@@ -59,8 +59,11 @@ module Unified
 
     def assert_session_dirty(op)
       consume_test_runner(op)
-      # https://jira.mongodb.org/browse/RUBY-1813
-      true
+      use_arguments(op) do |args|
+        session = entities.get(:session, args.use!('session'))
+        # https://jira.mongodb.org/browse/RUBY-1813
+        true
+      end
     end
 
     def assert_session_not_dirty(op)