Merge branch 'master' into 3742-fix-backpressure-tests

Author: comandeo-mongo

.evergreen/config.yml

@@ -1067,6 +1067,10 @@ axes:
         display_name: via LMC path
         variables:
           FLE: path
+      - id: "mongocryptd"
+        display_name: mongocryptd (no crypt_shared)
+        variables:
+          FLE: mongocryptd
 
   - id: ocsp-algorithm
     display_name: OCSP Algorithm
@@ -1536,6 +1540,19 @@ buildvariants:
     tasks:
       - name: "test-fle"
 
+  - matrix_name: "fle-mongocryptd"
+    matrix_spec:
+      auth-and-ssl: "noauth-and-nossl"
+      ruby: "ruby-4.0"
+      topology: [replica-set, sharded-cluster]
+      mongodb-version: "8.0"
+      os: ubuntu2204
+      fle: mongocryptd
+    display_name: "FLE mongocryptd: ${mongodb-version} ${topology} ${ruby}"
+    tags: ["pr"]
+    tasks:
+      - name: "test-fle"
+
   - matrix_name: "kerberos-unit"
     matrix_spec:
       ruby: "ruby-4.0"

.evergreen/config/axes.yml.erb

@@ -292,6 +292,10 @@ axes:
         display_name: via LMC path
         variables:
           FLE: path
+      - id: "mongocryptd"
+        display_name: mongocryptd (no crypt_shared)
+        variables:
+          FLE: mongocryptd
 
   - id: ocsp-algorithm
     display_name: OCSP Algorithm

.evergreen/config/standard.yml.erb

@@ -358,6 +358,19 @@ buildvariants:
     tasks:
       - name: "test-fle"
 
+  - matrix_name: "fle-mongocryptd"
+    matrix_spec:
+      auth-and-ssl: "noauth-and-nossl"
+      ruby: <%= latest_ruby %>
+      topology: [replica-set, sharded-cluster]
+      mongodb-version: <%= latest_stable_mdb %>
+      os: ubuntu2204
+      fle: mongocryptd
+    display_name: "FLE mongocryptd: ${mongodb-version} ${topology} ${ruby}"
+    tags: ["pr"]
+    tasks:
+      - name: "test-fle"
+
   - matrix_name: "kerberos-unit"
     matrix_spec:
       ruby: <%= latest_ruby %>

.evergreen/run-tests.sh

@@ -66,7 +66,7 @@ fi
 
 # Make sure cmake is installed (in case we need to install the libmongocrypt
 # helper)
-if [ "$FLE" = "helper" ]; then
+if [ -n "$FLE" ]; then
   install_cmake
 fi
 
@@ -194,23 +194,25 @@ elif test "$AUTH" = kerberos; then
 fi
 
 if test -n "$FLE"; then
-  # Downloading crypt shared lib
-  if [ -z "$MONGO_CRYPT_SHARED_DOWNLOAD_URL" ]; then
-    crypt_shared_version=${CRYPT_SHARED_VERSION:-$("${BINDIR}"/mongod --version | grep -oP 'db version v\K.*')}
-    python3 -u .evergreen/mongodl.py --component crypt_shared -V ${crypt_shared_version} --out $(pwd)/csfle_lib  --target $(host_distro) || true
-    if test -f $(pwd)/csfle_lib/lib/mongo_crypt_v1.so
-    then
-      export MONGO_RUBY_DRIVER_CRYPT_SHARED_LIB_PATH=$(pwd)/csfle_lib/lib/mongo_crypt_v1.so
+  # Downloading crypt shared lib (skipped for mongocryptd-only configuration)
+  if test "$FLE" != "mongocryptd"; then
+    if [ -z "$MONGO_CRYPT_SHARED_DOWNLOAD_URL" ]; then
+      crypt_shared_version=${CRYPT_SHARED_VERSION:-$("${BINDIR}"/mongod --version | grep -oP 'db version v\K.*')}
+      python3 -u .evergreen/mongodl.py --component crypt_shared -V ${crypt_shared_version} --out $(pwd)/csfle_lib  --target $(host_distro) || true
+      if test -f $(pwd)/csfle_lib/lib/mongo_crypt_v1.so
+      then
+        export MONGO_RUBY_DRIVER_CRYPT_SHARED_LIB_PATH=$(pwd)/csfle_lib/lib/mongo_crypt_v1.so
+      else
+        echo 'Could not find crypt_shared library'
+      fi
     else
-      echo 'Could not find crypt_shared library'
+      echo "Downloading crypt_shared package from $MONGO_CRYPT_SHARED_DOWNLOAD_URL"
+      mkdir -p $(pwd)/csfle_lib
+      cd $(pwd)/csfle_lib
+      curl --retry 3 -fL $MONGO_CRYPT_SHARED_DOWNLOAD_URL | tar zxf -
+      export MONGO_RUBY_DRIVER_CRYPT_SHARED_LIB_PATH=$(pwd)/lib/mongo_crypt_v1.so
+      cd -
     fi
-  else
-    echo "Downloading crypt_shared package from $MONGO_CRYPT_SHARED_DOWNLOAD_URL"
-    mkdir -p $(pwd)/csfle_lib
-    cd $(pwd)/csfle_lib
-    curl --retry 3 -fL $MONGO_CRYPT_SHARED_DOWNLOAD_URL | tar zxf -
-    export MONGO_RUBY_DRIVER_CRYPT_SHARED_LIB_PATH=$(pwd)/lib/mongo_crypt_v1.so
-    cd -
   fi
 
   # Start the KMS servers first so that they are launching while we are
@@ -237,7 +239,7 @@ if test -n "$FLE"; then
   # Obtain temporary AWS credentials
   PYTHON=python3 . .evergreen/csfle/set-temp-creds.sh
 
-  if test "$FLE" = helper; then
+  if [[ "$FLE" == "helper" || "$FLE" == "mongocryptd" ]]; then
     echo "Using helper gem"
   elif test "$FLE" = path; then
     if false; then
@@ -344,7 +346,6 @@ if test "$COMPRESSOR" = zstd; then
   add_uri_option compressors=zstd
 fi
 
-
 echo "Running tests"
 set +e
 if test -n "$TEST_CMD"; then

.rubocop.yml

@@ -1,10 +1,10 @@
-require:
+plugins:
   - rubocop-performance
   - rubocop-rake
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   NewCops: enable
   Exclude:
     - 'spec/shared/**/*'
@@ -51,6 +51,9 @@ Layout/SpaceInsideArrayLiteralBrackets:
 Layout/SpaceInsidePercentLiteralDelimiters:
   Enabled: false
 
+Lint/UselessConstantScoping:
+  Enabled: false
+
 Metrics/ClassLength:
   Max: 200
 
@@ -60,9 +63,16 @@ Metrics/ModuleLength:
 Metrics/MethodLength:
   Max: 20
 
+Naming/FileName:
+  Exclude:
+    - 'gemfiles/bson_4-stable.gemfile'
+
 Naming/MethodParameterName:
   AllowedNames: [ id, op ]
 
+Naming/PredicateMethod:
+  Enabled: false
+
 RSpec/BeforeAfterAll:
   Enabled: false
 
@@ -71,12 +81,24 @@ RSpec/BeforeAfterAll:
 RSpec/DescribeClass:
   Enabled: false
 
+RSpec/Eq:
+  Enabled: false
+
 Style/FetchEnvVar:
   Enabled: false
 
 RSpec/ImplicitExpect:
   EnforcedStyle: is_expected
 
+RSpec/IncludeExamples:
+  Enabled: false
+
+RSpec/IndexedLet:
+  Enabled: false
+
+RSpec/ExpectInLet:
+  Enabled: false
+
 RSpec/MultipleExpectations:
   Enabled: false
 
@@ -86,6 +108,9 @@ RSpec/MultipleMemoizedHelpers:
 RSpec/NestedGroups:
   Enabled: false
 
+RSpec/ReceiveMessages:
+  Enabled: false
+
 Style/Documentation:
   Exclude:
     - 'spec/**/*'

Gemfile

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 source 'https://rubygems.org'
 
 gemspec
 
-require_relative './gemfiles/standard'
+require_relative 'gemfiles/standard'
 
 standard_dependencies