mongo 2.15.0.alpha → 2.15.0

data/spec/shared/share/haproxy-1.conf

@@ -0,0 +1,16 @@
+# Modeled after
+# https://github.com/mongodb-labs/drivers-evergreen-tools/blob/master/.evergreen/run-load-balancer.sh
+
+defaults
+  mode tcp
+  timeout connect 7s
+  timeout client 55s
+  timeout server 55s
+
+frontend mongos_frontend
+  bind *:27017
+  use_backend mongos_backend
+
+backend mongos_backend
+  mode tcp
+  server mongos_one 127.0.0.1:27117 check

data/spec/shared/share/haproxy-2.conf

@@ -0,0 +1,17 @@
+# Modeled after
+# https://github.com/mongodb-labs/drivers-evergreen-tools/blob/master/.evergreen/run-load-balancer.sh
+
+defaults
+  mode tcp
+  timeout connect 7s
+  timeout client 55s
+  timeout server 55s
+
+frontend mongos_frontend
+  bind *:27017
+  use_backend mongos_backend
+
+backend mongos_backend
+  mode tcp
+  server mongos_one 127.0.0.1:27117 check
+  server mongos_two 127.0.0.1:27118 check

data/spec/shared/shlib/server.sh

@@ -147,7 +147,9 @@ calculate_server_args() {
 
   local args="--setParameter enableTestCommands=1"
   
-  if test $mongo_version -ge 47; then
+  if test $mongo_version -ge 50; then
+    args="$args --setParameter acceptApiVersion2=1"
+  elif test $mongo_version -ge 47; then
     args="$args --setParameter acceptAPIVersion2=1"
   fi
   
@@ -160,15 +162,31 @@ calculate_server_args() {
   fi
   local uri_options=
   if test "$TOPOLOGY" = replica-set; then
-    args="$args --replicaset --name ruby-driver-rs --nodes 2 --arbiter"
+    args="$args --replicaset --name test-rs --nodes 2 --arbiter"
     export HAVE_ARBITER=1
   elif test "$TOPOLOGY" = sharded-cluster; then
-    args="$args --replicaset --nodes 1 --sharded 1 --name ruby-driver-rs"
+    args="$args --replicaset --nodes 2 --sharded 1 --name test-rs"
     if test -z "$SINGLE_MONGOS"; then
       args="$args --mongos 2"
     fi
-  else
+  elif test "$TOPOLOGY" = standalone; then
     args="$args --single"
+  elif test "$TOPOLOGY" = load-balanced; then
+    args="$args --replicaset --nodes 2 --sharded 1 --name test-rs --port 27117"
+    if test -z "$MRSS_ROOT"; then
+      echo "Please set MRSS_ROOT" 1>&2
+      exit 2
+    fi
+    if test -n "$SINGLE_MONGOS"; then
+      haproxy_config=$MRSS_ROOT/share/haproxy-1.conf
+    else
+      args="$args --mongos 2"
+      haproxy_config=$MRSS_ROOT/share/haproxy-2.conf
+    fi
+    uri_options="$uri_options&loadBalanced=true"
+  else
+    echo "Unknown topology: $TOPOLOGY" 1>&2
+    exit 1
   fi
   if test -n "$MMAPV1"; then
     args="$args --storageEngine mmapv1 --smallfiles --noprealloc"
@@ -287,4 +305,13 @@ launch_ocsp_mock() {
 launch_server() {
   local dbdir="$1"
   python -m mtools.mlaunch.mlaunch --dir "$dbdir" --binarypath "$BINDIR" $SERVER_ARGS
+
+  if test "$TOPOLOGY" = load-balanced; then
+    if test -z "$haproxy_config"; then
+      echo haproxy_config should have been set 1>&2
+      exit 3
+    fi
+    
+    haproxy -D -f $haproxy_config -p $mongodb_dir/haproxy.pid
+  fi
 }

data/spec/shared/shlib/set_env.sh

@@ -68,9 +68,12 @@ set_env_ruby() {
     export PATH=`pwd`/ruby-head/bin:`pwd`/ruby-head/lib/ruby/gems/2.6.0/bin:$PATH
     ruby --version
     ruby --version |grep dev
+  elif test "$SYSTEM_RUBY" = 1; then
+    # Nothing
+    :
   else
     if test "$USE_OPT_TOOLCHAIN" = 1; then
-      # nothing, also PATH is already set
+      # Nothing, also PATH is already set
       :
     elif true; then
 

data/spec/solo/clean_exit_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'mongo'
 
 describe 'Clean exit' do

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 require 'mrss/constraints'
@@ -11,7 +14,6 @@ require 'support/primary_socket'
 require 'support/cluster_tools'
 require 'rspec/retry'
 require 'support/monitoring_ext'
-require 'support/local_resource_registry'
 
 RSpec.configure do |config|
   config.include(Authorization)
@@ -19,7 +21,7 @@ RSpec.configure do |config|
   config.extend(Constraints)
 
   config.before(:all) do
-    if ClusterConfig.instance.fcv_ish >= '3.6'
+    if ClusterConfig.instance.fcv_ish >= '3.6' && !SpecConfig.instance.serverless? # Serverless instances do not support killAllSessions command.
       kill_all_server_sessions
     end
   end

data/spec/spec_tests/auth_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 require 'runners/auth'
@@ -15,24 +18,38 @@ describe 'Auth' do
             require_mongo_kerberos
           end
 
-          context 'when the auth configuration is invalid', unless: test.valid? do
-            it 'raises an error' do
-              expect do
-                test.client
-              end.to raise_error(Mongo::Auth::InvalidConfiguration)
-            end
-          end
+          if test.valid?
+
+            context 'the auth configuration is valid' do
+              if test.credential
+
+                it 'creates a client with options matching the credential' do
+                  expect(test.actual_client_options).to eq(test.expected_credential)
+                end
 
-          context 'when the auth configuration is valid' do
-            context 'with empty credentials', if: test.valid? && test.credential.nil? do
-              it 'creates a client with no credential information' do
-                expect(test.client).to have_blank_credentials
+                it 'creates a user with attributes matching the credential' do
+                  expect(test.actual_user_attributes).to eq(test.expected_credential)
+                end
+              else
+
+                context 'with empty credentials' do
+                  it 'creates a client with no credential information' do
+                    expect(test.client).to have_blank_credentials
+                  end
+                end
               end
             end
 
-            it 'creates a client with the correct credentials', if: test.valid? && test.credential do
-              expect(test.received_credential).to eq(test.expected_credential)
+          else
+
+            context 'the auth configuration is invalid' do
+              it 'raises an error' do
+                expect do
+                  test.client
+                end.to raise_error(Mongo::Auth::InvalidConfiguration)
+              end
             end
+
           end
         end
       end

data/spec/spec_tests/change_streams_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 require 'runners/crud'

data/spec/spec_tests/change_streams_unified_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+require 'runners/unified'
+
+base = "#{CURRENT_PATH}/spec_tests/data/change_streams_unified"
+CHANGE_STREAM_UNIFIED_TESTS = Dir.glob("#{base}/**/*.yml").sort
+
+describe 'Change stream unified spec tests' do
+  define_unified_spec_tests(base, CHANGE_STREAM_UNIFIED_TESTS)
+end

data/spec/spec_tests/client_side_encryption_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 require 'runners/crud'

data/spec/spec_tests/cmap_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 require 'runners/cmap'

data/spec/spec_tests/collection_management_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+require 'runners/unified'
+
+base = "#{CURRENT_PATH}/spec_tests/data/collection_management"
+COLLECTION_MANAGEMENT_TESTS = Dir.glob("#{base}/**/*.yml").sort
+
+describe 'Collection management spec tests' do
+  define_unified_spec_tests(base, COLLECTION_MANAGEMENT_TESTS)
+end

data/spec/spec_tests/command_monitoring_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 require 'runners/crud'
@@ -6,40 +9,42 @@ require 'runners/command_monitoring'
 describe 'Command Monitoring Events' do
 
   COMMAND_MONITORING_TESTS.each do |file|
+    context File.basename(file) do
 
-    spec = Mongo::CommandMonitoring::Spec.new(file)
+      spec = Mongo::CommandMonitoring::Spec.new(file)
 
-    spec.tests.each do |test|
-      context(test.description) do
+      spec.tests.each do |test|
+        context(test.description) do
 
-        if test.min_server_fcv
-          min_server_fcv test.min_server_fcv
-        end
-        if test.max_server_version
-          max_server_version test.max_server_version
-        end
+          if test.min_server_fcv
+            min_server_fcv test.min_server_fcv
+          end
+          if test.max_server_version
+            max_server_version test.max_server_version
+          end
 
-        let(:subscriber) do
-          EventSubscriber.new
-        end
+          let(:subscriber) do
+            EventSubscriber.new
+          end
 
-        let(:monitoring) do
-          authorized_client.send(:monitoring)
-        end
+          let(:monitoring) do
+            authorized_client.send(:monitoring)
+          end
 
-        before do
-          authorized_collection.find.delete_many
-          authorized_client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
-        end
+          before do
+            authorized_collection.find.delete_many
+            authorized_client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+          end
 
-        test.expectations.each_with_index do |expectation, index|
+          test.expectations.each_with_index do |expectation, index|
 
-          it "generates a #{expectation.event_name} for #{expectation.command_name}" do
-            begin
-              test.run(authorized_collection, subscriber)
-              check_event(subscriber, index, expectation)
-            rescue Mongo::Error::OperationFailure, Mongo::Error::BulkWriteError
-              check_event(subscriber, index, expectation)
+            it "generates a #{expectation.event_name} for #{expectation.command_name}" do
+              begin
+                test.run(authorized_collection, subscriber)
+                check_event(subscriber, index, expectation)
+              rescue Mongo::Error::OperationFailure, Mongo::Error::BulkWriteError
+                check_event(subscriber, index, expectation)
+              end
             end
           end
         end

data/spec/spec_tests/command_monitoring_unified_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+require 'runners/unified'
+
+base = "#{CURRENT_PATH}/spec_tests/data/command_monitoring_unified"
+COMMAND_MONITORING_UNIFIED_TESTS = Dir.glob("#{base}/**/*.yml").sort
+
+describe 'Command monitoring unified spec tests' do
+  define_unified_spec_tests(base, COMMAND_MONITORING_UNIFIED_TESTS)
+end

data/spec/spec_tests/connection_string_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'lite_spec_helper'
 
 require 'runners/connection_string'

data/spec/spec_tests/crud_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 require 'runners/crud'

data/spec/spec_tests/crud_unified_spec.rb

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

data/spec/spec_tests/data/change_streams/change-streams-errors.yml

@@ -41,7 +41,7 @@ tests:
             aggregate: *collection_name
             cursor: {}
             pipeline:
-              - 
+              -
                 $changeStream: {}
               -
                 $unsupported: foo
@@ -79,9 +79,9 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 216 # An error code that's not on the old blacklist or whitelist
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 216 # An error code that's not on the old deny or allow lists
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -98,4 +98,4 @@ tests:
             z: 3
     result:
       error:
-        code: 216
+        code: 216

data/spec/spec_tests/data/change_streams/{change-streams-resume-whitelist.yml → change-streams-resume-allowlist.yml}

@@ -9,10 +9,10 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          closeConnection: true
+        failCommands: ["getMore"]
+        closeConnection: true
     target: collection
-    topology: 
+    topology:
       - replicaset
       - sharded
     changeStreamPipeline: []
@@ -73,11 +73,11 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 6
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 6
+        closeConnection: false
     target: collection
-    topology: 
+    topology:
       - replicaset
       - sharded
     changeStreamPipeline: []
@@ -138,9 +138,9 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 7
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 7
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -203,9 +203,9 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 89
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 89
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -268,9 +268,9 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 91
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 91
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -333,9 +333,9 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 189
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 189
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -398,9 +398,9 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 262
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 262
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -463,9 +463,9 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 9001
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 9001
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -521,16 +521,16 @@ tests:
             x:
               $numberInt: "1"
   -
-    description: "change stream resumes after NotMaster"
+    description: "change stream resumes after NotWritablePrimary"
     minServerVersion: "4.2"
     maxServerVersion: "4.2.99"
     failPoint:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 10107
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 10107
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -593,9 +593,9 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 11600
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 11600
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -658,9 +658,9 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 11602
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 11602
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -716,16 +716,16 @@ tests:
             x:
               $numberInt: "1"
   -
-    description: "change stream resumes after NotMasterNoSlaveOk"
+    description: "change stream resumes after NotPrimaryNoSecondaryOk"
     minServerVersion: "4.2"
     maxServerVersion: "4.2.99"
     failPoint:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 13435
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 13435
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -781,16 +781,16 @@ tests:
             x:
               $numberInt: "1"
   -
-    description: "change stream resumes after NotMasterOrSecondary"
+    description: "change stream resumes after NotPrimaryOrSecondary"
     minServerVersion: "4.2"
     maxServerVersion: "4.2.99"
     failPoint:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 13436
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 13436
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -853,9 +853,9 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 63
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 63
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -918,9 +918,9 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 150
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 150
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -983,9 +983,9 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 234
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 234
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -1048,9 +1048,9 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 133
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 133
+        closeConnection: false
     target: collection
     topology:
       - replicaset
@@ -1114,9 +1114,9 @@ tests:
       configureFailPoint: failCommand
       mode: { times: 1 }
       data:
-          failCommands: ["getMore"]
-          errorCode: 43
-          closeConnection: false
+        failCommands: ["getMore"]
+        errorCode: 43
+        closeConnection: false
     target: collection
     topology:
       - replicaset