mongoid 7.4.0 → 7.4.1

data/spec/shared/shlib/server.sh

@@ -46,44 +46,54 @@ prepare_server() {
   if test "$MONGODB_VERSION" = latest; then
     # Test on the most recent published 4.3 release.
     # https://jira.mongodb.org/browse/RUBY-1724
-    echo 'Using "latest" server is not currently implemented' 1>&2
-    exit 1
+
+    . $PROJECT_DIRECTORY/.mod/drivers-evergreen-tools/.evergreen/download-mongodb.sh
+
+    get_distro
+    get_mongodb_download_url_for "$DISTRO" "latest"
+    prepare_server_from_url $MONGODB_DOWNLOAD_URL
   else
     download_version="$MONGODB_VERSION"
+    url=`$(dirname $0)/get-mongodb-download-url $download_version $arch`
+    prepare_server_from_url $url
   fi
 
-  url=`$(dirname $0)/get-mongodb-download-url $download_version $arch`
-
-  prepare_server_from_url $url
 }
 
 prepare_server_from_url() {
   url=$1
 
-  mongodb_dir="$MONGO_ORCHESTRATION_HOME"/mdb
+  dirname=`basename $url |sed -e s/.tgz//`
+  mongodb_dir="$MONGO_ORCHESTRATION_HOME"/mdb/"$dirname"
   mkdir -p "$mongodb_dir"
-  curl --retry 3 $url |tar xz -C "$mongodb_dir" -f -
-  BINDIR="$mongodb_dir"/`basename $url |sed -e s/.tgz//`/bin
+  curl --retry 3 $url | tar xz -C "$mongodb_dir" --strip-components 1 -f -
+  BINDIR="$mongodb_dir"/bin
   export PATH="$BINDIR":$PATH
 }
 
 install_mlaunch_virtualenv() {
-  python2 -V || true
-  if ! python2 -m virtualenv -h >/dev/null; then
+  python3 -V || true
+  if ! python3 -m virtualenv -h >/dev/null; then
     # Current virtualenv fails with
     # https://github.com/pypa/virtualenv/issues/1630
-    python2 -m pip install 'virtualenv<20' --user
+    python3 -m pip install 'virtualenv<20' --user
   fi
   if test "$USE_SYSTEM_PYTHON_PACKAGES" = 1 &&
-    python2 -m pip list |grep mtools-legacy
+    python3 -m pip list |grep mtools
   then
     # Use the existing mtools-legacy
     :
   else
     venvpath="$MONGO_ORCHESTRATION_HOME"/venv
-    python2 -m virtualenv -p python2 $venvpath
+    python3 -m virtualenv -p python3 $venvpath
     . $venvpath/bin/activate
-    pip install 'mtools-legacy[mlaunch]'
+    # [mlaunch] does not work:
+    # https://github.com/rueckstiess/mtools/issues/856
+    # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
+    #pip install 'mtools==1.7' 'pymongo==4.1' python-dateutil psutil
+    
+    # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
+    pip install 'mtools-legacy[mlaunch]' 'pymongo<4' python-dateutil
   fi
 }
 
@@ -96,7 +106,8 @@ install_mlaunch_pip() {
   python -V || true
   python3 -V || true
   pythonpath="$MONGO_ORCHESTRATION_HOME"/python
-  pip install -t "$pythonpath" 'mtools-legacy[mlaunch]'
+  # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
+  pip install -t "$pythonpath" 'mtools-legacy[mlaunch]' 'pymongo<4' python-dateutil
   export PATH="$pythonpath/bin":$PATH
   export PYTHONPATH="$pythonpath"
 }
@@ -120,7 +131,8 @@ install_mlaunch_git() {
     virtualenv -p python3 $venvpath
     . $venvpath/bin/activate
 
-    pip3 install psutil pymongo
+    # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
+    pip3 install psutil pymongo python-dateutil
 
     git clone $repo mlaunch
     cd mlaunch
@@ -135,7 +147,8 @@ install_mlaunch_git() {
     virtualenv $venvpath
     . $venvpath/bin/activate
 
-    pip install psutil pymongo
+    # dateutil dependency is missing in mtools: https://github.com/rueckstiess/mtools/issues/864
+    pip install psutil pymongo python-dateutil
 
     git clone $repo mlaunch
     (cd mlaunch &&
@@ -160,7 +173,7 @@ calculate_server_args() {
   fi
 
   if test $mongo_version = latest; then
-    mongo_version=49
+    mongo_version=60
   fi
 
   local args="--setParameter enableTestCommands=1"
@@ -321,7 +334,7 @@ launch_ocsp_mock() {
 
 launch_server() {
   local dbdir="$1"
-  python2 -m mtools.mlaunch.mlaunch --dir "$dbdir" --binarypath "$BINDIR" $SERVER_ARGS
+  python3 -m mtools.mlaunch.mlaunch --dir "$dbdir" --binarypath "$BINDIR" $SERVER_ARGS
 
   if test "$TOPOLOGY" = sharded-cluster && test $MONGODB_VERSION = 3.6; then
     # On 3.6 server the sessions collection is not immediately available,

data/spec/shared/shlib/set_env.sh

@@ -45,6 +45,43 @@ set_env_java() {
   fi
 }
 
+set_env_python() {
+  if test "$DOCKER_PRELOAD" != 1; then
+    if test -n "$DOCKER"; then
+      # If we are running in Docker and not preloading, we need to fetch the
+      # Python binary.
+      curl -fL --retry 3 https://github.com/p-mongodb/deps/raw/main/"$arch"-python37.tar.xz | \
+        tar xfJ - -C /opt
+    fi
+    
+    if test -d /opt/python/3.7/bin; then
+      # Most Evergreen configurations.
+      export PATH=/opt/python/3.7/bin:$PATH
+    elif test -d /opt/python37/bin; then
+      # Configurations that use Docker in Evergreen - these don't preload.
+      export PATH=/opt/python37/bin:$PATH
+    fi
+    
+    python3 -V
+  fi
+}
+
+set_env_node() {
+  if test "$DOCKER_PRELOAD" != 1; then
+    dir=`ls -d /opt/nodejs/node-v12* |head -1`
+    if test -z "$dir"; then
+      echo "Node 12 missing" 1>&2
+      exit 2
+    fi
+    export PATH="$dir/bin:$PATH"
+  elif test -d /opt/node/bin; then
+    # Node from toolchain in Evergreen
+    export PATH=/opt/node/bin:$PATH
+  fi
+  
+  node -v
+}
+
 set_env_ruby() {
   if test -z "$RVM_RUBY"; then
     echo "Empty RVM_RUBY, aborting"

data/spec/support/macros.rb

@@ -38,5 +38,14 @@ module Mongoid
         end
       end
     end
+
+    def restore_config_clients
+      around do |example|
+        # Duplicate the config because some tests mutate it.
+        old_config = Mongoid::Config.clients.dup
+        example.run
+        Mongoid::Config.send(:clients=, old_config)
+      end
+    end
   end
 end

data/spec/support/models/membership.rb

@@ -2,5 +2,6 @@
 
 class Membership
   include Mongoid::Document
+  field :name, type: String
   embedded_in :account
 end

data/spec/support/schema_maps/schema_map_aws.json

@@ -0,0 +1,17 @@
+{
+  "properties": {
+    "ssn": {
+      "encrypt": {
+        "keyId": [{
+          "$binary": {
+            "base64": "AWSAAAAAAAAAAAAAAAAAAA==",
+            "subType": "04"
+          }
+        }],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    }
+  },
+  "bsonType": "object"
+}

data/spec/support/schema_maps/schema_map_aws_key_alt_names.json

@@ -0,0 +1,12 @@
+{
+  "properties": {
+    "ssn": {
+      "encrypt": {
+        "keyId": "/altname",
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+      }
+    }
+  },
+  "bsonType": "object"
+}

data/spec/support/schema_maps/schema_map_azure.json

@@ -0,0 +1,17 @@
+{
+  "properties": {
+    "ssn": {
+      "encrypt": {
+        "keyId": [{
+          "$binary": {
+            "base64": "AZUREAAAAAAAAAAAAAAAAA==",
+            "subType": "04"
+          }
+        }],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    }
+  },
+  "bsonType": "object"
+}

data/spec/support/schema_maps/schema_map_azure_key_alt_names.json

@@ -0,0 +1,12 @@
+{
+  "properties": {
+    "ssn": {
+      "encrypt": {
+        "keyId": "/altname",
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+      }
+    }
+  },
+  "bsonType": "object"
+}

data/spec/support/schema_maps/schema_map_gcp.json

@@ -0,0 +1,17 @@
+{
+  "properties": {
+    "ssn": {
+      "encrypt": {
+        "keyId": [{
+          "$binary": {
+            "base64": "GCPAAAAAAAAAAAAAAAAAAA==",
+            "subType": "04"
+          }
+        }],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    }
+  },
+  "bsonType": "object"
+}

data/spec/support/schema_maps/schema_map_gcp_key_alt_names.json

@@ -0,0 +1,12 @@
+{
+  "properties": {
+    "ssn": {
+      "encrypt": {
+        "keyId": "/altname",
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+      }
+    }
+  },
+  "bsonType": "object"
+}

data/spec/support/schema_maps/schema_map_kmip.json

@@ -0,0 +1,17 @@
+{
+  "properties": {
+    "ssn": {
+      "encrypt": {
+        "keyId": [{
+          "$binary": {
+            "base64": "KMIPAAAAAAAAAAAAAAAAAA==",
+            "subType": "04"
+          }
+        }],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    }
+  },
+  "bsonType": "object"
+}

data/spec/support/schema_maps/schema_map_kmip_key_alt_names.json

@@ -0,0 +1,12 @@
+{
+  "properties": {
+    "ssn": {
+      "encrypt": {
+        "keyId": "/altname",
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+      }
+    }
+  },
+  "bsonType": "object"
+}

data/spec/support/schema_maps/schema_map_local.json

@@ -0,0 +1,18 @@
+{
+  "properties": {
+    "ssn": {
+      "encrypt": {
+        "keyId": [{
+          "$binary": {
+              "base64": "LOCALAAAAAAAAAAAAAAAAA==",
+              "subType": "04"
+
+              }
+        }],
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+      }
+    }
+  },
+  "bsonType": "object"
+}

data/spec/support/schema_maps/schema_map_local_key_alt_names.json

@@ -0,0 +1,12 @@
+{
+  "properties": {
+    "ssn": {
+      "encrypt": {
+        "keyId": "/altname",
+        "bsonType": "string",
+        "algorithm": "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+      }
+    }
+  },
+  "bsonType": "object"
+}

data/spec/support/spec_config.rb

@@ -34,6 +34,10 @@ class SpecConfig
     RUBY_PLATFORM =~ /\bjava\b/
   end
 
+  def windows?
+    ENV['OS'] == 'Windows_NT' && !RUBY_PLATFORM.match?(/cygwin/)
+  end
+
   def platform
     RUBY_PLATFORM
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 7.4.0
+  version: 7.4.1
 platform: ruby
 authors:
 - Durran Jordan
@@ -30,7 +30,7 @@ cert_chain:
   +WyKQ+QTIdtDiyf2LQmxWnxt/W1CmScjdLS7/yXGkkB/D9Uy+sJD747O/B9P238Q
   XnerrtyOu04RsWDvaZkCwSDVzoqfICh4CP1mlde73Ts=
   -----END CERTIFICATE-----
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -460,6 +460,7 @@ files:
 - lib/rails/mongoid.rb
 - spec/README.md
 - spec/config/mongoid.yml
+- spec/config/mongoid_with_schema_map_uuid.yml
 - spec/integration/app_spec.rb
 - spec/integration/associations/belongs_to_spec.rb
 - spec/integration/associations/embedded_dirty_spec.rb
@@ -842,6 +843,7 @@ files:
 - spec/shared/lib/mrss/cluster_config.rb
 - spec/shared/lib/mrss/constraints.rb
 - spec/shared/lib/mrss/docker_runner.rb
+- spec/shared/lib/mrss/eg_config_utils.rb
 - spec/shared/lib/mrss/event_subscriber.rb
 - spec/shared/lib/mrss/lite_constraints.rb
 - spec/shared/lib/mrss/server_version_registry.rb
@@ -852,6 +854,7 @@ files:
 - spec/shared/share/Dockerfile.erb
 - spec/shared/share/haproxy-1.conf
 - spec/shared/share/haproxy-2.conf
+- spec/shared/shlib/config.sh
 - spec/shared/shlib/distro.sh
 - spec/shared/shlib/server.sh
 - spec/shared/shlib/set_env.sh
@@ -1110,6 +1113,16 @@ files:
 - spec/support/models/word.rb
 - spec/support/models/word_origin.rb
 - spec/support/models/writer.rb
+- spec/support/schema_maps/schema_map_aws.json
+- spec/support/schema_maps/schema_map_aws_key_alt_names.json
+- spec/support/schema_maps/schema_map_azure.json
+- spec/support/schema_maps/schema_map_azure_key_alt_names.json
+- spec/support/schema_maps/schema_map_gcp.json
+- spec/support/schema_maps/schema_map_gcp_key_alt_names.json
+- spec/support/schema_maps/schema_map_kmip.json
+- spec/support/schema_maps/schema_map_kmip_key_alt_names.json
+- spec/support/schema_maps/schema_map_local.json
+- spec/support/schema_maps/schema_map_local_key_alt_names.json
 - spec/support/shared/time.rb
 - spec/support/spec_config.rb
 homepage: https://mongoid.org
@@ -1240,6 +1253,7 @@ test_files:
 - spec/integration/matcher_operator_spec.rb
 - spec/integration/app_spec.rb
 - spec/integration/matcher_examples_spec.rb
+- spec/config/mongoid_with_schema_map_uuid.yml
 - spec/config/mongoid.yml
 - spec/support/constraints.rb
 - spec/support/models/tree.rb
@@ -1493,6 +1507,16 @@ test_files:
 - spec/support/macros.rb
 - spec/support/spec_config.rb
 - spec/support/helpers.rb
+- spec/support/schema_maps/schema_map_local_key_alt_names.json
+- spec/support/schema_maps/schema_map_aws_key_alt_names.json
+- spec/support/schema_maps/schema_map_kmip.json
+- spec/support/schema_maps/schema_map_azure.json
+- spec/support/schema_maps/schema_map_kmip_key_alt_names.json
+- spec/support/schema_maps/schema_map_local.json
+- spec/support/schema_maps/schema_map_gcp_key_alt_names.json
+- spec/support/schema_maps/schema_map_aws.json
+- spec/support/schema_maps/schema_map_gcp.json
+- spec/support/schema_maps/schema_map_azure_key_alt_names.json
 - spec/support/client_registry.rb
 - spec/support/expectations.rb
 - spec/support/authorization.rb
@@ -1506,11 +1530,13 @@ test_files:
 - spec/shared/bin/s3-upload
 - spec/shared/shlib/distro.sh
 - spec/shared/shlib/set_env.sh
+- spec/shared/shlib/config.sh
 - spec/shared/shlib/server.sh
 - spec/shared/LICENSE
 - spec/shared/lib/mrss/constraints.rb
 - spec/shared/lib/mrss/cluster_config.rb
 - spec/shared/lib/mrss/child_process_helper.rb
+- spec/shared/lib/mrss/eg_config_utils.rb
 - spec/shared/lib/mrss/event_subscriber.rb
 - spec/shared/lib/mrss/utils.rb
 - spec/shared/lib/mrss/server_version_registry.rb