Skip to content

Commit 66ba28f

Browse files
test(no-story): bump mongodb-client-encryption pinned commits to 2.8.0 release (#3683)
1 parent d26ad61 commit 66ba28f

File tree

6 files changed

+11
-16
lines changed

6 files changed

+11
-16
lines changed

.evergreen/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2448,7 +2448,7 @@ tasks:
24482448
- func: bootstrap kms servers
24492449
- func: run custom csfle tests
24502450
vars:
2451-
CSFLE_GIT_REF: 1524eac203e4145e9f4835e519f1e4663ff15953
2451+
CSFLE_GIT_REF: c56c70340093070b1ef5c8a28190187eea21a6e9
24522452
- name: run-custom-csfle-tests-5.0-master
24532453
tags:
24542454
- run-custom-dependency-tests
@@ -2478,7 +2478,7 @@ tasks:
24782478
- func: bootstrap kms servers
24792479
- func: run custom csfle tests
24802480
vars:
2481-
CSFLE_GIT_REF: 1524eac203e4145e9f4835e519f1e4663ff15953
2481+
CSFLE_GIT_REF: c56c70340093070b1ef5c8a28190187eea21a6e9
24822482
- name: run-custom-csfle-tests-rapid-master
24832483
tags:
24842484
- run-custom-dependency-tests
@@ -2508,7 +2508,7 @@ tasks:
25082508
- func: bootstrap kms servers
25092509
- func: run custom csfle tests
25102510
vars:
2511-
CSFLE_GIT_REF: 1524eac203e4145e9f4835e519f1e4663ff15953
2511+
CSFLE_GIT_REF: c56c70340093070b1ef5c8a28190187eea21a6e9
25122512
- name: run-custom-csfle-tests-latest-master
25132513
tags:
25142514
- run-custom-dependency-tests

.evergreen/generate_evergreen_tasks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ const oneOffFuncAsTasks = oneOffFuncs.map(oneOffFunc => ({
608608
]
609609
}));
610610

611-
const FLE_PINNED_COMMIT = '1524eac203e4145e9f4835e519f1e4663ff15953'
611+
const FLE_PINNED_COMMIT = 'c56c70340093070b1ef5c8a28190187eea21a6e9';
612612

613613
for (const version of ['5.0', 'rapid', 'latest']) {
614614
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
@@ -110,5 +110,4 @@ fi
110110

111111
echo "npm version: $(npm -v)"
112112

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

.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-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)