Skip to content

Commit 8a7ce1f

Browse files
authored
test(NODE-5074): update fle2 v2 spec tests (#3627)
1 parent 53a0aae commit 8a7ce1f

File tree

128 files changed

+511
-1293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+511
-1293
lines changed

.evergreen/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2534,7 +2534,7 @@ tasks:
25342534
- func: bootstrap kms servers
25352535
- func: run custom csfle tests
25362536
vars:
2537-
CSFLE_GIT_REF: cd7e938619aa52ce652d13690780df5f383bbef0
2537+
CSFLE_GIT_REF: 1524eac203e4145e9f4835e519f1e4663ff15953
25382538
- name: run-custom-csfle-tests-5.0-master
25392539
tags:
25402540
- run-custom-dependency-tests
@@ -2564,7 +2564,7 @@ tasks:
25642564
- func: bootstrap kms servers
25652565
- func: run custom csfle tests
25662566
vars:
2567-
CSFLE_GIT_REF: cd7e938619aa52ce652d13690780df5f383bbef0
2567+
CSFLE_GIT_REF: 1524eac203e4145e9f4835e519f1e4663ff15953
25682568
- name: run-custom-csfle-tests-rapid-master
25692569
tags:
25702570
- run-custom-dependency-tests
@@ -2594,7 +2594,7 @@ tasks:
25942594
- func: bootstrap kms servers
25952595
- func: run custom csfle tests
25962596
vars:
2597-
CSFLE_GIT_REF: cd7e938619aa52ce652d13690780df5f383bbef0
2597+
CSFLE_GIT_REF: 1524eac203e4145e9f4835e519f1e4663ff15953
25982598
- name: run-custom-csfle-tests-latest-master
25992599
tags:
26002600
- run-custom-dependency-tests

.evergreen/generate_evergreen_tasks.js

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

596596
const oneOffFuncAsTasks = [];
597597

598-
const FLE_PINNED_COMMIT = 'cd7e938619aa52ce652d13690780df5f383bbef0';
598+
const FLE_PINNED_COMMIT = '1524eac203e4145e9f4835e519f1e4663ff15953';
599599

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

.evergreen/install-dependencies.sh

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

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

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

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

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

1010
set -o xtrace
1111

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

1415
export MONGODB_URI="mongodb://localhost:27017"
1516

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

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

5353
pushd libmongocrypt/bindings/node
5454

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

5859
popd # libmongocrypt/bindings/node
@@ -81,7 +82,8 @@ pushd ../csfle-deps-tmp/libmongocrypt/bindings/node
8182
killall mongocryptd || true
8283

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

8688
# copy mongodb into CSFLE's node_modules
8789
rm -rf node_modules/mongodb

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

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

1010
set -o xtrace
1111

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

1516
export MONGODB_URI="mongodb://localhost:27017"
1617

.evergreen/run-serverless-tests.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ 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-
npm install 'mongodb-client-encryption@latest'
13+
# TODO(NODE-5180): remove --force option
14+
npm install --force 'mongodb-client-encryption@alpha'
1415

1516
npx mocha \
1617
--config test/mocha_mongodb.json \

.evergreen/run-tests.sh

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

55-
npm install 'mongodb-client-encryption@latest'
56-
npm install @mongodb-js/zstd
57-
npm install snappy
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
5859

5960
export AUTH=$AUTH
6061
export SINGLE_MONGOS_LB_URI=${SINGLE_MONGOS_LB_URI}

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
},
3535
"peerDependencies": {
3636
"@aws-sdk/credential-providers": "^3.201.0",
37-
"mongodb-client-encryption": "^2.3.0",
37+
"mongodb-client-encryption": ">=2.3.0 <3",
3838
"snappy": "^7.2.2"
3939
},
4040
"peerDependenciesMeta": {

0 commit comments

Comments
 (0)