Merge remote-tracking branch 'remotes/origin/master' into MONGOID-5136-super-touch

Author: johnnyshields

.evergreen/config.yml

@@ -347,22 +347,6 @@ axes:
         display_name: "MongoDB 3.6"
         variables:
            VERSION: "3.6"
-      - id: "3.4"
-        display_name: "MongoDB 3.4"
-        variables:
-           VERSION: "3.4"
-      - id: "3.2"
-        display_name: "MongoDB 3.2"
-        variables:
-           VERSION: "3.2"
-      - id: "3.0"
-        display_name: "MongoDB 3.0"
-        variables:
-           VERSION: "3.0"
-      - id: "2.6"
-        display_name: "MongoDB 2.6"
-        variables:
-           VERSION: "2.6"
   - id: "topology"
     display_name: Topology
     values:
@@ -420,6 +404,10 @@ axes:
         display_name: ruby-3.0
         variables:
           RVM_RUBY: "ruby-3.0"
+      - id: "ruby-3.1"
+        display_name: ruby-3.1
+        variables:
+          RVM_RUBY: "ruby-3.1"
       - id: "ruby-head"
         display_name: ruby-head
         variables:
@@ -440,10 +428,15 @@ axes:
       - id: ubuntu-18.04
         display_name: "Ubuntu 18.04"
         run_on: ubuntu1804-small
-
+      - id: ubuntu-20.04
+        display_name: "Ubuntu 20.04"
+        run_on: ubuntu2004-small
       - id: rhel70
         display_name: "RHEL 7.0"
         run_on: rhel70-small
+      - id: rhel80
+        display_name: "RHEL 8.0"
+        run_on: rhel80-small
   - id: "driver"
     display_name: Driver Version
     values:
@@ -483,6 +476,10 @@ axes:
         display_name: "Driver-min (JRuby)"
         variables:
           DRIVER: "min-jruby"
+      - id: bson-min
+        display_name: "BSON-min"
+        variables:
+          DRIVER: "bson-min"
   - id: "rails"
     display_name: Rails Version
     values:
@@ -506,6 +503,10 @@ axes:
         display_name: "Rails 6.1"
         variables:
           RAILS: "6.1"
+      - id: "7.0"
+        display_name: "Rails 7.0"
+        variables:
+          RAILS: "7.0"
   - id: "i18n"
     display_name: I18n version
     values:
@@ -531,15 +532,27 @@ axes:
           APP_TESTS: yes
 
 buildvariants:
+- matrix_name: "ruby-3.1"
+  matrix_spec:
+    ruby: ["ruby-3.1"]
+    driver: ["current"]
+    topology: '*'
+    mongodb-version: ['5.0']
+  display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
+  run_on:
+    - ubuntu2004-small
+  tasks:
+    - name: "test"
+
 - matrix_name: "ruby-3.0"
   matrix_spec:
     ruby: ["ruby-3.0"]
     driver: ["current"]
-    topology: '*'
+    topology: ['replica-set']
     mongodb-version: ['5.0']
-  display_name: "${ruby}, ${driver}, ${rails}, ${mongodb-version}, ${topology}"
+  display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   run_on:
-    - ubuntu1804-small
+    - ubuntu2004-small
   tasks:
     - name: "test"
 
@@ -571,19 +584,19 @@ buildvariants:
   matrix_spec:
     ruby: ["ruby-2.6"]
     driver: ["current"]
-    topology: '*'
+    topology: ['replica-set']
     mongodb-version: ['4.0']
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   run_on:
-    - ubuntu1804-small
+    - ubuntu1604-small
   tasks:
     - name: "test"
 
 - matrix_name: "ruby-2.5"
   matrix_spec:
     ruby: ["ruby-2.5"]
     driver: ["current"]
-    topology: '*'
+    topology: ['replica-set']
     mongodb-version: ['3.6']
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   run_on:
@@ -594,12 +607,12 @@ buildvariants:
 - matrix_name: "driver-upcoming"
   matrix_spec:
     driver: [master, stable]
-    ruby: ["ruby-3.0"]
+    ruby: ["ruby-3.1"]
     mongodb-version: "5.0"
     topology: ['replica-set', 'sharded-cluster']
   display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
   run_on:
-    - rhel70-small
+    - rhel80-small
   tasks:
      - name: "test"
 
@@ -627,6 +640,31 @@ buildvariants:
   tasks:
      - name: "test"
 
+- matrix_name: "rails-7"
+  matrix_spec:
+    ruby: ["ruby-3.0"]
+    driver: ["current"]
+    mongodb-version: "5.0"
+    topology: "standalone"
+    rails: ['7.0']
+  display_name: "${rails}, ${driver}, ${mongodb-version}"
+  run_on:
+    - rhel70-small
+  tasks:
+    - name: "test"
+
+- matrix_name: "bson-min"
+  matrix_spec:
+    driver: [min]
+    ruby: ["ruby-2.7"]
+    mongodb-version: "5.0"
+    topology: "standalone"
+  display_name: "${ruby}, ${driver}, ${mongodb-version}, ${topology}"
+  run_on:
+    - ubuntu1804-small
+  tasks:
+    - name: "test"
+
 - matrix_name: "rails-6"
   matrix_spec:
     ruby: ["ruby-3.0"]
@@ -636,7 +674,7 @@ buildvariants:
     rails: ['6.0', '6.1']
   display_name: "${rails}, ${driver}, ${mongodb-version}"
   run_on:
-    - rhel70-small
+    - rhel80-small
   tasks:
      - name: "test"
 
@@ -680,19 +718,20 @@ buildvariants:
   tasks:
      - name: "test"
 
-- matrix_name: app-tests-ruby-3.0
-  matrix_spec:
-    ruby: ruby-3.0
-    driver: ["current"]
-    mongodb-version: '5.0'
-    topology: standalone
-    app-tests: yes
-    rails: ['6.0', '6.1']
-  display_name: "app tests ${driver}, ${ruby}, ${rails}"
-  run_on:
-    - ubuntu1804-small
-  tasks:
-    - name: "test"
+# https://jira.mongodb.org/browse/MONGOID-5216
+# - matrix_name: app-tests-ruby-3
+#   matrix_spec:
+#     ruby: ["ruby-3.0", "ruby-3.1"]
+#     driver: ["current"]
+#     mongodb-version: '5.0'
+#     topology: standalone
+#     app-tests: yes
+#     rails: ['6.0', '6.1']
+#   display_name: "app tests ${driver}, ${ruby}, ${rails}"
+#   run_on:
+#     - ubuntu2004-small
+#   tasks:
+#     - name: "test"
 
 - matrix_name: app-tests-ruby-2.7
   matrix_spec:

.evergreen/functions.sh

@@ -9,7 +9,7 @@ set_env_vars() {
   AUTH=${AUTH:-noauth}
   SSL=${SSL:-nossl}
   MONGODB_URI=${MONGODB_URI:-}
-  TOPOLOGY=${TOPOLOGY:-server}
+  TOPOLOGY=${TOPOLOGY:-standalone}
   DRIVERS_TOOLS=${DRIVERS_TOOLS:-}
 
   if [ "$AUTH" != "noauth" ]; then

.evergreen/make-github-actions

@@ -4,7 +4,13 @@
 # TODO: Support i18n-fallbacks test
 # TODO: Support app-tests tests
 
+# Note on topology: server:
+# The GH actions use mongo-orchestration, which uses a "server" topology for
+# the standalone one. See transform_node! below for the mapping of all
+# topologies.
+
 require 'fileutils'
+require 'active_support'
 require 'active_support/dependencies/autoload'
 require 'active_support/core_ext'
 require 'yaml'
@@ -240,7 +246,7 @@ class Transmogrifier
 
   def step_mongodb
     {
-      id: "start-mongodb"
+      id: "start-mongodb",
       name: "start mongodb",
       uses: "mongodb-labs/drivers-evergreen-tools@master",
       with: {

.evergreen/run-tests.sh

@@ -66,6 +66,9 @@ elif test "$DRIVER" = "oldstable"; then
 elif test "$DRIVER" = "min"; then
   bundle install --gemfile=gemfiles/driver_min.gemfile
   BUNDLE_GEMFILE=gemfiles/driver_min.gemfile
+elif test "$DRIVER" = "bson-min"; then
+  bundle install --gemfile=gemfiles/bson_min.gemfile
+  BUNDLE_GEMFILE=gemfiles/bson_min.gemfile
 elif test "$DRIVER" = "stable-jruby"; then
   bundle install --gemfile=gemfiles/driver_stable_jruby.gemfile
   BUNDLE_GEMFILE=gemfiles/driver_stable_jruby.gemfile
@@ -96,15 +99,15 @@ set +e
 if test -n "$TEST_CMD"; then
   eval $TEST_CMD
 elif test -n "$TEST_I18N_FALLBACKS"; then
-  bundle exec rspec spec/integration/i18n_fallbacks_spec.rb
+  bundle exec rspec spec/integration/i18n_fallbacks_spec.rb spec/mongoid/criteria_spec.rb spec/mongoid/contextual/mongo_spec.rb
 elif test -n "$APP_TESTS"; then
   # Need recent node for rails
   export N_PREFIX=$HOME/.n
   curl -o $HOME/n --retry 3 https://raw.githubusercontent.com/tj/n/master/bin/n
   bash $HOME/n stable
   export PATH=$HOME/.n/bin:$PATH
   npm -g install yarn
-  
+
   bundle exec rspec spec/integration/app_spec.rb
 else
   bundle exec rake ci
@@ -118,6 +121,6 @@ if test -f tmp/rspec-all.json; then
   mv tmp/rspec-all.json tmp/rspec.json
 fi
 
-python -m mtools.mlaunch.mlaunch stop --dir "$dbdir"
+python2 -m mtools.mlaunch.mlaunch stop --dir "$dbdir"
 
 exit ${test_status}

.github/workflows/test.yml

@@ -18,6 +18,26 @@ jobs:
       fail-fast: false
       matrix:
         include:
+        - mongodb: '5.0'
+          ruby: ruby-3.1
+          topology: server
+          os: ubuntu-20.04
+          task: test
+          driver: current
+          rails:
+          i18n:
+          gemfile: Gemfile
+          experimental: false
+        - mongodb: '5.0'
+          ruby: ruby-3.1
+          topology: replica_set
+          os: ubuntu-20.04
+          task: test
+          driver: current
+          rails:
+          i18n:
+          gemfile: Gemfile
+          experimental: false
         - mongodb: '5.0'
           ruby: ruby-3.0
           topology: server
@@ -109,7 +129,7 @@ jobs:
           gemfile: Gemfile
           experimental: false
         - mongodb: '5.0'
-          ruby: ruby-3.0
+          ruby: ruby-3.1
           topology: replica_set
           os: ubuntu-20.04
           task: test
@@ -158,6 +178,46 @@ jobs:
           i18n:
           gemfile: gemfiles/driver_min.gemfile
           experimental: false
+        - mongodb: '5.0'
+          ruby: ruby-3.1
+          topology: server
+          os: ubuntu-20.04
+          task: test
+          driver: current
+          rails: '7.0'
+          i18n:
+          gemfile: gemfiles/rails-7.0.gemfile
+          experimental: false
+        - mongodb: '5.0'
+          ruby: ruby-3.1
+          topology: server
+          os: ubuntu-20.04
+          task: test
+          driver: current
+          rails: '6.1'
+          i18n:
+          gemfile: gemfiles/rails-6.1.gemfile
+          experimental: false
+        - mongodb: '5.0'
+          ruby: ruby-3.0
+          topology: server
+          os: ubuntu-20.04
+          task: test
+          driver: current
+          rails: '7.0'
+          i18n:
+          gemfile: gemfiles/rails-7.0.gemfile
+          experimental: false
+        - mongodb: '5.0'
+          ruby: ruby-3.0
+          topology: server
+          os: ubuntu-20.04
+          task: test
+          driver: current
+          rails: '6.1'
+          i18n:
+          gemfile: gemfiles/rails-6.1.gemfile
+          experimental: false
         - mongodb: '5.0'
           ruby: ruby-3.0
           topology: server

SECURITY.md

@@ -0,0 +1,19 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 7.3     | :white_check_mark: |
+| 7.2     | :white_check_mark: |
+| 7.1     | :white_check_mark: |
+| 7.0     | :white_check_mark: |
+| < 7.0   | :x:                |
+
+## Reporting a Vulnerability
+
+Please [follow the instructions here](https://docs.mongodb.com/manual/tutorial/create-a-vulnerability-report/)
+to report a vulnerability.

docs/README.md

@@ -7,6 +7,8 @@ tutorials and the reference.
 To build the documentation locally for review, install `sphinx` and
 `sphinx-book-theme`, then execute `make html` in this directory:
 
-    pip install sphinx sphinx-book-theme
+    pip install 'sphinx<4.3' sphinx-book-theme
     make html
 
+Note: sphinx 4.3 is currently breaking when trying to render Mongoid
+documentation.