@@ -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}
@@ -593,17 +534,9 @@ functions:
593
534
params :
594
535
shell : " bash"
595
536
working_dir : src/go.mongodb.org/mongo-driver
596
- add_expansions_to_env : true
597
537
script : |
598
538
${PREPARE_SHELL}
599
-
600
- AUTH="auth" \
601
- SSL="ssl" \
602
- MONGODB_URI="${SERVERLESS_URI}" \
603
- SERVERLESS="serverless" \
604
- SERVERLESS_ATLAS_USER="${SERVERLESS_ATLAS_USER}" \
605
- MAKEFILE_TARGET=evg-test-serverless \
606
- sh ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
539
+ bash etc/run-serverless-test.sh
607
540
608
541
run-atlas-data-lake-test :
609
542
- command : shell.exec
@@ -719,16 +652,13 @@ functions:
719
652
- command : ec2.assume_role
720
653
params :
721
654
role_arn : ${aws_test_secrets_role}
722
- - command : shell .exec
655
+ - command : subprocess .exec
723
656
type : test
724
657
params :
725
658
include_expansions_in_env : ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
726
- shell : " bash"
727
- working_dir : " src"
728
- script : |
729
- ${PREPARE_SHELL}
730
- cd $DRIVERS_TOOLS/.evergreen/auth_aws
731
- ./setup_secrets.sh drivers/aws_auth
659
+ binary : " bash"
660
+ args :
661
+ - ${DRIVERS_TOOLS}/.evergreen/auth_aws/setup-secrets.sh
732
662
733
663
run-aws-auth-test-with-regular-aws-credentials :
734
664
- command : shell.exec
@@ -862,14 +792,13 @@ functions:
862
792
working_dir : src/go.mongodb.org/mongo-driver
863
793
binary : bash
864
794
args :
865
- - ${DRIVERS_TOOLS}/.evergreen/csfle/await_servers .sh
795
+ - ${DRIVERS_TOOLS}/.evergreen/csfle/await-servers .sh
866
796
867
797
run-kms-tls-test :
868
798
- command : shell.exec
869
799
type : test
870
800
params :
871
801
shell : " bash"
872
- silent : true
873
802
working_dir : src/go.mongodb.org/mongo-driver
874
803
script : |
875
804
${PREPARE_SHELL}
@@ -892,7 +821,6 @@ functions:
892
821
type : test
893
822
params :
894
823
shell : " bash"
895
- silent : true
896
824
working_dir : src/go.mongodb.org/mongo-driver
897
825
script : |
898
826
${PREPARE_SHELL}
@@ -1683,20 +1611,13 @@ tasks:
1683
1611
tags : ["test", "enterprise-auth"]
1684
1612
commands :
1685
1613
- func : run-enterprise-auth-tests
1686
- vars :
1687
- MONGODB_URI : " ${plain_auth_mongodb_uri}"
1688
1614
1689
1615
- name : test-enterprise-auth-gssapi
1690
1616
tags : ["test", "enterprise-auth"]
1691
1617
commands :
1692
1618
- func : run-enterprise-gssapi-auth-tests
1693
-
1694
- - name : test-enterprise-auth-gssapi-service-host
1695
- tags : ["test", "enterprise-auth"]
1696
- commands :
1697
- - func : run-enterprise-gssapi-service-host-auth-tests
1698
1619
vars :
1699
- MONGO_GO_DRIVER_COMPRESSOR : " snappy"
1620
+ MONGO_GO_DRIVER_COMPRESSOR : " snappy"
1700
1621
1701
1622
# Build with the oldest supported version of Go.
1702
1623
- name : go1.18-build
@@ -1837,7 +1758,7 @@ tasks:
1837
1758
PKG_CONFIG_PATH=$PKG_CONFIG_PATH \
1838
1759
make build-kms-test
1839
1760
echo "Building build-kms-test ... end"
1840
-
1761
+ source $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/secrets-export.sh
1841
1762
echo "Copying files ... begin"
1842
1763
export GCPKMS_GCLOUD=${GCPKMS_GCLOUD}
1843
1764
export GCPKMS_PROJECT=${GCPKMS_PROJECT}
@@ -1858,6 +1779,7 @@ tasks:
1858
1779
working_dir : src/go.mongodb.org/mongo-driver
1859
1780
script : |
1860
1781
${PREPARE_SHELL}
1782
+ source $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/secrets-export.sh
1861
1783
export GCPKMS_GCLOUD=${GCPKMS_GCLOUD}
1862
1784
export GCPKMS_PROJECT=${GCPKMS_PROJECT}
1863
1785
export GCPKMS_ZONE=${GCPKMS_ZONE}
@@ -1892,23 +1814,10 @@ tasks:
1892
1814
type : test
1893
1815
params :
1894
1816
shell : " bash"
1895
- silent : true
1896
1817
working_dir : src/go.mongodb.org/mongo-driver
1897
1818
script : |
1898
1819
${PREPARE_SHELL}
1899
- echo "Building build-kms-test ... begin"
1900
- BUILD_TAGS="-tags=cse" \
1901
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH \
1902
- make build-kms-test
1903
- echo "Building build-kms-test ... end"
1904
-
1905
- export AWS_ACCESS_KEY_ID="${cse_aws_access_key_id}"
1906
- export AWS_SECRET_ACCESS_KEY="${cse_aws_secret_access_key}"
1907
-
1908
- LD_LIBRARY_PATH=./install/libmongocrypt/lib64 \
1909
- MONGODB_URI='${atlas_free_tier_uri}' \
1910
- PROVIDER='aws' \
1911
- ./testkms
1820
+ bash etc/run-awskms-test.sh
1912
1821
1913
1822
- name : " testawskms-fail-task"
1914
1823
# testawskms-fail-task runs without environment variables.
@@ -1921,17 +1830,8 @@ tasks:
1921
1830
working_dir : src/go.mongodb.org/mongo-driver
1922
1831
script : |
1923
1832
${PREPARE_SHELL}
1924
- echo "Building build-kms-test ... begin"
1925
- BUILD_TAGS="-tags=cse" \
1926
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH \
1927
- make build-kms-test
1928
- echo "Building build-kms-test ... end"
1929
-
1930
- LD_LIBRARY_PATH=./install/libmongocrypt/lib64 \
1931
- MONGODB_URI='${atlas_free_tier_uri}' \
1932
- EXPECT_ERROR='status=400' \
1933
- PROVIDER='aws' \
1934
- ./testkms
1833
+ export EXPECT_ERROR='status=400'
1834
+ bash etc/run-awskms-test.sh
1935
1835
1936
1836
- name : " testazurekms-task"
1937
1837
commands :
@@ -1966,8 +1866,7 @@ tasks:
1966
1866
working_dir : src/go.mongodb.org/mongo-driver
1967
1867
script : |
1968
1868
${PREPARE_SHELL}
1969
- # Get azurekms credentials from the vault.
1970
- . ./etc/get_aws_secrets.sh drivers/azurekms
1869
+ source ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup-secrets.sh
1971
1870
export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
1972
1871
export AZUREKMS_VMNAME=${AZUREKMS_VMNAME}
1973
1872
export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
@@ -2011,14 +1910,13 @@ tasks:
2011
1910
params :
2012
1911
working_dir : src/go.mongodb.org/mongo-driver
2013
1912
shell : bash
2014
- add_expansions_to_env : true
2015
1913
env :
2016
1914
TEST_LAMBDA_DIRECTORY : ${PROJECT_DIRECTORY}/internal/test/faas/awslambda
2017
1915
LAMBDA_STACK_NAME : dbx-go-lambda
2018
1916
AWS_REGION : us-east-1
1917
+ include_expansions_in_env : ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
2019
1918
script : |
2020
1919
${PREPARE_SHELL}
2021
- ls $TEST_LAMBDA_DIRECTORY
2022
1920
./.evergreen/run-deployed-lambda-aws-tests.sh
2023
1921
2024
1922
- name : " test-search-index"
@@ -2252,10 +2150,6 @@ task_groups:
2252
2150
shell : " bash"
2253
2151
script : |
2254
2152
${PREPARE_SHELL}
2255
- echo '${testgcpkms_key_file}' > /tmp/testgcpkms_key_file.json
2256
- export GCPKMS_KEYFILE=/tmp/testgcpkms_key_file.json
2257
- export GCPKMS_DRIVERS_TOOLS=$DRIVERS_TOOLS
2258
- export GCPKMS_SERVICEACCOUNT="${testgcpkms_service_account}"
2259
2153
$DRIVERS_TOOLS/.evergreen/csfle/gcpkms/create-and-setup-instance.sh
2260
2154
# Load the GCPKMS_GCLOUD, GCPKMS_INSTANCE, GCPKMS_REGION, and GCPKMS_ZONE expansions.
2261
2155
- command : expansions.update
@@ -2267,10 +2161,6 @@ task_groups:
2267
2161
shell : " bash"
2268
2162
script : |
2269
2163
${PREPARE_SHELL}
2270
- export GCPKMS_GCLOUD=${GCPKMS_GCLOUD}
2271
- export GCPKMS_PROJECT=${GCPKMS_PROJECT}
2272
- export GCPKMS_ZONE=${GCPKMS_ZONE}
2273
- export GCPKMS_INSTANCENAME=${GCPKMS_INSTANCENAME}
2274
2164
$DRIVERS_TOOLS/.evergreen/csfle/gcpkms/delete-instance.sh
2275
2165
- func : handle-test-artifacts
2276
2166
- func : cleanup
@@ -2294,9 +2184,8 @@ task_groups:
2294
2184
export AZUREKMS_VMNAME_PREFIX="GODRIVER"
2295
2185
export AZUREKMS_DRIVERS_TOOLS=$DRIVERS_TOOLS
2296
2186
# Get azurekms credentials from the vault.
2297
- bash $DRIVERS_TOOLS/.evergreen/auth_aws/setup_secrets.sh drivers/azurekms
2298
- source ./secrets-export.sh
2299
- $DRIVERS_TOOLS/.evergreen/csfle/azurekms/create-and-setup-vm.sh
2187
+ . ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup-secrets.sh
2188
+ ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/create-and-setup-vm.sh
2300
2189
- command : expansions.update
2301
2190
params :
2302
2191
file : testazurekms-expansions.yml
@@ -2326,21 +2215,18 @@ task_groups:
2326
2215
params :
2327
2216
working_dir : src/go.mongodb.org/mongo-driver
2328
2217
binary : bash
2329
- add_expansions_to_env : true
2330
2218
env :
2331
2219
LAMBDA_STACK_NAME : dbx-go-lambda
2332
2220
AWS_REGION : us-east-1
2221
+ task_id : ${task_id}
2222
+ execution : ${execution}
2333
2223
args :
2334
2224
- ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
2335
- - command : expansions.update
2336
- params :
2337
- file : src/go.mongodb.org/mongo-driver/atlas-expansion.yml
2338
2225
teardown_group :
2339
2226
- command : subprocess.exec
2340
2227
params :
2341
2228
working_dir : src/go.mongodb.org/mongo-driver
2342
2229
binary : bash
2343
- add_expansions_to_env : true
2344
2230
env :
2345
2231
LAMBDA_STACK_NAME : dbx-go-lambda
2346
2232
AWS_REGION : us-east-1
@@ -2361,9 +2247,12 @@ task_groups:
2361
2247
params :
2362
2248
working_dir : src/go.mongodb.org/mongo-driver
2363
2249
binary : bash
2364
- add_expansions_to_env : true
2365
2250
env :
2366
2251
MONGODB_VERSION : " 7.0"
2252
+ LAMBDA_STACK_NAME : dbx-go-lambda
2253
+ AWS_REGION : us-east-1
2254
+ task_id : ${task_id}
2255
+ execution : ${execution}
2367
2256
args :
2368
2257
- ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
2369
2258
- command : expansions.update
@@ -2383,7 +2272,6 @@ task_groups:
2383
2272
params :
2384
2273
working_dir : src/go.mongodb.org/mongo-driver
2385
2274
binary : bash
2386
- add_expansions_to_env : true
2387
2275
args :
2388
2276
- ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
2389
2277
- func : handle-test-artifacts
0 commit comments