mongoid 9.0.12 → 9.1.0

data/spec/rails/controller_extension/controller_runtime_spec.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "spec_helper"
-require "mongoid/railties/controller_runtime"
+require 'spec_helper'
+require 'mongoid/railties/controller_runtime'
 
-describe "Mongoid::Railties::ControllerRuntime" do
+describe 'Mongoid::Railties::ControllerRuntime' do
   CONTROLLER_RUNTIME = Mongoid::Railties::ControllerRuntime
   COLLECTOR = CONTROLLER_RUNTIME::Collector
 
@@ -16,98 +15,95 @@ describe "Mongoid::Railties::ControllerRuntime" do
     set_metric 0
   end
 
-  describe "Collector" do
+  reference_controller_class = Class.new do
+    def process_action(*_)
+      @process_action = true
+    end
+
+    def cleanup_view_runtime(*_)
+      @cleanup_view_runtime.call
+    end
+
+    def append_info_to_payload(*_)
+      @append_info_to_payload = true
+    end
+
+    def self.log_process_action(*_)
+      @log_process_action.call
+    end
+  end
+
+  controller_class = Class.new reference_controller_class do
+    include CONTROLLER_RUNTIME::ControllerExtension
+  end
+
+  let(:controller) { controller_class.new }
 
-    it "stores the metric in thread-safe manner" do
+  describe 'Collector' do
+    it 'stores the metric in thread-safe manner' do
       clear_metric!
       expect(COLLECTOR.runtime).to eq(0)
       set_metric 42
       expect(COLLECTOR.runtime).to eq(42)
     end
 
-    it "sets metric on both succeeded and failed" do
+    it 'sets metric on both succeeded and failed' do
       instance = COLLECTOR.new
       event_payload = OpenStruct.new duration: 42
 
       clear_metric!
       instance.succeeded event_payload
-      expect(COLLECTOR.runtime).to eq(42000)
+      expect(COLLECTOR.runtime).to eq(42_000)
 
       clear_metric!
       instance.failed event_payload
-      expect(COLLECTOR.runtime).to eq(42000)
+      expect(COLLECTOR.runtime).to eq(42_000)
     end
 
-    it "resets the metric and returns the value" do
+    it 'resets the metric and returns the value' do
       clear_metric!
       expect(COLLECTOR.reset_runtime).to eq(0)
       set_metric 42
       expect(COLLECTOR.reset_runtime).to eq(42)
       expect(COLLECTOR.runtime).to eq(0)
     end
-
   end
 
-  reference_controller_class = Class.new do
-    def process_action *_
-      @process_action = true
-    end
-
-    def cleanup_view_runtime *_
-      @cleanup_view_runtime.call
-    end
-
-    def append_info_to_payload *_
-      @append_info_to_payload = true
-    end
-
-    def self.log_process_action *_
-      @log_process_action.call
-    end
-  end
-
-  controller_class = Class.new reference_controller_class do
-    include CONTROLLER_RUNTIME::ControllerExtension
-  end
-
-  let(:controller){ controller_class.new }
-
-  it "resets the metric before each action" do
+  it 'resets the metric before each action' do
     set_metric 42
     controller.send(:process_action, 'foo')
     expect(COLLECTOR.runtime).to be(0)
-    expect(controller.instance_variable_get "@process_action").to be(true)
+    expect(controller.instance_variable_get(:@process_action)).to be(true)
   end
 
-  it "strips the metric of other sources of the runtime" do
+  it 'strips the metric of other sources of the runtime' do
     set_metric 1
-    controller.instance_variable_set "@cleanup_view_runtime", ->{
-      controller.instance_variable_set "@cleanup_view_runtime", true
+    controller.instance_variable_set :@cleanup_view_runtime, lambda {
+      controller.instance_variable_set :@cleanup_view_runtime, true
       set_metric 13
       42
     }
     returned = controller.send :cleanup_view_runtime
-    expect(controller.instance_variable_get "@cleanup_view_runtime").to be(true)
+    expect(controller.instance_variable_get(:@cleanup_view_runtime)).to be(true)
     expect(controller.mongoid_runtime).to eq(14)
     expect(returned).to be(29)
   end
 
-  it "appends the metric to payload" do
+  it 'appends the metric to payload' do
     payload = {}
     set_metric 42
     controller.send :append_info_to_payload, payload
-    expect(controller.instance_variable_get "@append_info_to_payload").to be(true)
+    expect(controller.instance_variable_get(:@append_info_to_payload)).to be(true)
     expect(payload[:mongoid_runtime]).to eq(42)
   end
 
-  it "adds metric to log message" do
-    controller_class.instance_variable_set "@log_process_action", ->{
-      controller_class.instance_variable_set "@log_process_action", true
+  it 'adds metric to log message' do
+    controller_class.instance_variable_set :@log_process_action, lambda {
+      controller_class.instance_variable_set :@log_process_action, true
       []
     }
     messages = controller_class.log_process_action mongoid_runtime: 42.101
-    expect(controller_class.instance_variable_get "@log_process_action").to be(true)
-    expect(messages).to eq(["MongoDB: 42.1ms"])
+    expect(controller_class.instance_variable_get(:@log_process_action)).to be(true)
+    expect(messages).to eq([ 'MongoDB: 42.1ms' ])
   end
-
 end

data/spec/rails/mongoid_spec.rb

@@ -1,49 +1,49 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
-require "spec_helper"
-require "support/feature_sandbox"
+require 'spec_helper'
+require 'support/feature_sandbox'
 
-describe "Rails::Mongoid" do
+describe 'Rails::Mongoid' do
   let(:model_root) do
     File.absolute_path(
       File.join(
         File.dirname(__FILE__),
-        "../support/models/sandbox"
-      ))
+        '../support/models/sandbox'
+      )
+    )
   end
 
-  around :each do |example|
+  around do |example|
     FeatureSandbox.quarantine do
-      require "rails/mongoid"
+      require 'rails/mongoid'
       $LOAD_PATH.push(model_root)
       example.run
     end
   end
 
-  describe ".preload_models" do
+  describe '.preload_models' do
     let(:app) { double(config: config) }
     let(:config) { double(paths: paths) }
-    let(:paths) { { "app/models" => path } }
+    let(:paths) { { 'app/models' => path } }
     let(:path) { double(expanded: [ model_root ]) }
 
     before { Rails::Mongoid.preload_models(app) }
 
-    context "when preload models config is false" do
+    context 'when preload models config is false' do
       config_override :preload_models, false
 
-      it "does not load any models" do
+      it 'does not load any models' do
         expect(defined?(SandboxMessage)).to be_nil
         expect(defined?(SandboxUser)).to be_nil
         expect(defined?(SandboxComment)).to be_nil
       end
     end
 
-    context "when preload models config is true" do
+    context 'when preload models config is true' do
       config_override :preload_models, true
 
-      context "when all models are in the models directory" do
-        it "requires the models" do
+      context 'when all models are in the models directory' do
+        it 'requires the models' do
           expect(SandboxMessage.ancestors).to include(Mongoid::Document)
           expect(SandboxUser.ancestors).to include(Mongoid::Document)
           expect(SandboxComment.ancestors).to include(Mongoid::Document)

data/spec/shared/lib/mrss/cluster_config.rb

@@ -45,23 +45,16 @@ module Mrss
     end
 
     # Per https://jira.mongodb.org/browse/SERVER-39052, working with FCV
-    # in sharded topologies is annoying. Also, FCV doesn't exist in servers
-    # less than 3.4. This method returns FCV on 3.4+ servers when in single
+    # in sharded topologies is annoying. This method returns FCV when in single
     # or RS topologies, and otherwise returns the major.minor server version.
     def fcv_ish
       if server_version.nil?
         raise "Deployment server version not known - check that connection to deployment succeeded"
       end
 
-      if server_version >= '3.4' && !sharded_ish?
-        fcv
-      else
-        if short_server_version == '4.1'
-          '4.2'
-        else
-          short_server_version
-        end
-      end
+      return fcv unless sharded_ish?
+
+      short_server_version
     end
 
     # @return [ Mongo::Address ] The address of the primary in the deployment.
@@ -113,34 +106,6 @@ module Mrss
       @topology
     end
 
-    def storage_engine
-      @storage_engine ||= begin
-        # 2.6 does not have wired tiger
-        if short_server_version == '2.6'
-          :mmapv1
-        else
-          client = ClientRegistry.instance.global_client('root_authorized')
-          if sharded_ish?
-            shards = client.use(:admin).command(listShards: 1).first
-            if shards['shards'].empty?
-              raise 'Shards are empty'
-            end
-            shard = shards['shards'].first
-            address_str = shard['host'].sub(/^.*\//, '').sub(/,.*/, '')
-            client = ClusterTools.instance.direct_client(address_str,
-              SpecConfig.instance.test_options.merge(SpecConfig.instance.auth_options).merge(connect: :direct))
-          end
-          rv = client.use(:admin).command(serverStatus: 1).first
-          rv = rv['storageEngine']['name']
-          rv_map = {
-            'wiredTiger' => :wired_tiger,
-            'mmapv1' => :mmapv1,
-          }
-          rv_map[rv] || rv
-        end
-      end
-    end
-
     # This method returns an alternate address for connecting to the configured
     # deployment. For example, if the replica set is configured with nodes at
     # of localhost:27017 and so on, this method will return 127.0.0.:27017.
@@ -216,7 +181,7 @@ module Mrss
         {}
       end
 
-      if !sharded_ish? && short_server_version >= '3.4'
+      unless sharded_ish?
         rv = @server_parameters['featureCompatibilityVersion']
         @fcv = rv['version'] || rv
       end

data/spec/shared/lib/mrss/constraints.rb

@@ -69,22 +69,15 @@ module Mrss
       before(:all) do
         case ClusterConfig.instance.topology
         when :single
-          skip 'Transactions tests require a replica set (4.0+) or a sharded cluster (4.2+)'
-        when :replica_set
-          unless ClusterConfig.instance.server_version >= '4.0'
-            skip 'Transactions tests in a replica set topology require server 4.0+'
-          end
-        when :sharded, :load_balanced
-          unless ClusterConfig.instance.server_version >= '4.2'
-            skip 'Transactions tests in a sharded cluster topology require server 4.2+'
-          end
+          skip 'Transactions tests require a replica set or a sharded cluster'
+        when :replica_set, :sharded, :load_balanced
         else
-          raise NotImplementedError
+          raise NotImplementedError, "Unknown topology #{ClusterConfig.instance.topology}"
         end
       end
     end
 
-    # Fail command fail point was added to mongod in 4.0 and to mongos in 4.2.
+    # Fail command fail point requires transactions to be supported
     def require_fail_command
       require_transaction_support
     end
@@ -239,13 +232,11 @@ module Mrss
     end
 
     # Can the driver specify a write concern that won't be overridden?
-    # (mongos 4.0+ overrides the write concern)
+    # (mongos overrides the write concern)
     def require_set_write_concern
       before(:all) do
-        if %i(sharded load_balanced).include?(ClusterConfig.instance.topology) &&
-          ClusterConfig.instance.short_server_version >= '4.0'
-        then
-          skip "mongos 4.0+ overrides write concern"
+        if %i(sharded load_balanced).include?(ClusterConfig.instance.topology)
+          skip "mongos overrides write concern"
         end
       end
     end
@@ -283,36 +274,6 @@ module Mrss
 
     alias :require_no_multi_shard :require_no_multi_mongos
 
-    def require_wired_tiger
-      before(:all) do
-        # Storage detection fails for serverless instances. However, it is safe to
-        # assume that a serverless instance uses WiredTiger Storage Engine.
-        if !SpecConfig.instance.serverless? && ClusterConfig.instance.storage_engine != :wired_tiger
-          skip 'Test requires WiredTiger storage engine'
-        end
-      end
-    end
-
-    def require_wired_tiger_on_36
-      before(:all) do
-        if ClusterConfig.instance.short_server_version >= '3.6'
-          # Storage detection fails for serverless instances. However, it is safe to
-          # assume that a serverless instance uses WiredTiger Storage Engine.
-          if !SpecConfig.instance.serverless? && ClusterConfig.instance.storage_engine != :wired_tiger
-            skip 'Test requires WiredTiger storage engine on 3.6+ servers'
-          end
-        end
-      end
-    end
-
-    def require_mmapv1
-      before(:all) do
-        if SpecConfig.instance.serverless? || ClusterConfig.instance.storage_engine != :mmapv1
-          skip 'Test requires MMAPv1 storage engine'
-        end
-      end
-    end
-
     def require_enterprise
       before(:all) do
         unless ClusterConfig.instance.enterprise?

data/spec/shared/lib/mrss/docker_runner.rb

@@ -84,12 +84,12 @@ module Mrss
         arg.split('=', 2)
       end]
 
-      @env['RVM_RUBY'] ||= 'ruby-2.7'
+      @env['RVM_RUBY'] ||= 'ruby-3.2'
       unless ruby =~ /^j?ruby-/
         raise "RVM_RUBY option is not in expected format: #{ruby}"
       end
 
-      @env['MONGODB_VERSION'] ||= '4.4'
+      @env['MONGODB_VERSION'] ||= '8.0'
     end
 
     def create_dockerfile
@@ -178,12 +178,10 @@ module Mrss
 
     def distro
       @options[:distro] || if app_tests?
-        'ubuntu2004'
+          'ubuntu2004'
         else
           case server_version
-          when '3.6'
-            'debian9'
-          when '4.0', '4.2'
+          when '4.2'
             'ubuntu1804'
           else
             'ubuntu2004'
@@ -192,18 +190,11 @@ module Mrss
     end
 
     BASE_IMAGES = {
-      'debian81' => 'debian:jessie',
-      'debian92' => 'debian:stretch',
-      'debian10' => 'debian:buster',
       'debian11' => 'debian:bullseye',
-      'ubuntu1404' => 'ubuntu:trusty',
-      'ubuntu1604' => 'ubuntu:xenial',
       'ubuntu1804' => 'ubuntu:bionic',
       'ubuntu2004' => 'ubuntu:focal',
       'ubuntu2204' => 'ubuntu:jammy',
-      'rhel62' => 'centos:6',
-      'rhel70' => 'centos:7',
-      'rhel80' => 'rockylinux:8',
+      'ubuntu2404' => 'ubuntu:noble',
     }.freeze
 
     def base_image
@@ -256,14 +247,12 @@ module Mrss
 
     def libmongocrypt_path
       case distro
-      when /ubuntu1604/
-        "./ubuntu1604/nocrypto/lib64/libmongocrypt.so"
-      when /ubuntu1804/
-        "./ubuntu1804-64/nocrypto/lib64/libmongocrypt.so"
-      when /debian92/
-        "./debian92/nocrypto/lib64/libmongocrypt.so"
+      when /ubuntu..04/
+        "./#{distro}-64/nocrypto/lib64/libmongocrypt.so"
+      when /debian../
+        "./#{distro}/nocrypto/lib64/libmongocrypt.so"
       else
-        raise "This script does not support running FLE tests on #{distro}. Use ubuntu1604, ubuntu1804 or debian92 instead"
+        raise "This script does not support running FLE tests on #{distro}."
       end
     end
 

data/spec/shared/lib/mrss/eg_config_utils.rb

@@ -5,37 +5,6 @@ require 'tilt'
 
 module Mrss
   module EgConfigUtils
-
-    DEBIAN_FOR_RUBY = {
-      'ruby-2.3' => 'debian92',
-      'ruby-2.4' => 'debian92',
-      'ruby-2.5' => 'debian10',
-      'ruby-2.6' => 'debian10',
-      'ruby-2.7' => 'debian10',
-      'ruby-3.0' => 'debian10',
-    }
-
-    def standard_debian_rubies(rubies, key: nil, &block)
-      rubies.flatten!
-      text = block.call
-      contents = YAML.load(text)
-      out = rubies.map do |ruby|
-        contents.merge(
-          'matrix_name' => "#{contents['matrix_name']} - #{ruby}",
-          'matrix_spec' => contents['matrix_spec'].merge(
-            'ruby' => ruby,
-            key || 'os' => DEBIAN_FOR_RUBY.fetch(ruby),
-          ),
-        )
-      end.to_yaml
-      text =~ /\A\n?(\s+)/
-      unless text
-        raise "Couldn't figure out indentation level"
-      end
-      indent = ' ' * ($1.length - 2)
-      "\n" + out.sub(/\A---.*\n/, indent).gsub("\n", "\n#{indent}")
-    end
-
     def transform_config(template_path, context)
       Tilt.new(template_path, engine_class: Erubi::CaptureEndEngine).render(context)
     end

data/spec/shared/lib/mrss/release/candidate.rb

@@ -184,21 +184,27 @@ module Mrss
       def extract_summary(pr)
         summary = []
         accumulating = false
+        in_code_block = false
         level = nil
 
         pr['body'].lines.each do |line|
-          # a header of any level titled "summary" will begin the summary
-          if !accumulating && line =~ /^(\#+)\s+summary\s+$/i
-            accumulating = true
-            level = $1.length
-
-          # a header of any level less than or equal to the summary header's
-          # level will end the summary
-          elsif accumulating && line =~ /^\#{1,#{level}}\s+/
-            break
-
-          # otherwise, the line is part of the summary
-          elsif accumulating
+          if !accumulating
+            # a header of any level titled "summary" will begin the summary
+            if line =~ /^(\#+)\s+summary\s+$/i
+              accumulating = true
+              level = $1.length
+            end
+          else
+            # if we encounter a code block, we don't let its contents affect our
+            # header-level counting (i.e. we don't want to accidentally end the
+            # summary just because there's a comment in a code block)
+            in_code_block = !in_code_block if line =~ /^```/
+
+            # a header of any level less than or equal to the summary header's
+            # level will end the summary
+            break if !in_code_block && line =~ /^\#{1,#{level}}\s+/
+
+            # otherwise, the line is part of the summary
             summary << line
           end
         end

data/spec/shared/lib/mrss/server_version_registry.rb

@@ -67,11 +67,7 @@ module Mrss
     private
 
     def uri_open(*args)
-      if RUBY_VERSION < '2.5'
-        open(*args)
-      else
-        URI.open(*args)
-      end
+      URI.open(*args)
     end
 
     def detect_version(catalog)

data/spec/shared/share/Dockerfile.erb

@@ -163,14 +163,12 @@ ENV DOCKER=1
     RUN python3 -mpip install asn1crypto oscrypto flask --upgrade --ignore-installed
   <% end %>
 
-  # FLE is tested against 4.0+ servers.
-  <% if @env.fetch('MONGODB_VERSION') >= '4.0' %>
-    # Requirements in drivers-evergreen-tools:
-    # boto3~=1.19 cryptography~=3.4.8 pykmip~=0.10.0
-    # cryptography does not install due to lacking setuptools_rust
-    # (either that version or anything that isn't part of system packages)
-    RUN python3 -mpip install boto3~=1.19 cryptography pykmip~=0.10.0 'sqlalchemy<2.0.0'
-  <% end %>
+  # FLE requirements
+  # Requirements in drivers-evergreen-tools:
+  # boto3~=1.19 cryptography~=3.4.8 pykmip~=0.10.0
+  # cryptography does not install due to lacking setuptools_rust
+  # (either that version or anything that isn't part of system packages)
+  RUN python3 -mpip install boto3~=1.19 cryptography pykmip~=0.10.0 'sqlalchemy<2.0.0'
 
   <% unless ruby_head? || system_ruby? %>
 

data/spec/shared/shlib/server.sh

@@ -250,10 +250,6 @@ calculate_server_args() {
     echo "Unknown topology: $TOPOLOGY" 1>&2
     exit 1
   fi
-  if test -n "$MMAPV1"; then
-    args="$args --storageEngine mmapv1 --smallfiles --noprealloc"
-    uri_options="$uri_options&retryReads=false&retryWrites=false"
-  fi
   if test "$AUTH" = auth; then
     args="$args --auth --username bob --password pwd123"
   elif test "$AUTH" = x509; then
@@ -316,7 +312,6 @@ calculate_server_args() {
     args="$args --bind_ip_all"
   fi
 
-  # MongoDB servers pre-4.2 do not enable zlib compression by default
   if test "$COMPRESSOR" = snappy; then
     args="$args --networkMessageCompressors snappy"
   elif test "$COMPRESSOR" = zlib; then
@@ -367,51 +362,6 @@ launch_server() {
   local dbdir="$1"
   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,
-    # so we run the refreshLogicalSessionCacheNow command on the config server
-    # and again on each mongos in order for the mongoses
-    # to correctly report logicalSessionTimeoutMinutes.
-    mongos_regex="\s*mongos\s+([0-9]+)\s+running\s+[0-9]+"
-    config_server_regex="\s*config\sserver\s+([0-9]+)\s+running\s+[0-9]+"
-    config_server=""
-    mongoses=()
-    if test "$AUTH" = auth
-    then
-      base_url="mongodb://bob:pwd123@localhost"
-    else
-      base_url="mongodb://localhost"
-    fi
-    if test "$SSL" = "ssl"
-    then
-      mongo_command="${BINDIR}/mongo --ssl --sslPEMKeyFile $server_cert_path --sslCAFile $server_ca_path"
-    else
-      mongo_command="${BINDIR}/mongo"
-    fi
-
-    while read -r line
-    do
-        if [[ $line =~ $config_server_regex ]]
-        then
-            port="${BASH_REMATCH[1]}"
-            config_server="${base_url}:${port}"
-        fi
-        if [[ $line =~ $mongos_regex ]]
-        then
-            port="${BASH_REMATCH[1]}"
-            mongoses+=("${base_url}:${port}")
-        fi
-    done < <(python2 -m mtools.mlaunch.mlaunch list --dir "$dbdir" --binarypath "$BINDIR")
-
-    if [ -n "$config_server" ]; then
-      ${mongo_command} "$config_server" --eval 'db.adminCommand("refreshLogicalSessionCacheNow")'
-      for mongos in ${mongoses[*]}
-      do
-        ${mongo_command} "$mongos" --eval 'db.adminCommand("refreshLogicalSessionCacheNow")'
-      done
-    fi
-  fi
-
   if test "$TOPOLOGY" = load-balanced; then
     if test -z "$haproxy_config"; then
       echo haproxy_config should have been set 1>&2

data/spec/shared/shlib/set_env.sh

@@ -70,16 +70,10 @@ set_env_ruby() {
   set_env_java
 
   if [ "$RVM_RUBY" == "ruby-head" ]; then
-    # When we use ruby-head, we do not install the Ruby toolchain.
-    # But we still need Python 3.6+ to run mlaunch.
-    # Since the ruby-head tests are run on ubuntu1604, we can use the
-    # globally installed Python toolchain.
-    #export PATH=/opt/python/3.7/bin:$PATH
-
-    # 12.04, 14.04 and 16.04 are good
-    curl --retry 3 -fL http://rubies.travis-ci.org/ubuntu/`lsb_release -rs`/x86_64/ruby-head.tar.bz2 |tar xfj -
-    # TODO adjust gem path?
-    export PATH=`pwd`/ruby-head/bin:`pwd`/ruby-head/lib/ruby/gems/2.6.0/bin:$PATH
+    # we could find a way to build ruby via rbenv here, perhaps?
+    echo 'ruby-head is not current supported'
+    exit 2
+
     ruby --version
     ruby --version |grep dev
   elif test "$SYSTEM_RUBY" = 1; then