Skip to content

Commit fa05d61

Browse files
test(NODE-5180): bump mongodb-client-encryption pinned commits to 2.8.0 release (#3668)
1 parent 2a4d607 commit fa05d61

8 files changed

+14
-21
lines changed

.evergreen/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2558,7 +2558,7 @@ tasks:
25582558
- func: bootstrap kms servers
25592559
- func: run custom csfle tests
25602560
vars:
2561-
CSFLE_GIT_REF: 1524eac203e4145e9f4835e519f1e4663ff15953
2561+
CSFLE_GIT_REF: c56c70340093070b1ef5c8a28190187eea21a6e9
25622562
- name: run-custom-csfle-tests-5.0-master
25632563
tags:
25642564
- run-custom-dependency-tests
@@ -2588,7 +2588,7 @@ tasks:
25882588
- func: bootstrap kms servers
25892589
- func: run custom csfle tests
25902590
vars:
2591-
CSFLE_GIT_REF: 1524eac203e4145e9f4835e519f1e4663ff15953
2591+
CSFLE_GIT_REF: c56c70340093070b1ef5c8a28190187eea21a6e9
25922592
- name: run-custom-csfle-tests-rapid-master
25932593
tags:
25942594
- run-custom-dependency-tests
@@ -2618,7 +2618,7 @@ tasks:
26182618
- func: bootstrap kms servers
26192619
- func: run custom csfle tests
26202620
vars:
2621-
CSFLE_GIT_REF: 1524eac203e4145e9f4835e519f1e4663ff15953
2621+
CSFLE_GIT_REF: c56c70340093070b1ef5c8a28190187eea21a6e9
26222622
- name: run-custom-csfle-tests-latest-master
26232623
tags:
26242624
- run-custom-dependency-tests

.evergreen/generate_evergreen_tasks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ BUILD_VARIANTS.push({
605605

606606
const oneOffFuncAsTasks = [];
607607

608-
const FLE_PINNED_COMMIT = '1524eac203e4145e9f4835e519f1e4663ff15953';
608+
const FLE_PINNED_COMMIT = 'c56c70340093070b1ef5c8a28190187eea21a6e9';
609609

610610
for (const version of ['5.0', 'rapid', 'latest']) {
611611
for (const ref of [FLE_PINNED_COMMIT, 'master']) {

.evergreen/install-dependencies.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,4 @@ fi
105105

106106
echo "npm version: $(npm -v)"
107107

108-
# TODO(NODE-5180): remove --force option
109-
npm install --force "${NPM_OPTIONS}"
108+
npm install "${NPM_OPTIONS}"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ source ".evergreen/init-nvm.sh"
99

1010
set -o xtrace
1111

12-
# TODO(NODE-5180): remove --force option
13-
npm install --force 'mongodb-client-encryption@alpha'
12+
npm install mongodb-client-encryption
1413

1514
export MONGODB_URI="mongodb://localhost:27017"
1615

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ popd # mongo-c-driver
5252

5353
pushd libmongocrypt/bindings/node
5454

55-
# TODO(NODE-5180): remove --force option
56-
npm install --force --production --ignore-scripts
55+
npm install --production --ignore-scripts
5756
bash ./etc/build-static.sh
5857

5958
popd # libmongocrypt/bindings/node
@@ -82,8 +81,7 @@ pushd ../csfle-deps-tmp/libmongocrypt/bindings/node
8281
killall mongocryptd || true
8382

8483
# only prod deps were installed earlier, install devDependencies here (except for mongodb!)
85-
# TODO(NODE-5180): remove --force option
86-
npm install --force --ignore-scripts
84+
npm install --ignore-scripts
8785

8886
# copy mongodb into CSFLE's node_modules
8987
rm -rf node_modules/mongodb

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ source ".evergreen/init-nvm.sh"
99

1010
set -o xtrace
1111

12-
# TODO(NODE-5180): remove --force option
13-
npm install --force 'mongodb-client-encryption@alpha'
14-
npm install --force 'gcp-metadata'
12+
npm install mongodb-client-encryption
13+
npm install gcp-metadata
1514

1615
export MONGODB_URI="mongodb://localhost:27017"
1716

.evergreen/run-serverless-tests.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ if [ -z ${MONGODB_URI+omitted} ]; then echo "MONGODB_URI is unset" && exit 1; fi
1010
if [ -z ${SERVERLESS_ATLAS_USER+omitted} ]; then echo "SERVERLESS_ATLAS_USER is unset" && exit 1; fi
1111
if [ -z ${SERVERLESS_ATLAS_PASSWORD+omitted} ]; then echo "SERVERLESS_ATLAS_PASSWORD is unset" && exit 1; fi
1212

13-
# TODO(NODE-5180): remove --force option
14-
npm install --force 'mongodb-client-encryption@alpha'
13+
npm install mongodb-client-encryption
1514

1615
npx mocha \
1716
--config test/mocha_mongodb.json \

.evergreen/run-tests.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,9 @@ else
5252
source "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh
5353
fi
5454

55-
# TODO(NODE-5180): remove --force option
56-
npm install --force 'mongodb-client-encryption@alpha'
57-
npm install --force @mongodb-js/zstd
58-
npm install --force snappy
55+
npm install mongodb-client-encryption
56+
npm install @mongodb-js/zstd
57+
npm install snappy
5958

6059
export AUTH=$AUTH
6160
export SINGLE_MONGOS_LB_URI=${SINGLE_MONGOS_LB_URI}

0 commit comments

Comments
 (0)