mongo 2.15.0.alpha → 2.15.0

data/spec/runners/unified.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'runners/unified/error'
 require 'runners/unified/entity_map'
 require 'runners/unified/event_subscriber'

data/spec/runners/unified/assertions.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module Unified
 
   module Assertions
@@ -9,7 +12,7 @@ module Unified
             if count = expected.use("#{k}Count")
               if Hash === count || count > 0
                 actual_count = case actual
-                when Mongo::BulkWrite::Result, Mongo::Operation::Delete::Result
+                when Mongo::BulkWrite::Result, Mongo::Operation::Delete::Result, Mongo::Operation::Update::Result
                   actual.send("#{k}_count")
                 else
                   actual["n_#{k}"]
@@ -97,13 +100,26 @@ module Unified
         client = entities.get(:client, client_id)
         subscriber = @subscribers.fetch(client)
         expected_events = spec.use!('events')
-        actual_events = subscriber.wanted_events
+        actual_events = subscriber.wanted_events(@observe_sensitive)
+        case spec.use('eventType')
+        when nil, 'command'
+          actual_events.select! do |event|
+            event.class.name.sub(/.*::/, '') =~ /^Command/
+          end
+        when 'cmap'
+          actual_events.select! do |event|
+            event.class.name.sub(/.*::/, '') =~ /^Pool/
+          end
+        end
         unless 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|
           assert_event_matches(actual_events[i], event)
         end
+        unless spec.empty?
+          raise NotImplementedError, "Unhandled keys: #{spec}"
+        end
       end
     end
 
@@ -113,6 +129,9 @@ module Unified
       spec = UsingHash[spec]
       expected_name = expected_name.sub(/Event$/, '').sub(/^(.)/) { $1.upcase }
       assert_eq(actual.class.name.sub(/.*::/, ''), expected_name, 'Event name does not match')
+      if spec.use('hasServiceId')
+        # TODO: RUBY-2654
+      end
       if db_name = spec.use('databaseName')
         assert_eq(actual.database_name, db_name, 'Database names differ')
       end
@@ -122,6 +141,12 @@ module Unified
       if command = spec.use('command')
         assert_matches(actual.command, command, 'Commands differ')
       end
+      if reply = spec.use('reply')
+        assert_matches(actual.reply, reply, 'Command reply does not match expectation')
+      end
+      unless spec.empty?
+        raise NotImplementedError, "Unhandled keys: #{spec}"
+      end
     end
 
     def assert_eq(actual, expected, msg)
@@ -152,15 +177,23 @@ module Unified
           expected_v = expected.values.first.values.first
           assert_value_matches(actual_v, expected_v, 'inserted_id')
         else
-          expected.each do |k, expected_v|
-            if k.start_with?('$$')
-              assert_value_matches(actual, expected, k)
-            else
-              actual_v = actual[k]
-              if Hash === expected_v && expected_v.length == 1 && expected_v.keys.first.start_with?('$$')
-                assert_value_matches(actual_v, expected_v, k)
+          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
+              raise Error::ResultMismatch, "#{msg}: expected #{expected}, actual #{actual}"
+            end
+          else
+            expected.each do |k, expected_v|
+              if k.start_with?('$$')
+                assert_value_matches(actual, expected, k)
               else
-                assert_matches(actual_v, expected_v, "#{msg}: key #{k}")
+                actual_v = actual[k]
+                if Hash === expected_v && expected_v.length == 1 && expected_v.keys.first.start_with?('$$')
+                  assert_value_matches(actual_v, expected_v, k)
+                else
+                  assert_matches(actual_v, expected_v, "#{msg}: key #{k}")
+                end
               end
             end
           end

data/spec/runners/unified/change_stream_operations.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module Unified
 
   module ChangeStreamOperations

data/spec/runners/unified/crud_operations.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module Unified
 
   module CrudOperations
@@ -5,7 +8,11 @@ module Unified
     def find(op)
       collection = entities.get(:collection, op.use!('object'))
       use_arguments(op) do |args|
-        req = collection.find(args.use!('filter'))
+        opts = {}
+        if session = args.use('session')
+          opts[:session] = entities.get(:session, session)
+        end
+        req = collection.find(args.use!('filter'), **opts)
         if batch_size = args.use('batchSize')
           req = req.batch_size(batch_size)
         end

data/spec/runners/unified/ddl_operations.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module Unified
 
   module DdlOperations
@@ -14,7 +17,14 @@ module Unified
         if session = args.use('session')
           opts[:session] = entities.get(:session, session)
         end
-        database[args.use!('collection')].create(**opts)
+        collection_opts = {}
+        if timeseries = args.use('timeseries')
+          collection_opts[:time_series] = timeseries
+        end
+        if expire_after_seconds = args.use('expireAfterSeconds')
+          collection_opts[:expire_after] = expire_after_seconds
+        end
+        database[args.use!('collection'), collection_opts].create(**opts)
       end
     end
 

data/spec/runners/unified/entity_map.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module Unified
   class EntityMap
     def initialize

data/spec/runners/unified/error.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module Unified
 
   class Error < StandardError

data/spec/runners/unified/event_subscriber.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'support/event_subscriber'
 
 module Unified
@@ -7,19 +10,29 @@ module Unified
       @ignore_commands = command_names
     end
 
-    def wanted_events
-      all_events.select do |event|
-        kind = event.class.name.sub(/.*::/, '').sub('Command', '').downcase.to_sym
+    def wanted_events(observe_sensitive = false)
+      events = all_events.select do |event|
+        kind = event.class.name.sub(/.*::/, '').sub('Command', '').gsub(/([A-Z])/) { "_#{$1}" }.sub(/^_/, '').downcase.to_sym
         @wanted_events[kind]
       end.select do |event|
-        event.command_name != 'configureFailPoint' &&
-          if @ignore_commands
-            !@ignore_commands.include?(event.command_name)
-          else
-            true
-          end
-      end.reject do |event|
-        %w(authenticate getnonce saslStart saslContinue).include?(event.command_name)
+        if event.respond_to?(:command_name)
+          event.command_name != 'configureFailPoint' &&
+            if @ignore_commands
+              !@ignore_commands.include?(event.command_name)
+            else
+              true
+            end
+        else
+          true
+        end
+      end
+      if observe_sensitive
+        events
+      else
+        events.reject do |event|
+          event.respond_to?(:command_name) &&
+            %w(authenticate getnonce saslStart saslContinue).include?(event.command_name)
+        end
       end
     end
 

data/spec/runners/unified/exceptions.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module Unified
 
   class Error < StandardError

data/spec/runners/unified/grid_fs_operations.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module Unified
 
   module GridFsOperations

data/spec/runners/unified/support_operations.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module Unified
 
   module SupportOperations

data/spec/runners/unified/test.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'runners/crud/requirement'
 require 'runners/unified/crud_operations'
 require 'runners/unified/grid_fs_operations'
@@ -36,10 +39,7 @@ module Unified
       end.map do |spec|
         spec['client']['useMultipleMongoses']
       end.compact.uniq
-      if mongoses.length > 1
-        raise Error::InvalidTest, "Conflicting useMultipleMongoses values"
-      end
-      @multiple_mongoses = mongoses.first
+      @multiple_mongoses = mongoses.any? { |v| v }
       @test_spec.freeze
       @subscribers = {}
       @options = opts
@@ -78,15 +78,28 @@ module Unified
 
         entity = case type
         when 'client'
-          # Handled earlier
-          spec.delete('useMultipleMongoses')
-
           if smc_opts = spec.use('uriOptions')
             opts = Mongo::URI::OptionsMapper.new.smc_to_ruby(smc_opts)
           else
             opts = {}
           end
 
+          if spec.use('useMultipleMongoses')
+            if ClusterConfig.instance.topology == :sharded
+              unless SpecConfig.instance.addresses.length > 1
+                raise "useMultipleMongoses requires more than one address in MONGODB_URI"
+              end
+            end
+          else
+            # If useMultipleMongoses isn't true, truncate the address
+            # list to the first address.
+            # This works OK in replica sets because the driver will discover
+            # the other set members, in standalone deployments because
+            # there is only one server, but changes behavior in
+            # sharded clusters compared to how the test suite is configured.
+            opts[:single_address] = true
+          end
+
           if store_events = spec.use('storeEventsAsEntities')
             store_event_names = {}
             store_events.each do |spec|
@@ -118,6 +131,7 @@ module Unified
           end
 
           create_client(**opts).tap do |client|
+            @observe_sensitive = spec.use('observeSensitiveCommands')
             if oe = spec.use('observeEvents')
               oe.each do |event|
                 case event
@@ -131,6 +145,13 @@ module Unified
                   if ignore_events = spec.use('ignoreCommandMonitoringEvents')
                     subscriber.ignore_commands(ignore_events)
                   end
+                when /\A(?:pool|connection)/
+                  subscriber = (@subscribers[client] ||= EventSubscriber.new)
+                  unless client.send(:monitoring).subscribers[Mongo::Monitoring::CONNECTION_POOL]&.include?(subscriber)
+                    client.subscribe(Mongo::Monitoring::CONNECTION_POOL, subscriber)
+                  end
+                  kind = event.sub('Event', '').gsub(/([A-Z])/) { "_#{$1}" }.sub('pool', 'Pool').downcase.to_sym
+                  subscriber.add_wanted_events(kind)
                 else
                   raise NotImplementedError, "Unknown event #{event}"
                 end
@@ -247,8 +268,10 @@ module Unified
             send(method_name, op)
           rescue Mongo::Error, BSON::String::IllegalKey => e
             if expected_error.use('isClientError')
-              unless BSON::String::IllegalKey === e
-                raise Error::ErrorMismatch, "Expected client error but got #{e}"
+              # isClientError doesn't actually mean a client error.
+              # It means anything other than OperationFailure. DRIVERS-1799
+              if Mongo::Error::OperationFailure === e
+                raise Error::ErrorMismatch, %Q,Expected not OperationFailure ("isClientError") but got #{e},
               end
             end
             if code = expected_error.use('errorCode')
@@ -347,19 +370,22 @@ module Unified
     end
 
     def kill_sessions
-      if options[:kill_sessions] != false
-        begin
-          root_authorized_client.command(
-            killAllSessions: [],
-          )
-        rescue Mongo::Error::OperationFailure => e
-          if e.code == 11601
-            # operation was interrupted, ignore
-          elsif e.code == 59
-            # no such command (old server), ignore
-          else
-            raise
-          end
+      begin
+        root_authorized_client.command(
+          killAllSessions: [],
+        )
+      rescue Mongo::Error::OperationFailure => e
+        if e.code == 11601
+          # operation was interrupted, ignore. SERVER-38335
+        elsif e.code == 13
+          # Unauthorized - e.g. when running in Atlas as part of
+          # drivers-atlas-testing, ignore. SERVER-54216
+        elsif e.code == 59
+          # no such command (old server), ignore
+        elsif e.code == 8000
+          # CMD_NOT_ALLOWED: killAllSessions - running against a serverless instance
+        else
+          raise
         end
       end
     end
@@ -378,8 +404,12 @@ module Unified
       when String
         [v, {}]
       else
+        addresses = SpecConfig.instance.addresses
+        if options[:single_address]
+          addresses = [addresses.first]
+        end
         [
-          SpecConfig.instance.addresses,
+          addresses,
           SpecConfig.instance.all_test_options,
         ]
       end

data/spec/runners/unified/test_group.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module Unified
 
   class TestGroup

data/spec/runners/unified/using_hash.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module Unified
 
   class UsingHash < Hash

data/spec/shared/bin/s3-copy

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'aws-sdk-s3'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: s3-copy options"
+
+  opts.on("-r", "--region=REGION", "AWS region to use (default us-east-1)") do |v|
+    options[:region] = v
+  end
+
+  opts.on("-p", "--param=KEY=VALUE", "Specify parameter for new files") do |v|
+    options[:params] ||= {}
+    k, v = v.split('=', 2)
+    options[:params][k.to_sym] = v
+  end
+
+  opts.on("-f", "--from=BUCKET:PATH", "Bucket name and key (or path) to copy from") do |v|
+    options[:from] = v
+  end
+
+  opts.on("-t", "--to=BUCKET:PATH", "Bucket name and key (or path) to write to (may be specified more than once)") do |v|
+    options[:to] ||= []
+    options[:to] << v
+  end
+end.parse!
+
+ENV['AWS_REGION'] ||= options[:region] || 'us-east-1'
+
+bucket, key = options.fetch(:from).split(':', 2)
+
+s3 = Aws::S3::Client.new
+
+options.fetch(:to).each do |dest|
+  STDERR.puts "Copying to #{dest}"
+  dbucket, dkey = dest.split(':', 2)
+  s3.copy_object(
+    bucket: dbucket,
+    key: dkey,
+    copy_source: "/#{bucket}/#{key}",
+    **options[:params] || {},
+  )
+end

data/spec/shared/bin/s3-upload

@@ -0,0 +1,69 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'aws-sdk-s3'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: s3-upload options"
+
+  opts.on("-r", "--region=REGION", "AWS region to use (default us-east-1)") do |v|
+    options[:region] = v
+  end
+
+  opts.on("-p", "--param=KEY=VALUE", "Specify parameter for S3 upload") do |v|
+    options[:params] ||= {}
+    k, v = v.split('=', 2)
+    options[:params][k.to_sym] = v
+  end
+
+  opts.on("-f", "--file=PATH", "Path to the file to upload, - to upload standard input") do |v|
+    options[:file] = v
+  end
+
+  opts.on("-w", "--write=BUCKET:PATH", "Bucket name and key (or path) to upload to") do |v|
+    options[:write] = v
+  end
+
+  opts.on("-c", "--copy=BUCKET:PATH", "Bucket name and key (or path) to copy to (may be specified more than once)") do |v|
+    options[:copy] ||= []
+    options[:copy] << v
+  end
+end.parse!
+
+ENV['AWS_REGION'] ||= options[:region] || 'us-east-1'
+
+def upload(f, options)
+  s3 = Aws::S3::Client.new
+  write = options.fetch(:write)
+  STDERR.puts "Writing #{write}"
+  bucket, key = write.split(':', 2)
+  s3.put_object(
+    body: f.read,
+    bucket: bucket,
+    key: key,
+    **options[:params] || {},
+  )
+  if copy = options[:copy]
+    copy.each do |dest|
+      STDERR.puts "Copying to #{dest}"
+      dbucket, dkey = dest.split(':', 2)
+      s3.copy_object(
+        bucket: dbucket,
+        key: dkey,
+        copy_source: "/#{bucket}/#{key}",
+        **options[:params] || {},
+      )
+    end
+  end
+end
+
+if options[:file] == '-'
+  upload(STDIN, options)
+elsif options[:file]
+  File.open(options[:file]) do |f|
+    upload(f, options)
+  end
+else
+  upload(STDIN, options)
+end