test(no-story): bump mongodb-client-encryption pinned commits to 2.8.…

…0 release (#3683)
mongodb · May 25, 2023 · 66ba28f · 66ba28f
1 parent d26ad61
commit 66ba28f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 16 deletions.
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -2448,7 +2448,7 @@ tasks:
       - func: bootstrap kms servers
       - func: run custom csfle tests
         vars:
-          CSFLE_GIT_REF: 1524eac203e4145e9f4835e519f1e4663ff15953
+          CSFLE_GIT_REF: c56c70340093070b1ef5c8a28190187eea21a6e9
   - name: run-custom-csfle-tests-5.0-master
     tags:
       - run-custom-dependency-tests
@@ -2478,7 +2478,7 @@ tasks:
       - func: bootstrap kms servers
       - func: run custom csfle tests
         vars:
-          CSFLE_GIT_REF: 1524eac203e4145e9f4835e519f1e4663ff15953
+          CSFLE_GIT_REF: c56c70340093070b1ef5c8a28190187eea21a6e9
   - name: run-custom-csfle-tests-rapid-master
     tags:
       - run-custom-dependency-tests
@@ -2508,7 +2508,7 @@ tasks:
       - func: bootstrap kms servers
       - func: run custom csfle tests
         vars:
-          CSFLE_GIT_REF: 1524eac203e4145e9f4835e519f1e4663ff15953
+          CSFLE_GIT_REF: c56c70340093070b1ef5c8a28190187eea21a6e9
   - name: run-custom-csfle-tests-latest-master
     tags:
       - run-custom-dependency-tests

diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js
@@ -608,7 +608,7 @@ const oneOffFuncAsTasks = oneOffFuncs.map(oneOffFunc => ({
   ]
 }));
 
-const FLE_PINNED_COMMIT = '1524eac203e4145e9f4835e519f1e4663ff15953'
+const FLE_PINNED_COMMIT = 'c56c70340093070b1ef5c8a28190187eea21a6e9';
 
 for (const version of ['5.0', 'rapid', 'latest']) {
   for (const ref of [FLE_PINNED_COMMIT, 'master']) {

diff --git a/.evergreen/install-dependencies.sh b/.evergreen/install-dependencies.sh
@@ -110,5 +110,4 @@ fi
 
 echo "npm version: $(npm -v)"
 
-# TODO(NODE-5180): remove --force option
-npm install --force "${NPM_OPTIONS}"
+npm install "${NPM_OPTIONS}"
diff --git a/.evergreen/run-custom-csfle-tests.sh b/.evergreen/run-custom-csfle-tests.sh
@@ -52,8 +52,7 @@ popd # mongo-c-driver
 
 pushd libmongocrypt/bindings/node
 
-# TODO(NODE-5180): remove --force option
-npm install --force --production --ignore-scripts
+npm install --production --ignore-scripts
 bash ./etc/build-static.sh
 
 popd # libmongocrypt/bindings/node
@@ -82,8 +81,7 @@ pushd ../csfle-deps-tmp/libmongocrypt/bindings/node
 killall mongocryptd || true
 
 # only prod deps were installed earlier, install devDependencies here (except for mongodb!)
-# TODO(NODE-5180): remove --force option
-npm install --force --ignore-scripts
+npm install --ignore-scripts
 
 # copy mongodb into CSFLE's node_modules
 rm -rf node_modules/mongodb

diff --git a/.evergreen/run-serverless-tests.sh b/.evergreen/run-serverless-tests.sh
@@ -10,8 +10,7 @@ if [ -z ${MONGODB_URI+omitted} ]; then echo "MONGODB_URI is unset" && exit 1; fi
 if [ -z ${SERVERLESS_ATLAS_USER+omitted} ]; then echo "SERVERLESS_ATLAS_USER is unset" && exit 1; fi
 if [ -z ${SERVERLESS_ATLAS_PASSWORD+omitted} ]; then echo "SERVERLESS_ATLAS_PASSWORD is unset" && exit 1; fi
 
-# TODO(NODE-5180): remove --force option
-npm install --force 'mongodb-client-encryption@alpha'
+npm install mongodb-client-encryption
 
 npx mocha \
   --config test/mocha_mongodb.json \

diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
@@ -52,10 +52,9 @@ else
   source "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh
 fi
 
-# TODO(NODE-5180): remove --force option
-npm install --force 'mongodb-client-encryption@alpha'
-npm install --force @mongodb-js/zstd
-npm install --force snappy
+npm install mongodb-client-encryption
+npm install @mongodb-js/zstd
+npm install snappy
 
 export AUTH=$AUTH
 export SINGLE_MONGOS_LB_URI=${SINGLE_MONGOS_LB_URI}