@@ -305,7 +305,7 @@ functions:
305
305
script : |
306
306
${PREPARE_SHELL}
307
307
# Clean up cse servers
308
- bash ${DRIVERS_TOOLS}/.evergreen/csfle/stop_servers .sh
308
+ bash ${DRIVERS_TOOLS}/.evergreen/csfle/stop-servers .sh
309
309
- command : shell.exec
310
310
params :
311
311
shell : " bash"
@@ -366,10 +366,10 @@ functions:
366
366
params :
367
367
shell : " bash"
368
368
working_dir : src/go.mongodb.org/mongo-driver
369
- add_expansions_to_env : true
369
+ include_expansions_in_env : ["TOPOLOGY", "AUTH", "SSL", "MONGODB_URI", "CRYPT_SHARED_LIB_PATH", "SKIP_CRYPT_SHARED_LIB", "RACE", "MONGO_GO_DRIVER_COMPRESSOR", "REQUIRE_API_VERSION", "LOAD_BALANCER"]
370
370
script : |
371
371
${PREPARE_SHELL}
372
- sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
372
+ bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
373
373
374
374
create-api-report :
375
375
- command : shell.exec
@@ -389,90 +389,32 @@ functions:
389
389
file : src/go.mongodb.org/mongo-driver/perf.json
390
390
391
391
run-enterprise-auth-tests :
392
+ - command : ec2.assume_role
393
+ params :
394
+ role_arn : " ${aws_test_secrets_role}"
392
395
- command : shell.exec
393
396
type : test
394
397
params :
395
398
shell : " bash"
396
399
working_dir : src/go.mongodb.org/mongo-driver
400
+ include_expansions_in_env : ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
397
401
script : |
398
- # DO NOT ECHO WITH XTRACE
399
- if [ "Windows_NT" = "$OS" ]; then
400
- export GOPATH=$(cygpath -w $(dirname $(dirname $(dirname `pwd`))))
401
- export GOCACHE=$(cygpath -w "$(pwd)/.cache")
402
- else
403
- export GOPATH=$(dirname $(dirname $(dirname `pwd`)))
404
- export GOCACHE="$(pwd)/.cache"
405
- fi;
406
- export GOPATH="$GOPATH"
407
- export GOROOT="${GO_DIST}"
408
- export GOCACHE="$GOCACHE"
409
- export PATH="${GCC_PATH}:${GO_DIST}/bin:$PATH"
410
- export MONGODB_URI="${MONGODB_URI}"
411
- export MONGO_GO_DRIVER_COMPRESSOR="${MONGO_GO_DRIVER_COMPRESSOR}"
412
-
413
- make -s evg-test-enterprise-auth
402
+ ${PREPARE_SHELL}
403
+ bash ./etc/run-enterprise-plain-test.sh
414
404
415
405
run-enterprise-gssapi-auth-tests :
416
- - command : shell.exec
417
- type : test
406
+ - command : ec2.assume_role
418
407
params :
419
- shell : " bash"
420
- silent : true
421
- working_dir : src/go.mongodb.org/mongo-driver
422
- script : |
423
- # DO NOT ECHO WITH XTRACE
424
- if [ "Windows_NT" = "$OS" ]; then
425
- export GOPATH=$(cygpath -w $(dirname $(dirname $(dirname `pwd`))))
426
- export GOCACHE=$(cygpath -w "$(pwd)/.cache")
427
- export MONGODB_URI=${gssapi_auth_windows_mongodb_uri}
428
- else
429
- export GOPATH=$(dirname $(dirname $(dirname `pwd`)))
430
- export GOCACHE="$(pwd)/.cache"
431
- echo "${gssapi_auth_linux_keytab_base64}" > /tmp/drivers.keytab.base64
432
- base64 --decode /tmp/drivers.keytab.base64 > ${PROJECT_DIRECTORY}/.evergreen/drivers.keytab
433
- mkdir -p ~/.krb5
434
- cat .evergreen/krb5.config | tee -a ~/.krb5/config
435
- kinit -k -t ${PROJECT_DIRECTORY}/.evergreen/drivers.keytab -p "${gssapi_auth_username}"
436
- export MONGODB_URI="${gssapi_auth_linux_mongodb_uri}"
437
- fi;
438
- export GOPATH="$GOPATH"
439
- export GOROOT="${GO_DIST}"
440
- export GOCACHE="$GOCACHE"
441
- export PATH="${GCC_PATH}:${GO_DIST}/bin:$PATH"
442
- export MONGO_GO_DRIVER_COMPRESSOR="${MONGO_GO_DRIVER_COMPRESSOR}"
443
-
444
- make -s evg-test-enterprise-auth
445
-
446
- run-enterprise-gssapi-service-host-auth-tests :
408
+ role_arn : " ${aws_test_secrets_role}"
447
409
- command : shell.exec
448
410
type : test
449
411
params :
450
412
shell : " bash"
451
- silent : true
452
413
working_dir : src/go.mongodb.org/mongo-driver
414
+ include_expansions_in_env : ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
453
415
script : |
454
- # DO NOT ECHO WITH XTRACE
455
- if [ "Windows_NT" = "$OS" ]; then
456
- export GOPATH=$(cygpath -w $(dirname $(dirname $(dirname `pwd`))))
457
- export GOCACHE=$(cygpath -w "$(pwd)/.cache")
458
- export MONGODB_URI="${gssapi_service_host_auth_windows_mongodb_uri}"
459
- else
460
- export GOPATH=$(dirname $(dirname $(dirname `pwd`)))
461
- export GOCACHE="$(pwd)/.cache"
462
- echo "${gssapi_auth_linux_keytab_base64}" > /tmp/drivers.keytab.base64
463
- base64 --decode /tmp/drivers.keytab.base64 > ${PROJECT_DIRECTORY}/.evergreen/drivers.keytab
464
- mkdir -p ~/.krb5
465
- cat .evergreen/krb5.config | tee -a ~/.krb5/config
466
- kinit -k -t ${PROJECT_DIRECTORY}/.evergreen/drivers.keytab -p "${gssapi_auth_username}"
467
- export MONGODB_URI="${gssapi_service_host_auth_linux_mongodb_uri}"
468
- fi;
469
- export GOPATH="$GOPATH"
470
- export GOROOT="${GO_DIST}"
471
- export GOCACHE="$GOCACHE"
472
- export PATH="${GCC_PATH}:${GO_DIST}/bin:$PATH"
473
- export MONGO_GO_DRIVER_COMPRESSOR="${MONGO_GO_DRIVER_COMPRESSOR}"
474
-
475
- make -s evg-test-enterprise-auth
416
+ ${PREPARE_SHELL}
417
+ bash ./etc/run-enterprise-gssapi-test.sh
476
418
477
419
run-atlas-test :
478
420
- command : ec2.assume_role
@@ -513,7 +455,6 @@ functions:
513
455
type : test
514
456
params :
515
457
shell : " bash"
516
- silent : true
517
458
working_dir : src/go.mongodb.org/mongo-driver
518
459
script : |
519
460
${PREPARE_SHELL}
@@ -592,17 +533,9 @@ functions:
592
533
params :
593
534
shell : " bash"
594
535
working_dir : src/go.mongodb.org/mongo-driver
595
- add_expansions_to_env : true
596
536
script : |
597
537
${PREPARE_SHELL}
598
-
599
- AUTH="auth" \
600
- SSL="ssl" \
601
- MONGODB_URI="${SERVERLESS_URI}" \
602
- SERVERLESS="serverless" \
603
- SERVERLESS_ATLAS_USER="${SERVERLESS_ATLAS_USER}" \
604
- MAKEFILE_TARGET=evg-test-serverless \
605
- sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
538
+ bash etc/run-serverless-test.sh
606
539
607
540
run-atlas-data-lake-test :
608
541
- command : shell.exec
@@ -718,16 +651,13 @@ functions:
718
651
- command : ec2.assume_role
719
652
params :
720
653
role_arn : ${aws_test_secrets_role}
721
- - command : shell .exec
654
+ - command : subprocess .exec
722
655
type : test
723
656
params :
724
657
include_expansions_in_env : ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
725
- shell : " bash"
726
- working_dir : " src"
727
- script : |
728
- ${PREPARE_SHELL}
729
- cd $DRIVERS_TOOLS/.evergreen/auth_aws
730
- ./setup_secrets.sh drivers/aws_auth
658
+ binary : " bash"
659
+ args :
660
+ - ${DRIVERS_TOOLS}/.evergreen/auth_aws/setup-secrets.sh
731
661
732
662
run-aws-auth-test-with-regular-aws-credentials :
733
663
- command : shell.exec
@@ -861,14 +791,13 @@ functions:
861
791
working_dir : src/go.mongodb.org/mongo-driver
862
792
binary : bash
863
793
args :
864
- - ${DRIVERS_TOOLS}/.evergreen/csfle/await_servers .sh
794
+ - ${DRIVERS_TOOLS}/.evergreen/csfle/await-servers .sh
865
795
866
796
run-kms-tls-test :
867
797
- command : shell.exec
868
798
type : test
869
799
params :
870
800
shell : " bash"
871
- silent : true
872
801
working_dir : src/go.mongodb.org/mongo-driver
873
802
script : |
874
803
${PREPARE_SHELL}
@@ -890,7 +819,6 @@ functions:
890
819
type : test
891
820
params :
892
821
shell : " bash"
893
- silent : true
894
822
working_dir : src/go.mongodb.org/mongo-driver
895
823
script : |
896
824
${PREPARE_SHELL}
@@ -1680,18 +1608,11 @@ tasks:
1680
1608
tags : ["test", "enterprise-auth"]
1681
1609
commands :
1682
1610
- func : run-enterprise-auth-tests
1683
- vars :
1684
- MONGODB_URI : " ${plain_auth_mongodb_uri}"
1685
1611
1686
1612
- name : test-enterprise-auth-gssapi
1687
1613
tags : ["test", "enterprise-auth"]
1688
1614
commands :
1689
1615
- func : run-enterprise-gssapi-auth-tests
1690
-
1691
- - name : test-enterprise-auth-gssapi-service-host
1692
- tags : ["test", "enterprise-auth"]
1693
- commands :
1694
- - func : run-enterprise-gssapi-service-host-auth-tests
1695
1616
vars :
1696
1617
MONGO_GO_DRIVER_COMPRESSOR : " snappy"
1697
1618
@@ -1834,7 +1755,7 @@ tasks:
1834
1755
PKG_CONFIG_PATH=$PKG_CONFIG_PATH \
1835
1756
make build-kms-test
1836
1757
echo "Building build-kms-test ... end"
1837
-
1758
+ source $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/secrets-export.sh
1838
1759
echo "Copying files ... begin"
1839
1760
export GCPKMS_GCLOUD=${GCPKMS_GCLOUD}
1840
1761
export GCPKMS_PROJECT=${GCPKMS_PROJECT}
@@ -1855,6 +1776,7 @@ tasks:
1855
1776
working_dir : src/go.mongodb.org/mongo-driver
1856
1777
script : |
1857
1778
${PREPARE_SHELL}
1779
+ source $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/secrets-export.sh
1858
1780
export GCPKMS_GCLOUD=${GCPKMS_GCLOUD}
1859
1781
export GCPKMS_PROJECT=${GCPKMS_PROJECT}
1860
1782
export GCPKMS_ZONE=${GCPKMS_ZONE}
@@ -1889,23 +1811,10 @@ tasks:
1889
1811
type : test
1890
1812
params :
1891
1813
shell : " bash"
1892
- silent : true
1893
1814
working_dir : src/go.mongodb.org/mongo-driver
1894
1815
script : |
1895
1816
${PREPARE_SHELL}
1896
- echo "Building build-kms-test ... begin"
1897
- BUILD_TAGS="-tags=cse" \
1898
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH \
1899
- make build-kms-test
1900
- echo "Building build-kms-test ... end"
1901
-
1902
- export AWS_ACCESS_KEY_ID="${cse_aws_access_key_id}"
1903
- export AWS_SECRET_ACCESS_KEY="${cse_aws_secret_access_key}"
1904
-
1905
- LD_LIBRARY_PATH=./install/libmongocrypt/lib64 \
1906
- MONGODB_URI='${atlas_free_tier_uri}' \
1907
- PROVIDER='aws' \
1908
- ./testkms
1817
+ bash etc/run-awskms-test.sh
1909
1818
1910
1819
- name : " testawskms-fail-task"
1911
1820
# testawskms-fail-task runs without environment variables.
@@ -1918,17 +1827,8 @@ tasks:
1918
1827
working_dir : src/go.mongodb.org/mongo-driver
1919
1828
script : |
1920
1829
${PREPARE_SHELL}
1921
- echo "Building build-kms-test ... begin"
1922
- BUILD_TAGS="-tags=cse" \
1923
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH \
1924
- make build-kms-test
1925
- echo "Building build-kms-test ... end"
1926
-
1927
- LD_LIBRARY_PATH=./install/libmongocrypt/lib64 \
1928
- MONGODB_URI='${atlas_free_tier_uri}' \
1929
- EXPECT_ERROR='status=400' \
1930
- PROVIDER='aws' \
1931
- ./testkms
1830
+ export EXPECT_ERROR='status=400'
1831
+ bash etc/run-awskms-test.sh
1932
1832
1933
1833
- name : " testazurekms-task"
1934
1834
commands :
@@ -1963,8 +1863,7 @@ tasks:
1963
1863
working_dir : src/go.mongodb.org/mongo-driver
1964
1864
script : |
1965
1865
${PREPARE_SHELL}
1966
- # Get azurekms credentials from the vault.
1967
- . ./etc/get_aws_secrets.sh drivers/azurekms
1866
+ source ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup-secrets.sh
1968
1867
export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
1969
1868
export AZUREKMS_VMNAME=${AZUREKMS_VMNAME}
1970
1869
export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
@@ -2008,11 +1907,11 @@ tasks:
2008
1907
params :
2009
1908
working_dir : src/go.mongodb.org/mongo-driver
2010
1909
shell : bash
2011
- add_expansions_to_env : true
2012
1910
env :
2013
1911
TEST_LAMBDA_DIRECTORY : ${PROJECT_DIRECTORY}/internal/cmd/faas/awslambda
2014
1912
LAMBDA_STACK_NAME : dbx-go-lambda
2015
1913
AWS_REGION : us-east-1
1914
+ include_expansions_in_env : ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
2016
1915
script : |
2017
1916
${PREPARE_SHELL}
2018
1917
./.evergreen/run-deployed-lambda-aws-tests.sh
@@ -2248,10 +2147,6 @@ task_groups:
2248
2147
shell : " bash"
2249
2148
script : |
2250
2149
${PREPARE_SHELL}
2251
- echo '${testgcpkms_key_file}' > /tmp/testgcpkms_key_file.json
2252
- export GCPKMS_KEYFILE=/tmp/testgcpkms_key_file.json
2253
- export GCPKMS_DRIVERS_TOOLS=$DRIVERS_TOOLS
2254
- export GCPKMS_SERVICEACCOUNT="${testgcpkms_service_account}"
2255
2150
$DRIVERS_TOOLS/.evergreen/csfle/gcpkms/create-and-setup-instance.sh
2256
2151
# Load the GCPKMS_GCLOUD, GCPKMS_INSTANCE, GCPKMS_REGION, and GCPKMS_ZONE expansions.
2257
2152
- command : expansions.update
@@ -2263,10 +2158,6 @@ task_groups:
2263
2158
shell : " bash"
2264
2159
script : |
2265
2160
${PREPARE_SHELL}
2266
- export GCPKMS_GCLOUD=${GCPKMS_GCLOUD}
2267
- export GCPKMS_PROJECT=${GCPKMS_PROJECT}
2268
- export GCPKMS_ZONE=${GCPKMS_ZONE}
2269
- export GCPKMS_INSTANCENAME=${GCPKMS_INSTANCENAME}
2270
2161
$DRIVERS_TOOLS/.evergreen/csfle/gcpkms/delete-instance.sh
2271
2162
- func : handle-test-artifacts
2272
2163
- func : cleanup
@@ -2290,9 +2181,8 @@ task_groups:
2290
2181
export AZUREKMS_VMNAME_PREFIX="GODRIVER"
2291
2182
export AZUREKMS_DRIVERS_TOOLS=$DRIVERS_TOOLS
2292
2183
# Get azurekms credentials from the vault.
2293
- bash $DRIVERS_TOOLS/.evergreen/auth_aws/setup_secrets.sh drivers/azurekms
2294
- source ./secrets-export.sh
2295
- $DRIVERS_TOOLS/.evergreen/csfle/azurekms/create-and-setup-vm.sh
2184
+ . ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup-secrets.sh
2185
+ ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/create-and-setup-vm.sh
2296
2186
- command : expansions.update
2297
2187
params :
2298
2188
file : testazurekms-expansions.yml
@@ -2322,21 +2212,18 @@ task_groups:
2322
2212
params :
2323
2213
working_dir : src/go.mongodb.org/mongo-driver
2324
2214
binary : bash
2325
- add_expansions_to_env : true
2326
2215
env :
2327
2216
LAMBDA_STACK_NAME : dbx-go-lambda
2328
2217
AWS_REGION : us-east-1
2218
+ task_id : ${task_id}
2219
+ execution : ${execution}
2329
2220
args :
2330
2221
- ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
2331
- - command : expansions.update
2332
- params :
2333
- file : src/go.mongodb.org/mongo-driver/atlas-expansion.yml
2334
2222
teardown_group :
2335
2223
- command : subprocess.exec
2336
2224
params :
2337
2225
working_dir : src/go.mongodb.org/mongo-driver
2338
2226
binary : bash
2339
- add_expansions_to_env : true
2340
2227
env :
2341
2228
LAMBDA_STACK_NAME : dbx-go-lambda
2342
2229
AWS_REGION : us-east-1
@@ -2357,9 +2244,12 @@ task_groups:
2357
2244
params :
2358
2245
working_dir : src/go.mongodb.org/mongo-driver
2359
2246
binary : bash
2360
- add_expansions_to_env : true
2361
2247
env :
2362
2248
MONGODB_VERSION : " 7.0"
2249
+ LAMBDA_STACK_NAME : dbx-go-lambda
2250
+ AWS_REGION : us-east-1
2251
+ task_id : ${task_id}
2252
+ execution : ${execution}
2363
2253
args :
2364
2254
- ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
2365
2255
- command : expansions.update
@@ -2379,7 +2269,6 @@ task_groups:
2379
2269
params :
2380
2270
working_dir : src/go.mongodb.org/mongo-driver
2381
2271
binary : bash
2382
- add_expansions_to_env : true
2383
2272
args :
2384
2273
- ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
2385
2274
- func : handle-test-artifacts
0 commit comments