Skip to content

Commit 27618ae

Browse files
nbbeekennbbeeken
authored
chore(NODE-6400): migrate node download script to drivers-tools (#4244)
1 parent 6ecf198 commit 27618ae

40 files changed

+185
-227
lines changed

‎.evergreen/config.in.yml‎

Lines changed: 48 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ functions:
322322
timeout_secs: 60
323323
env:
324324
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
325+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
325326
binary: bash
326327
args:
327328
- "${PROJECT_DIRECTORY}/.evergreen/run-lint-checks.sh"
@@ -334,6 +335,7 @@ functions:
334335
timeout_secs: 60
335336
env:
336337
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
338+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
337339
binary: bash
338340
args:
339341
- "${PROJECT_DIRECTORY}/.evergreen/run-unit-tests.sh"
@@ -346,6 +348,7 @@ functions:
346348
timeout_secs: 60
347349
env:
348350
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
351+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
349352
TS_VERSION: ${TS_VERSION}
350353
TS_CHECK: CHECK_TYPES
351354
TYPES_VERSION: ${TYPES_VERSION}
@@ -361,6 +364,7 @@ functions:
361364
timeout_secs: 60
362365
env:
363366
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
367+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
364368
binary: bash
365369
args:
366370
- "${PROJECT_DIRECTORY}/.evergreen/run-resource-management.sh"
@@ -373,6 +377,7 @@ functions:
373377
timeout_secs: 60
374378
env:
375379
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
380+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
376381
MONGODB_URI: ${MONGODB_URI}
377382
binary: bash
378383
args:
@@ -386,6 +391,7 @@ functions:
386391
timeout_secs: 60
387392
env:
388393
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
394+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
389395
TS_VERSION: ${TS_VERSION}
390396
TS_CHECK: COMPILE_DRIVER
391397
TYPES_VERSION: ${TYPES_VERSION}
@@ -464,7 +470,7 @@ functions:
464470
working_dir: "src"
465471
script: |
466472
${PREPARE_SHELL}
467-
source "${PROJECT_DIRECTORY}/.evergreen/init-node-and-npm-env.sh"
473+
source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
468474
rm -rf ./node_modules/@aws-sdk/credential-providers
469475
470476
"run atlas tests":
@@ -473,6 +479,8 @@ functions:
473479
params:
474480
working_dir: "src"
475481
binary: bash
482+
env:
483+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
476484
args:
477485
- -c
478486
- ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/atlas_connect
@@ -482,6 +490,7 @@ functions:
482490
working_dir: "src"
483491
binary: bash
484492
env:
493+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
485494
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
486495
args:
487496
- .evergreen/run-atlas-tests.sh
@@ -527,43 +536,49 @@ functions:
527536
bash ${PROJECT_DIRECTORY}/.evergreen/run-socks5-tests.sh
528537
529538
"run kerberos tests":
530-
- command: shell.exec
539+
- command: subprocess.exec
531540
type: test
532541
params:
542+
binary: bash
533543
working_dir: src
534-
script: |
535-
export PROJECT_DIRECTORY="$(pwd)"
536-
export KRB5_KEYTAB='${gssapi_auth_keytab_base64}'
537-
export KRB5_NEW_KEYTAB='${gssapi_auth_new_keytab_base64}'
538-
export KRB5_PRINCIPAL='${gssapi_auth_principal}'
539-
export MONGODB_URI='${gssapi_auth_mongodb_uri}'
540-
export NODE_LTS_VERSION='${NODE_LTS_VERSION}'
541-
542-
bash ${PROJECT_DIRECTORY}/.evergreen/run-kerberos-tests.sh
544+
env:
545+
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
546+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
547+
KRB5_KEYTAB: ${gssapi_auth_keytab_base64}
548+
KRB5_NEW_KEYTAB: ${gssapi_auth_new_keytab_base64}
549+
KRB5_PRINCIPAL: ${gssapi_auth_principal}
550+
MONGODB_URI: ${gssapi_auth_mongodb_uri}
551+
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
552+
args:
553+
- .evergreen/run-kerberos-tests.sh
543554

544555
"run ldap tests":
545-
- command: shell.exec
556+
- command: subprocess.exec
546557
type: test
547558
params:
548-
working_dir: "src"
549-
script: |
550-
export PROJECT_DIRECTORY="$(pwd)"
551-
export MONGODB_URI='${plain_auth_mongodb_uri}'
552-
export NODE_LTS_VERSION='${NODE_LTS_VERSION}'
553-
554-
bash ${PROJECT_DIRECTORY}/.evergreen/run-ldap-tests.sh
559+
working_dir: src
560+
binary: bash
561+
env:
562+
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
563+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
564+
MONGODB_URI: ${plain_auth_mongodb_uri}
565+
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
566+
args:
567+
- .evergreen/run-ldap-tests.sh
555568

556569
"run data lake tests":
557-
- command: shell.exec
570+
- command: subprocess.exec
558571
type: test
559572
params:
560573
working_dir: src
561-
script: |
562-
export PROJECT_DIRECTORY="$(pwd)"
563-
export MONGODB_URI='mongodb://mhuser:pencil@localhost'
564-
export NODE_LTS_VERSION='${NODE_LTS_VERSION}'
565-
566-
bash ${PROJECT_DIRECTORY}/.evergreen/run-data-lake-tests.sh
574+
binary: bash
575+
env:
576+
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
577+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
578+
MONGODB_URI: "mongodb://mhuser:pencil@localhost"
579+
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
580+
args:
581+
- .evergreen/run-data-lake-tests.sh
567582

568583
"run tls tests":
569584
- command: shell.exec
@@ -856,7 +871,11 @@ functions:
856871
echo "npm run check:aws" >> $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh
857872
858873
cp $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh $ECS_SRC_DIR/.evergreen
859-
tar -czf $ECS_SRC_DIR/src.tgz -C $PROJECT_DIRECTORY .
874+
875+
cd ..
876+
tar -czf src.tgz src drivers-tools
877+
mv src.tgz $ECS_SRC_DIR/src.tgz
878+
860879
861880
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
862881
. ./activate-authawsvenv.sh
@@ -973,6 +992,7 @@ functions:
973992
env:
974993
MONGODB_URI: ${MONGODB_URI}
975994
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
995+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
976996
binary: bash
977997
args:
978998
- "${PROJECT_DIRECTORY}/.evergreen/run-lambda-tests.sh"
@@ -1106,6 +1126,7 @@ functions:
11061126
env:
11071127
INSTALL_DIR: mongodb-client-encryption
11081128
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
1129+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
11091130
binary: bash
11101131
args:
11111132
- ${PROJECT_DIRECTORY}/.evergreen/install-mongodb-client-encryption.sh

‎.evergreen/config.yml‎

Lines changed: 49 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ functions:
288288
timeout_secs: 60
289289
env:
290290
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
291+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
291292
binary: bash
292293
args:
293294
- ${PROJECT_DIRECTORY}/.evergreen/run-lint-checks.sh
@@ -299,6 +300,7 @@ functions:
299300
timeout_secs: 60
300301
env:
301302
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
303+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
302304
binary: bash
303305
args:
304306
- ${PROJECT_DIRECTORY}/.evergreen/run-unit-tests.sh
@@ -310,6 +312,7 @@ functions:
310312
timeout_secs: 60
311313
env:
312314
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
315+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
313316
TS_VERSION: ${TS_VERSION}
314317
TS_CHECK: CHECK_TYPES
315318
TYPES_VERSION: ${TYPES_VERSION}
@@ -324,6 +327,7 @@ functions:
324327
timeout_secs: 60
325328
env:
326329
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
330+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
327331
binary: bash
328332
args:
329333
- ${PROJECT_DIRECTORY}/.evergreen/run-resource-management.sh
@@ -335,6 +339,7 @@ functions:
335339
timeout_secs: 60
336340
env:
337341
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
342+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
338343
MONGODB_URI: ${MONGODB_URI}
339344
binary: bash
340345
args:
@@ -347,6 +352,7 @@ functions:
347352
timeout_secs: 60
348353
env:
349354
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
355+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
350356
TS_VERSION: ${TS_VERSION}
351357
TS_CHECK: COMPILE_DRIVER
352358
TYPES_VERSION: ${TYPES_VERSION}
@@ -418,13 +424,15 @@ functions:
418424
working_dir: src
419425
script: |
420426
${PREPARE_SHELL}
421-
source "${PROJECT_DIRECTORY}/.evergreen/init-node-and-npm-env.sh"
427+
source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
422428
rm -rf ./node_modules/@aws-sdk/credential-providers
423429
run atlas tests:
424430
- command: subprocess.exec
425431
params:
426432
working_dir: src
427433
binary: bash
434+
env:
435+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
428436
args:
429437
- '-c'
430438
- ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/atlas_connect
@@ -434,6 +442,7 @@ functions:
434442
working_dir: src
435443
binary: bash
436444
env:
445+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
437446
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
438447
args:
439448
- .evergreen/run-atlas-tests.sh
@@ -490,41 +499,47 @@ functions:
490499
491500
bash ${PROJECT_DIRECTORY}/.evergreen/run-socks5-tests.sh
492501
run kerberos tests:
493-
- command: shell.exec
502+
- command: subprocess.exec
494503
type: test
495504
params:
505+
binary: bash
496506
working_dir: src
497-
script: |
498-
export PROJECT_DIRECTORY="$(pwd)"
499-
export KRB5_KEYTAB='${gssapi_auth_keytab_base64}'
500-
export KRB5_NEW_KEYTAB='${gssapi_auth_new_keytab_base64}'
501-
export KRB5_PRINCIPAL='${gssapi_auth_principal}'
502-
export MONGODB_URI='${gssapi_auth_mongodb_uri}'
503-
export NODE_LTS_VERSION='${NODE_LTS_VERSION}'
504-
505-
bash ${PROJECT_DIRECTORY}/.evergreen/run-kerberos-tests.sh
507+
env:
508+
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
509+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
510+
KRB5_KEYTAB: ${gssapi_auth_keytab_base64}
511+
KRB5_NEW_KEYTAB: ${gssapi_auth_new_keytab_base64}
512+
KRB5_PRINCIPAL: ${gssapi_auth_principal}
513+
MONGODB_URI: ${gssapi_auth_mongodb_uri}
514+
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
515+
args:
516+
- .evergreen/run-kerberos-tests.sh
506517
run ldap tests:
507-
- command: shell.exec
518+
- command: subprocess.exec
508519
type: test
509520
params:
510521
working_dir: src
511-
script: |
512-
export PROJECT_DIRECTORY="$(pwd)"
513-
export MONGODB_URI='${plain_auth_mongodb_uri}'
514-
export NODE_LTS_VERSION='${NODE_LTS_VERSION}'
515-
516-
bash ${PROJECT_DIRECTORY}/.evergreen/run-ldap-tests.sh
522+
binary: bash
523+
env:
524+
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
525+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
526+
MONGODB_URI: ${plain_auth_mongodb_uri}
527+
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
528+
args:
529+
- .evergreen/run-ldap-tests.sh
517530
run data lake tests:
518-
- command: shell.exec
531+
- command: subprocess.exec
519532
type: test
520533
params:
521534
working_dir: src
522-
script: |
523-
export PROJECT_DIRECTORY="$(pwd)"
524-
export MONGODB_URI='mongodb://mhuser:pencil@localhost'
525-
export NODE_LTS_VERSION='${NODE_LTS_VERSION}'
526-
527-
bash ${PROJECT_DIRECTORY}/.evergreen/run-data-lake-tests.sh
535+
binary: bash
536+
env:
537+
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
538+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
539+
MONGODB_URI: mongodb://mhuser:pencil@localhost
540+
NODE_LTS_VERSION: ${NODE_LTS_VERSION}
541+
args:
542+
- .evergreen/run-data-lake-tests.sh
528543
run tls tests:
529544
- command: shell.exec
530545
type: test
@@ -817,7 +832,13 @@ functions:
817832
818833
cp $PROJECT_DIRECTORY/.evergreen/run-mongodb-aws-ecs-test.sh $ECS_SRC_DIR/.evergreen
819834
820-
tar -czf $ECS_SRC_DIR/src.tgz -C $PROJECT_DIRECTORY .
835+
836+
cd ..
837+
838+
tar -czf src.tgz src drivers-tools
839+
840+
mv src.tgz $ECS_SRC_DIR/src.tgz
841+
821842
822843
823844
cd ${DRIVERS_TOOLS}/.evergreen/auth_aws
@@ -942,6 +963,7 @@ functions:
942963
env:
943964
MONGODB_URI: ${MONGODB_URI}
944965
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
966+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
945967
binary: bash
946968
args:
947969
- ${PROJECT_DIRECTORY}/.evergreen/run-lambda-tests.sh
@@ -1065,6 +1087,7 @@ functions:
10651087
env:
10661088
INSTALL_DIR: mongodb-client-encryption
10671089
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
1090+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
10681091
binary: bash
10691092
args:
10701093
- ${PROJECT_DIRECTORY}/.evergreen/install-mongodb-client-encryption.sh

‎.evergreen/copy-driver-to-azure-and-run.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ source "${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/secrets-export.sh"
66
if [ -z ${AZUREKMS_RESOURCEGROUP+omitted} ]; then echo "AZUREKMS_RESOURCEGROUP is unset" && exit 1; fi
77
if [ -z ${AZUREKMS_VMNAME+omitted} ]; then echo "AZUREKMS_VMNAME is unset" && exit 1; fi
88

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

1111
export AZUREKMS_PUBLICKEYPATH=/tmp/testazurekms_publickey
1212
export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
1313

14-
echo "compressing node driver source ... begin"
15-
tar -czf node-driver-source.tgz src
16-
echo "compressing node driver source ... end"
14+
echo "compressing node driver source and tools ... begin"
15+
tar -czf node-driver-source.tgz src drivers-tools
16+
echo "compressing node driver source and tools ... end"
1717

1818
export AZUREKMS_SRC=node-driver-source.tgz
1919
export AZUREKMS_DST="./"
@@ -29,4 +29,4 @@ echo "decompressing node driver tar on azure ... end"
2929
echo "Running test ... begin"
3030
export AZUREKMS_CMD="env EXPECTED_AZUREKMS_OUTCOME=success bash src/.evergreen/run-azure-kms-tests.sh"
3131
${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh
32-
echo "Running test ... end"
32+
echo "Running test ... end"

0 commit comments

Comments
 (0)