Merge branch 'main' into NODE-6678

Author: W-A-James

.evergreen/config.in.yml

@@ -105,7 +105,9 @@ BASE_TASKS.push({
       TOPOLOGY: 'server',
       REQUIRE_API_VERSION: '1',
       MONGODB_API_VERSION: '1',
-      AUTH: 'auth'
+      AUTH: 'auth',
+      TEST_CSFLE: 'true',
+      CLIENT_ENCRYPTION: 'true'
     }),
     { func: 'install dependencies' },
     { func: 'bootstrap mongo-orchestration' },
@@ -146,7 +148,9 @@ TASKS.push(
           VERSION: ver,
           TOPOLOGY: 'sharded_cluster',
           AUTH: 'auth',
-          LOAD_BALANCER: 'true'
+          LOAD_BALANCER: 'true',
+          CLIENT_ENCRYPTION: 'false',
+          TEST_CSFLE: 'false'
         }),
         { func: 'install dependencies' },
         { func: 'bootstrap mongo-orchestration' },
@@ -208,7 +212,7 @@ TASKS.push(
         { func: 'run socks5 tests' }
       ]
     }
-  ]
+    ]
 );
 
 TASKS.push({
@@ -219,7 +223,9 @@ TASKS.push({
       VERSION: 'latest',
       TOPOLOGY: 'replica_set',
       AUTH: 'auth',
-      COMPRESSOR: 'snappy'
+      COMPRESSOR: 'snappy',
+      CLIENT_ENCRYPTION: 'false',
+      TEST_CSFLE: 'false'
     }),
     { func: 'install dependencies' },
     { func: 'bootstrap mongo-orchestration' },
@@ -235,7 +241,9 @@ TASKS.push({
       VERSION: 'latest',
       TOPOLOGY: 'replica_set',
       AUTH: 'auth',
-      COMPRESSOR: 'zstd'
+      COMPRESSOR: 'zstd',
+      CLIENT_ENCRYPTION: 'false',
+      TEST_CSFLE: 'false'
     }),
     { func: 'install dependencies' },
     { func: 'bootstrap mongo-orchestration' },
@@ -257,7 +265,9 @@ TASKS.push({
       VERSION: 'latest',
       TOPOLOGY: 'replica_set',
       AUTH: 'auth',
-      COMPRESSOR: 'zstd'
+      COMPRESSOR: 'zstd',
+      CLIENT_ENCRYPTION: 'false',
+      TEST_CSFLE: 'false'
     }),
     { func: 'install dependencies' },
     { func: 'bootstrap mongo-orchestration' },
@@ -422,9 +432,8 @@ for (const {
     const expansions = { NODE_LTS_VERSION, NPM_VERSION };
     const taskNames = tasks.map(({ name }) => name);
 
-    if (clientEncryption) {
-      expansions.CLIENT_ENCRYPTION = true;
-    }
+    expansions.CLIENT_ENCRYPTION = String(!!clientEncryption)
+    expansions.TEST_CSFLE = expansions.CLIENT_ENCRYPTION
 
     BUILD_VARIANTS.push({ name, display_name, run_on, expansions, tasks: taskNames });
   }
@@ -562,7 +571,7 @@ SINGLETON_TASKS.push(
         updateExpansions({
           VERSION: 'latest',
           TOPOLOGY: 'replica_set',
-          NODE_LTS_VERSION: LATEST_LTS 
+          NODE_LTS_VERSION: LATEST_LTS
         }),
         { func: 'install dependencies' },
         { func: 'bootstrap mongo-orchestration' },
@@ -666,7 +675,8 @@ for (const version of ['5.0', 'rapid', 'latest']) {
         NODE_LTS_VERSION: LOWEST_LTS,
         NPM_VERSION: 9,
         VERSION: version,
-        TOPOLOGY: 'replica_set'
+        TOPOLOGY: 'replica_set',
+        CLIENT_ENCRYPTION: true
       }),
       { func: 'install dependencies' },
       { func: 'bootstrap mongo-orchestration' },
@@ -748,11 +758,8 @@ function addPerformanceTasks() {
       monitorCommands: true
     }),
     makePerfTask('run-spec-benchmark-tests-node-server-logging', {
-      __enableMongoLogger: true,
-      __internalLoggerConfig: {
-        MONGODB_LOG_ALL: 'trace',
-        MONGODB_LOG_PATH: 'stderr'
-      }
+      mongodbLogPath: 'stderr',
+      mongodbLogComponentSeverities: { default: 'trace' }
     })
   ];
 

.evergreen/config.yml

@@ -30,5 +30,5 @@ else
     CRYPT_SHARED_LIB_PATH=$(cygpath -m $CRYPT_SHARED_LIB_PATH)
   fi
   echo "CRYPT_SHARED_LIB_PATH: $CRYPT_SHARED_LIB_PATH"
-  export CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH}
+  echo "export CRYPT_SHARED_LIB_PATH=$CRYPT_SHARED_LIB_PATH" >crypt_shared.sh
 fi

.evergreen/generate_evergreen_tasks.js

@@ -17,6 +17,5 @@ export MONGODB_URI="mongodb://localhost:27017"
 
 export EXPECTED_AZUREKMS_OUTCOME=${EXPECTED_AZUREKMS_OUTCOME:-omitted}
 export TEST_CSFLE=true
-export CSFLE_KMS_PROVIDERS='not json'
 
 npx mocha --config test/mocha_mongodb.json test/integration/client-side-encryption/client_side_encryption.prose.19.on_demand_azure.test.ts

.evergreen/prepare-crypt-shared-lib.sh

@@ -12,8 +12,8 @@ export MONGODB_CLIENT_OPTIONS=$MONGODB_CLIENT_OPTIONS
 npm run build:ts
 
 
-# If MONGODB_CLIENT_OPTIONS contains __enableMongoLogger redirect stderr to a file
-if [[ $MONGODB_CLIENT_OPTIONS == *"__enableMongoLogger"* ]]; then
+# If MONGODB_CLIENT_OPTIONS contains mongodbLogComponentSeverities redirect stderr to a file
+if [[ $MONGODB_CLIENT_OPTIONS == *"mongodbLogComponentSeverities"* ]]; then
   npm run check:bench 2> bench.log
 else
   npm run check:bench

.evergreen/run-azure-kms-tests.sh

@@ -1,33 +1,14 @@
 #! /usr/bin/env bash
 set +o xtrace # Do not write AWS credentials to stderr
 
-# Initiail checks for running these tests
-if [ -z ${AWS_ACCESS_KEY_ID+omitted} ]; then echo "AWS_ACCESS_KEY_ID is unset" && exit 1; fi
-if [ -z ${AWS_SECRET_ACCESS_KEY+omitted} ]; then echo "AWS_SECRET_ACCESS_KEY is unset" && exit 1; fi
-if [ -z ${CSFLE_KMS_PROVIDERS+omitted} ]; then echo "CSFLE_KMS_PROVIDERS is unset" && exit 1; fi
-
-export AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
-export AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
-export CSFLE_KMS_PROVIDERS=${CSFLE_KMS_PROVIDERS}
-export CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH}
-echo "csfle CRYPT_SHARED_LIB_PATH: $CRYPT_SHARED_LIB_PATH"
+source .evergreen/setup-fle.sh
 
 source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
 
-set -o xtrace   # Write all commands first to stderr
-set -o errexit  # Exit the script with error if any of the commands fail
-
-# Get access to the AWS temporary credentials:
-echo "adding temporary AWS credentials to environment"
-# CSFLE_AWS_TEMP_ACCESS_KEY_ID, CSFLE_AWS_TEMP_SECRET_ACCESS_KEY, CSFLE_AWS_TEMP_SESSION_TOKEN
-pushd "$DRIVERS_TOOLS"/.evergreen/csfle
-. ./activate-kmstlsvenv.sh
-. ./set-temp-creds.sh
-popd
+set -o xtrace  # Write all commands first to stderr
+set -o errexit # Exit the script with error if any of the commands fail
 
 export MONGODB_URI=${MONGODB_URI}
-export KMIP_TLS_CA_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem"
-export KMIP_TLS_CERT_FILE="${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem"
 export TEST_CSFLE=true
 
 npm run check:csfle

.evergreen/run-benchmarks.sh

@@ -2,12 +2,11 @@
 
 set -o errexit
 source "${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/secrets-export.sh"
+source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
 
 if [ -z ${AZUREKMS_RESOURCEGROUP+omitted} ]; then echo "AZUREKMS_RESOURCEGROUP is unset" && exit 1; fi
 if [ -z ${AZUREKMS_VMNAME+omitted} ]; then echo "AZUREKMS_VMNAME is unset" && exit 1; fi
 
-source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
-
 export AZUREKMS_PUBLICKEYPATH=/tmp/testazurekms_publickey
 export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
 

.evergreen/run-custom-csfle-tests.sh

@@ -1,6 +1,7 @@
 #! /usr/bin/env bash
 
 source "${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/secrets-export.sh"
+source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
 
 # Assert required environment variables are present without printing them
 if [ -z ${GCPKMS_GCLOUD+omitted} ]; then echo "GCPKMS_GCLOUD is unset" && exit 1; fi
@@ -10,8 +11,6 @@ if [ -z ${GCPKMS_INSTANCENAME+omitted} ]; then echo "GCPKMS_INSTANCENAME is unse
 
 set -o errexit
 
-source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
-
 export GCPKMS_SRC=node-driver-source.tgz
 export GCPKMS_DST=$GCPKMS_INSTANCENAME:
 
@@ -28,3 +27,6 @@ echo "decompressing node driver tar on gcp ... begin"
 export GCPKMS_CMD="tar -xzf $GCPKMS_SRC"
 "${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/run-command.sh"
 echo "decompressing node driver tar on gcp ... end"
+
+export GCPKMS_CMD="env EXPECTED_GCPKMS_OUTCOME=success bash src/.evergreen/run-gcp-kms-tests.sh"
+bash ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/run-command.sh

.evergreen/copy-driver-to-azure-and-run.sh renamed to .evergreen/run-deployed-azure-kms-tests.sh

@@ -19,6 +19,5 @@ export MONGODB_URI="mongodb://localhost:27017"
 
 export EXPECTED_GCPKMS_OUTCOME=${EXPECTED_GCPKMS_OUTCOME:-omitted}
 export TEST_CSFLE=true
-export CSFLE_KMS_PROVIDERS='not json'
 
 npx mocha --config test/mocha_mongodb.json test/integration/client-side-encryption/client_side_encryption.prose.17.on_demand_gcp.test.ts