Skip to content

refactor(NODE-5422): convert FLE kms providers and errors to Typescript #3779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jul 25, 2023
Merged

refactor(NODE-5422): convert FLE kms providers and errors to Typescript #3779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7800fbf
move csfle src into driver and tests passing
baileympearson Jul 8, 2023
bbd8855
only convert relevant files
baileympearson Jul 19, 2023
5d6d767
convert KMS providers to TS
baileympearson Jul 19, 2023
3b8bc36
cleanup requirements
baileympearson Jul 21, 2023
202fda1
cleanup src
baileympearson Jul 21, 2023
1a0af79
fix lint
baileympearson Jul 21, 2023
d62209a
fix package.json
baileympearson Jul 24, 2023
b5ac95d
remove force install
baileympearson Jul 24, 2023
d2fbad1
address comments
baileympearson Jul 24, 2023
20a4ace
cleanup
baileympearson Jul 25, 2023
b48942f
fix unit tests
baileympearson Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .evergreen/run-azure-kms-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ source ".evergreen/init-node-and-npm-env.sh"

set -o xtrace

npm install mongodb-client-encryption@alpha --force
npm install mongodb-client-encryption@alpha

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

Expand Down
2 changes: 1 addition & 1 deletion .evergreen/run-gcp-kms-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ source ".evergreen/init-node-and-npm-env.sh"

set -o xtrace

npm install mongodb-client-encryption@alpha --force
npm install mongodb-client-encryption@alpha
npm install gcp-metadata

export MONGODB_URI="mongodb://localhost:27017"
Expand Down
5 changes: 0 additions & 5 deletions .evergreen/run-kerberos-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ set -o xtrace
npm install kerberos@">=2.0.0-beta.0"
npm run check:kerberos

if [ "$NODE_LTS_VERSION" != "latest" ] && [ $NODE_LTS_VERSION -lt 20 ]; then
npm install kerberos@"^1.1.7"
npm run check:kerberos
fi

set +o xtrace

# destroy ticket
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/run-serverless-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +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

npm install mongodb-client-encryption@alpha --force
npm install mongodb-client-encryption@alpha

npx mocha \
--config test/mocha_mongodb.json \
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/run-socks5-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function setup_fle() {
# CSFLE_AWS_TEMP_ACCESS_KEY_ID, CSFLE_AWS_TEMP_SECRET_ACCESS_KEY, CSFLE_AWS_TEMP_SESSION_TOKEN
. "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh

npm i --force mongodb-client-encryption@alpha
npm i mongodb-client-encryption@alpha
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
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ else
source "$DRIVERS_TOOLS"/.evergreen/csfle/set-temp-creds.sh
fi

npm install mongodb-client-encryption@alpha --force
npm install mongodb-client-encryption@alpha
npm install @mongodb-js/zstd
npm install snappy

Expand Down
2 changes: 1 addition & 1 deletion .evergreen/run-unit-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ set -o errexit # Exit the script with error if any of the commands fail
source "${PROJECT_DIRECTORY}/.evergreen/init-node-and-npm-env.sh"
set -o xtrace

npm i --force mongodb-client-encryption@alpha
npm i mongodb-client-encryption@alpha

npx nyc npm run check:unit
185 changes: 144 additions & 41 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@mongodb-js/zstd": "^1.1.0",
"gcp-metadata": "^5.2.0",
"kerberos": "^2.0.1",
"mongodb-client-encryption": ">=2.3.0 <3",
"mongodb-client-encryption": ">=6.0.0-alpha.0 <7",
"snappy": "^7.2.2"
},
"peerDependenciesMeta": {
Expand Down Expand Up @@ -90,10 +90,11 @@
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-tsdoc": "^0.2.17",
"express": "^4.18.2",
"gcp-metadata": "^5.2.0",
"js-yaml": "^4.1.0",
"mocha": "^10.2.0",
"mocha-sinon": "^2.1.2",
"mongodb-client-encryption": "^2.8.0",
"mongodb-client-encryption": "^6.0.0-alpha.0",
"mongodb-legacy": "^5.0.0",
"nyc": "^15.1.0",
"prettier": "^2.8.8",
Expand Down
Loading