Merge branch 'master' into merge-9.0-stable-to-master

Author: johnnyshields

.evergreen/config.yml

@@ -39,7 +39,7 @@ functions:
           git submodule update --init --recursive
 
   "create expansions":
-    # Make an evergreen expansion file with dynamic values
+    # Make an evergreen exapansion file with dynamic values
     - command: shell.exec
       params:
         working_dir: "src"
@@ -427,6 +427,10 @@ axes:
         display_name: Sharded Cluster
         variables:
            TOPOLOGY: "sharded-cluster"
+      - id: "load-balanced"
+        display_name: Load Balanced
+        variables:
+           TOPOLOGY: "load-balanced"
 
   - id: "auth"
     display_name: Authentication
@@ -639,22 +643,22 @@ buildvariants:
   tasks:
     - name: "test"
 
-- matrix_name: "ruby-3.3"
+- matrix_name: "ruby-3.2 + db-7.0"
   matrix_spec:
     ruby: ["ruby-3.2"]
     driver: ["current"]
-    topology: '*'
+    topology: ['standalone', 'replica-set', 'sharded-cluster']
     mongodb-version: ['7.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
 
-- matrix_name: "ruby-3.2"
+- matrix_name: "ruby-3.2 + db-6.0"
   matrix_spec:
     ruby: ["ruby-3.2"]
     driver: ["current"]
-    topology: '*'
+    topology: ['standalone', 'replica-set', 'sharded-cluster']
     mongodb-version: ['6.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -665,7 +669,7 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-3.1"]
     driver: ["current"]
-    topology: '*'
+    topology: ['standalone', 'replica-set', 'sharded-cluster']
     mongodb-version: ['6.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -698,7 +702,7 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-2.7"]
     driver: ["current"]
-    topology: '*'
+    topology: ['standalone', 'replica-set', 'sharded-cluster']
     mongodb-version: ['4.4']
     os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"

.evergreen/config/axes.yml.erb

@@ -54,6 +54,10 @@ axes:
         display_name: Sharded Cluster
         variables:
            TOPOLOGY: "sharded-cluster"
+      - id: "load-balanced"
+        display_name: Load Balanced
+        variables:
+           TOPOLOGY: "load-balanced"
 
   - id: "auth"
     display_name: Authentication

.evergreen/config/commands.yml.erb

@@ -13,7 +13,7 @@ functions:
           git submodule update --init --recursive
 
   "create expansions":
-    # Make an evergreen exapanstion file with dynamic values
+    # Make an evergreen exapansion file with dynamic values
     - command: shell.exec
       params:
         working_dir: "src"

.evergreen/config/variants.yml.erb

@@ -10,22 +10,22 @@ buildvariants:
   tasks:
     - name: "test"
 
-- matrix_name: "ruby-3.3"
+- matrix_name: "ruby-3.2 + db-7.0"
   matrix_spec:
     ruby: ["ruby-3.2"]
     driver: ["current"]
-    topology: '*'
+    topology: ['standalone', 'replica-set', 'sharded-cluster']
     mongodb-version: ['7.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   tasks:
     - name: "test"
 
-- matrix_name: "ruby-3.2"
+- matrix_name: "ruby-3.2 + db-6.0"
   matrix_spec:
     ruby: ["ruby-3.2"]
     driver: ["current"]
-    topology: '*'
+    topology: ['standalone', 'replica-set', 'sharded-cluster']
     mongodb-version: ['6.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -36,7 +36,7 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-3.1"]
     driver: ["current"]
-    topology: '*'
+    topology: ['standalone', 'replica-set', 'sharded-cluster']
     mongodb-version: ['6.0']
     os: ubuntu-22.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
@@ -69,7 +69,7 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-2.7"]
     driver: ["current"]
-    topology: '*'
+    topology: ['standalone', 'replica-set', 'sharded-cluster']
     mongodb-version: ['4.4']
     os: ubuntu-20.04
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"

.evergreen/run-tests.sh

@@ -8,9 +8,11 @@ set -o errexit  # Exit the script with error if any of the commands fail
 #       RVM_RUBY                Define the Ruby version to test with, using its RVM identifier.
 #                               For example: "ruby-3.0" or "jruby-9.2"
 
-. `dirname "$0"`/../spec/shared/shlib/distro.sh
-. `dirname "$0"`/../spec/shared/shlib/set_env.sh
-. `dirname "$0"`/../spec/shared/shlib/server.sh
+MRSS_ROOT=`dirname "$0"`/../spec/shared
+
+. $MRSS_ROOT/shlib/distro.sh
+. $MRSS_ROOT/shlib/set_env.sh
+. $MRSS_ROOT/shlib/server.sh
 . `dirname "$0"`/functions.sh
 
 arch=`host_distro`
@@ -28,6 +30,10 @@ prepare_server $arch
 
 install_mlaunch_venv
 
+if test "$TOPOLOGY" = load-balanced; then
+  install_haproxy
+fi
+
 # Launching mongod under $MONGO_ORCHESTRATION_HOME
 # makes its log available through log collecting machinery
 

.github/workflows/test.yml

@@ -7,145 +7,22 @@ name: Run Mongoid Tests
 - pull_request
 jobs:
   build:
-    name: "${{matrix.ruby}} drv:${{matrix.driver}} db:${{matrix.mongodb}}
+    name: "${{matrix.ruby}} db:${{matrix.mongodb}}
       rails:${{matrix.rails}} fle:${{matrix.fle}} ${{matrix.topology}}"
     env:
       CI: true
       TESTOPTS: "-v"
-    runs-on: ${{matrix.os}}
-    continue-on-error: "${{matrix.experimental}}"
+      BUNDLE_GEMFILE: "${{ matrix.rails == '' && 'Gemfile' || format('gemfiles/rails-{0}.gemfile', matrix.rails) }}"
+    runs-on: ubuntu-22.04
+    continue-on-error: false
     strategy:
       fail-fast: false
       matrix:
-        include:
-        - mongodb: '7.0'
-          ruby: ruby-3.3
-          topology: replica_set
-          os: ubuntu-20.04
-          task: test
-          driver: current
-          gemfile: Gemfile
-          experimental: false
-        - mongodb: '6.0'
-          ruby: ruby-3.2
-          topology: replica_set
-          os: ubuntu-20.04
-          task: test
-          driver: current
-          gemfile: Gemfile
-          experimental: false
-        - mongodb: '6.0'
-          ruby: ruby-3.1
-          topology: replica_set
-          os: ubuntu-20.04
-          task: test
-          driver: current
-          gemfile: Gemfile
-          experimental: false
-        - mongodb: '6.0'
-          ruby: ruby-3.0
-          topology: replica_set
-          os: ubuntu-20.04
-          task: test
-          driver: stable
-          gemfile: gemfiles/driver_stable.gemfile
-          experimental: false
-        - mongodb: '7.0'
-          ruby: ruby-3.3
-          topology: server
-          os: ubuntu-22.04
-          task: test
-          driver: current
-          rails: '8.0'
-          fle: helper
-          gemfile: gemfiles/rails-8.0.gemfile
-          experimental: false
-        - mongodb: '7.0'
-          ruby: ruby-3.2
-          topology: server
-          os: ubuntu-20.04
-          task: test
-          driver: current
-          rails: '7.2'
-          fle: helper
-          gemfile: gemfiles/rails-7.2.gemfile
-          experimental: false
-        - mongodb: '7.0'
-          ruby: ruby-3.2
-          topology: server
-          os: ubuntu-20.04
-          task: test
-          driver: current
-          rails: '7.1'
-          fle: helper
-          gemfile: gemfiles/rails-7.1.gemfile
-          experimental: false
-        - mongodb: '7.0'
-          ruby: ruby-3.1
-          topology: server
-          os: ubuntu-20.04
-          task: test
-          driver: current
-          rails: '7.0'
-          fle: helper
-          gemfile: gemfiles/rails-7.0.gemfile
-          experimental: false
-        - mongodb: '6.0'
-          ruby: ruby-3.1
-          topology: server
-          os: ubuntu-20.04
-          task: test
-          driver: current
-          rails: '6.1'
-          fle: helper
-          gemfile: gemfiles/rails-6.1.gemfile
-          experimental: false
-        - mongodb: '6.0'
-          ruby: ruby-3.0
-          topology: server
-          os: ubuntu-20.04
-          task: test
-          driver: current
-          rails: '6.1'
-          fle: helper
-          gemfile: gemfiles/rails-6.1.gemfile
-          experimental: false
-        - mongodb: '6.0'
-          ruby: ruby-3.0
-          topology: server
-          os: ubuntu-20.04
-          task: test
-          driver: current
-          rails: '6.0'
-          fle: helper
-          gemfile: gemfiles/rails-6.0.gemfile
-          experimental: false
-        - mongodb: '6.0'
-          ruby: jruby-9.4
-          topology: server
-          os: ubuntu-20.04
-          task: test
-          driver: current
-          rails: '6.0'
-          fle: helper
-          gemfile: gemfiles/rails-6.0.gemfile
-          experimental: false
-        - mongodb: '5.0'
-          ruby: ruby-3.1
-          topology: replica_set
-          os: ubuntu-20.04
-          task: test
-          driver: current
-          gemfile: Gemfile
-          experimental: false
-        - mongodb: '4.4'
-          ruby: ruby-2.7
-          topology: replica_set
-          os: ubuntu-20.04
-          task: test
-          driver: current
-          gemfile: Gemfile
-          experimental: false
+        ruby: [ "3.3" ]
+        mongodb: [ "8.0" ]
+        rails: [ ~, "8.0" ]
+        fle: [ ~, "helper" ]
+        topology: [ replica_set, sharded_cluster ]
 
     steps:
     - name: repo checkout
@@ -169,20 +46,20 @@ jobs:
       uses: ruby/setup-ruby@v1
       env:
         FLE: "${{matrix.fle}}"
-        BUNDLE_GEMFILE: "${{matrix.gemfile}}"
+        BUNDLE_GEMFILE: "${{env.BUNDLE_GEMFILE}}"
       with:
         ruby-version: "${{matrix.ruby}}"
         bundler: 2
     - name: bundle
       run: bundle install --jobs 4 --retry 3
       env:
         FLE: "${{matrix.fle}}"
-        BUNDLE_GEMFILE: "${{matrix.gemfile}}"
+        BUNDLE_GEMFILE: "${{env.BUNDLE_GEMFILE}}"
     - name: test
       timeout-minutes: 60
       continue-on-error: "${{matrix.experimental}}"
       run: bundle exec rake ci
       env:
-        BUNDLE_GEMFILE: "${{matrix.gemfile}}"
+        BUNDLE_GEMFILE: "${{env.BUNDLE_GEMFILE}}"
         FLE: "${{matrix.fle}}"
         MONGODB_URI: "${{ steps.start-mongodb.outputs.cluster-uri }}"

Gemfile

@@ -17,3 +17,6 @@ if RUBY_PLATFORM =~ /java/
 end
 
 gem 'i18n', *i18n_versions
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: %i[ windows jruby ]

gemfiles/standard.rb

@@ -49,6 +49,6 @@ def standard_dependencies
   end
 
   if ENV['FLE'] == 'helper'
-    gem 'libmongocrypt-helper', '~> 1.8.0'
+    gem 'libmongocrypt-helper', '~> 1.14.0'
   end
 end

lib/mongoid/association/embedded/embeds_one/proxy.rb

@@ -36,8 +36,8 @@ def initialize(base, target, association)
               bind_one
               characterize_one(_target)
               update_attributes_hash(_target)
-              _base._reset_memoized_descendants!
               _target.save if persistable?
+              _base._reset_memoized_descendants!
             end
           end
 

lib/mongoid/contextual/mongo.rb

@@ -1122,7 +1122,7 @@ def retrieve_nth_to_last(n)
       end
 
       def retrieve_nth_to_last_with_limit(n, limit)
-        v = view.sort(inverse_sorting).skip(n).limit(limit || 1)
+        v = view.sort(inverse_sorting).limit(limit || 1)
         v = v.skip(n) if n > 0
         raw_docs = v.to_a.reverse
         process_raw_docs(raw_docs, limit)