Skip to content

chore(NODE-6400): migrate node download script to drivers-tools #4244

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 19 commits into from
Oct 10, 2024
Merged

chore(NODE-6400): migrate node download script to drivers-tools #4244

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1a393ff
chore(NODE-5845): migrate node download script to drivers-tools
nbbeeken Sep 20, 2024
b0cd081
chore: use drivers-tools init-env script
nbbeeken Sep 20, 2024
80f55b5
chore: put DRIVERS_TOOLS back above repo
nbbeeken Sep 26, 2024
0596001
chore: add driver tools
nbbeeken Sep 26, 2024
7ca3697
chore: add tools to tasks
nbbeeken Sep 27, 2024
e54f060
chore: fix ecs
nbbeeken Oct 8, 2024
e2b526b
chore: fix oidc
nbbeeken Oct 9, 2024
434f1e6
chore: azure kms
nbbeeken Oct 9, 2024
9f2ee81
chore: debug fle
nbbeeken Oct 9, 2024
0ccffd6
chore: gcp kms
nbbeeken Oct 9, 2024
2f979a0
fix npm version
nbbeeken Oct 9, 2024
bca5747
chore: fix install fle
nbbeeken Oct 9, 2024
c0bfabf
gen config
nbbeeken Oct 9, 2024
f4dfbbe
copy pasta
nbbeeken Oct 9, 2024
552d848
chore: typo
nbbeeken Oct 9, 2024
f35b9bd
chore: fix local OIDC tests
nbbeeken Oct 9, 2024
e5e6c23
chore: fix azure
nbbeeken Oct 9, 2024
c4db7e7
chore: echos
nbbeeken Oct 9, 2024
4129f75
Merge branch 'main' into chore-node-5845
W-A-James Oct 9, 2024
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
75 changes: 48 additions & 27 deletions .evergreen/config.in.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ functions:
timeout_secs: 60
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
binary: bash
args:
- "${PROJECT_DIRECTORY}/.evergreen/run-lint-checks.sh"
Expand All @@ -334,6 +335,7 @@ functions:
timeout_secs: 60
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
binary: bash
args:
- "${PROJECT_DIRECTORY}/.evergreen/run-unit-tests.sh"
Expand All @@ -346,6 +348,7 @@ functions:
timeout_secs: 60
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
TS_VERSION: ${TS_VERSION}
TS_CHECK: CHECK_TYPES
TYPES_VERSION: ${TYPES_VERSION}
Expand All @@ -361,6 +364,7 @@ functions:
timeout_secs: 60
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
binary: bash
args:
- "${PROJECT_DIRECTORY}/.evergreen/run-resource-management.sh"
Expand All @@ -373,6 +377,7 @@ functions:
timeout_secs: 60
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
MONGODB_URI: ${MONGODB_URI}
binary: bash
args:
Expand All @@ -386,6 +391,7 @@ functions:
timeout_secs: 60
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
TS_VERSION: ${TS_VERSION}
TS_CHECK: COMPILE_DRIVER
TYPES_VERSION: ${TYPES_VERSION}
Expand Down Expand Up @@ -464,7 +470,7 @@ functions:
working_dir: "src"
script: |
${PREPARE_SHELL}
source "${PROJECT_DIRECTORY}/.evergreen/init-node-and-npm-env.sh"
source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
rm -rf ./node_modules/@aws-sdk/credential-providers

"run atlas tests":
Expand All @@ -473,6 +479,8 @@ functions:
params:
working_dir: "src"
binary: bash
env:
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
args:
- -c
- ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/atlas_connect
Expand All @@ -482,6 +490,7 @@ functions:
working_dir: "src"
binary: bash
env:
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
args:
- .evergreen/run-atlas-tests.sh
Expand Down Expand Up @@ -527,43 +536,49 @@ functions:
bash ${PROJECT_DIRECTORY}/.evergreen/run-socks5-tests.sh

"run kerberos tests":
- command: shell.exec
- command: subprocess.exec
type: test
params:
binary: bash
working_dir: src
script: |
export PROJECT_DIRECTORY="$(pwd)"
export KRB5_KEYTAB='${gssapi_auth_keytab_base64}'
export KRB5_NEW_KEYTAB='${gssapi_auth_new_keytab_base64}'
export KRB5_PRINCIPAL='${gssapi_auth_principal}'
export MONGODB_URI='${gssapi_auth_mongodb_uri}'
export NODE_LTS_VERSION='${NODE_LTS_VERSION}'

bash ${PROJECT_DIRECTORY}/.evergreen/run-kerberos-tests.sh
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
KRB5_KEYTAB: ${gssapi_auth_keytab_base64}
KRB5_NEW_KEYTAB: ${gssapi_auth_new_keytab_base64}
KRB5_PRINCIPAL: ${gssapi_auth_principal}
MONGODB_URI: ${gssapi_auth_mongodb_uri}
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
args:
- .evergreen/run-kerberos-tests.sh

"run ldap tests":
- command: shell.exec
- command: subprocess.exec
type: test
params:
working_dir: "src"
script: |
export PROJECT_DIRECTORY="$(pwd)"
export MONGODB_URI='${plain_auth_mongodb_uri}'
export NODE_LTS_VERSION='${NODE_LTS_VERSION}'

bash ${PROJECT_DIRECTORY}/.evergreen/run-ldap-tests.sh
working_dir: src
binary: bash
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
MONGODB_URI: ${plain_auth_mongodb_uri}
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
args:
- .evergreen/run-ldap-tests.sh

"run data lake tests":
- command: shell.exec
- command: subprocess.exec
type: test
params:
working_dir: src
script: |
export PROJECT_DIRECTORY="$(pwd)"
export MONGODB_URI='mongodb://mhuser:pencil@localhost'
export NODE_LTS_VERSION='${NODE_LTS_VERSION}'

bash ${PROJECT_DIRECTORY}/.evergreen/run-data-lake-tests.sh
binary: bash
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
MONGODB_URI: "mongodb://mhuser:pencil@localhost"
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
args:
- .evergreen/run-data-lake-tests.sh

"run tls tests":
- command: shell.exec
Expand Down Expand Up @@ -856,7 +871,11 @@ functions:
echo "npm run check:aws" >> $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh

cp $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh $ECS_SRC_DIR/.evergreen
tar -czf $ECS_SRC_DIR/src.tgz -C $PROJECT_DIRECTORY .

cd ..
tar -czf src.tgz src drivers-tools
mv src.tgz $ECS_SRC_DIR/src.tgz


cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
. ./activate-authawsvenv.sh
Expand Down Expand Up @@ -973,6 +992,7 @@ functions:
env:
MONGODB_URI: ${MONGODB_URI}
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
binary: bash
args:
- "${PROJECT_DIRECTORY}/.evergreen/run-lambda-tests.sh"
Expand Down Expand Up @@ -1106,6 +1126,7 @@ functions:
env:
INSTALL_DIR: mongodb-client-encryption
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
binary: bash
args:
- ${PROJECT_DIRECTORY}/.evergreen/install-mongodb-client-encryption.sh
Expand Down
75 changes: 49 additions & 26 deletions .evergreen/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ functions:
timeout_secs: 60
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
binary: bash
args:
- ${PROJECT_DIRECTORY}/.evergreen/run-lint-checks.sh
Expand All @@ -299,6 +300,7 @@ functions:
timeout_secs: 60
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
binary: bash
args:
- ${PROJECT_DIRECTORY}/.evergreen/run-unit-tests.sh
Expand All @@ -310,6 +312,7 @@ functions:
timeout_secs: 60
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
TS_VERSION: ${TS_VERSION}
TS_CHECK: CHECK_TYPES
TYPES_VERSION: ${TYPES_VERSION}
Expand All @@ -324,6 +327,7 @@ functions:
timeout_secs: 60
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
binary: bash
args:
- ${PROJECT_DIRECTORY}/.evergreen/run-resource-management.sh
Expand All @@ -335,6 +339,7 @@ functions:
timeout_secs: 60
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
MONGODB_URI: ${MONGODB_URI}
binary: bash
args:
Expand All @@ -347,6 +352,7 @@ functions:
timeout_secs: 60
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
TS_VERSION: ${TS_VERSION}
TS_CHECK: COMPILE_DRIVER
TYPES_VERSION: ${TYPES_VERSION}
Expand Down Expand Up @@ -418,13 +424,15 @@ functions:
working_dir: src
script: |
${PREPARE_SHELL}
source "${PROJECT_DIRECTORY}/.evergreen/init-node-and-npm-env.sh"
source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
rm -rf ./node_modules/@aws-sdk/credential-providers
run atlas tests:
- command: subprocess.exec
params:
working_dir: src
binary: bash
env:
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
args:
- '-c'
- ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/atlas_connect
Expand All @@ -434,6 +442,7 @@ functions:
working_dir: src
binary: bash
env:
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
args:
- .evergreen/run-atlas-tests.sh
Expand Down Expand Up @@ -490,41 +499,47 @@ functions:

bash ${PROJECT_DIRECTORY}/.evergreen/run-socks5-tests.sh
run kerberos tests:
- command: shell.exec
- command: subprocess.exec
type: test
params:
binary: bash
working_dir: src
script: |
export PROJECT_DIRECTORY="$(pwd)"
export KRB5_KEYTAB='${gssapi_auth_keytab_base64}'
export KRB5_NEW_KEYTAB='${gssapi_auth_new_keytab_base64}'
export KRB5_PRINCIPAL='${gssapi_auth_principal}'
export MONGODB_URI='${gssapi_auth_mongodb_uri}'
export NODE_LTS_VERSION='${NODE_LTS_VERSION}'

bash ${PROJECT_DIRECTORY}/.evergreen/run-kerberos-tests.sh
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
KRB5_KEYTAB: ${gssapi_auth_keytab_base64}
KRB5_NEW_KEYTAB: ${gssapi_auth_new_keytab_base64}
KRB5_PRINCIPAL: ${gssapi_auth_principal}
MONGODB_URI: ${gssapi_auth_mongodb_uri}
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
args:
- .evergreen/run-kerberos-tests.sh
run ldap tests:
- command: shell.exec
- command: subprocess.exec
type: test
params:
working_dir: src
script: |
export PROJECT_DIRECTORY="$(pwd)"
export MONGODB_URI='${plain_auth_mongodb_uri}'
export NODE_LTS_VERSION='${NODE_LTS_VERSION}'

bash ${PROJECT_DIRECTORY}/.evergreen/run-ldap-tests.sh
binary: bash
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
MONGODB_URI: ${plain_auth_mongodb_uri}
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
args:
- .evergreen/run-ldap-tests.sh
run data lake tests:
- command: shell.exec
- command: subprocess.exec
type: test
params:
working_dir: src
script: |
export PROJECT_DIRECTORY="$(pwd)"
export MONGODB_URI='mongodb://mhuser:pencil@localhost'
export NODE_LTS_VERSION='${NODE_LTS_VERSION}'

bash ${PROJECT_DIRECTORY}/.evergreen/run-data-lake-tests.sh
binary: bash
env:
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
MONGODB_URI: mongodb://mhuser:pencil@localhost
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
args:
- .evergreen/run-data-lake-tests.sh
run tls tests:
- command: shell.exec
type: test
Expand Down Expand Up @@ -817,7 +832,13 @@ functions:

cp $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh $ECS_SRC_DIR/.evergreen

tar -czf $ECS_SRC_DIR/src.tgz -C $PROJECT_DIRECTORY .

cd ..

tar -czf src.tgz src drivers-tools

mv src.tgz $ECS_SRC_DIR/src.tgz



cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
Expand Down Expand Up @@ -942,6 +963,7 @@ functions:
env:
MONGODB_URI: ${MONGODB_URI}
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
binary: bash
args:
- ${PROJECT_DIRECTORY}/.evergreen/run-lambda-tests.sh
Expand Down Expand Up @@ -1065,6 +1087,7 @@ functions:
env:
INSTALL_DIR: mongodb-client-encryption
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
binary: bash
args:
- ${PROJECT_DIRECTORY}/.evergreen/install-mongodb-client-encryption.sh
Expand Down
6 changes: 3 additions & 3 deletions .evergreen/copy-driver-to-azure-and-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ source "${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/secrets-export.sh"
if [ -z ${AZUREKMS_RESOURCEGROUP+omitted} ]; then echo "AZUREKMS_RESOURCEGROUP is unset" && exit 1; fi
if [ -z ${AZUREKMS_VMNAME+omitted} ]; then echo "AZUREKMS_VMNAME is unset" && exit 1; fi

source "${PROJECT_DIRECTORY}/.evergreen/init-node-and-npm-env.sh"
source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh

export AZUREKMS_PUBLICKEYPATH=/tmp/testazurekms_publickey
export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey

echo "compressing node driver source ... begin"
tar -czf node-driver-source.tgz src
tar -czf node-driver-source.tgz src drivers-tools
echo "compressing node driver source ... end"

export AZUREKMS_SRC=node-driver-source.tgz
Expand All @@ -29,4 +29,4 @@ echo "decompressing node driver tar on azure ... end"
echo "Running test ... begin"
export AZUREKMS_CMD="env EXPECTED_AZUREKMS_OUTCOME=success bash src/.evergreen/run-azure-kms-tests.sh"
${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh
echo "Running test ... end"
echo "Running test ... end"
21 changes: 0 additions & 21 deletions .evergreen/init-node-and-npm-env.sh
View file
Open in desktop

This file was deleted.

Loading