@@ -142,9 +142,27 @@ functions:
142142 ${PREPARE_SHELL}
143143
144144 OIDC_TOKEN_DIR="/tmp/tokens" \
145+ PROVIDER_NAME="aws" \
145146 AWS_WEB_IDENTITY_TOKEN_FILE="/tmp/tokens/test_user1" \
147+ OIDC_ATLAS_URI_SINGLE="${OIDC_ATLAS_URI_SINGLE}" \
148+ OIDC_ATLAS_URI_MULTI="${OIDC_ATLAS_URI_MULTI}" \
146149 PROJECT_DIRECTORY="${PROJECT_DIRECTORY}" \
147150 bash ${PROJECT_DIRECTORY}/.evergreen/run-oidc-tests.sh
151+ run oidc auth tests aws :
152+ - command : shell.exec
153+ type : test
154+ params :
155+ working_dir : src
156+ timeout_secs : 300
157+ shell : bash
158+ script : |
159+ ${PREPARE_SHELL}
160+
161+ OIDC_TOKEN_DIR="/tmp/tokens" \
162+ PROVIDER_NAME="aws" \
163+ AWS_WEB_IDENTITY_TOKEN_FILE="/tmp/tokens/test_user1" \
164+ PROJECT_DIRECTORY="${PROJECT_DIRECTORY}" \
165+ bash ${PROJECT_DIRECTORY}/.evergreen/run-oidc-auth-tests.sh
148166 run tests :
149167 - command : shell.exec
150168 type : test
@@ -1222,10 +1240,48 @@ tasks:
12221240 env :
12231241 DRIVERS_TOOLS : ${DRIVERS_TOOLS}
12241242 PROJECT_DIRECTORY : ${PROJECT_DIRECTORY}
1225- AZUREOIDC_CLIENTID : ${testazureoidc_clientid}
12261243 PROVIDER_NAME : azure
1244+ SCRIPT : run-oidc-tests.sh
1245+ args :
1246+ - .evergreen/run-oidc-tests-azure.sh
1247+ - name : oidc-auth-test-azure-latest-auth
1248+ commands :
1249+ - command : expansions.update
1250+ type : setup
1251+ params :
1252+ updates :
1253+ - {key: NPM_VERSION, value: '9'}
1254+ - func : install dependencies
1255+ - command : subprocess.exec
1256+ params :
1257+ working_dir : src
1258+ binary : bash
1259+ env :
1260+ DRIVERS_TOOLS : ${DRIVERS_TOOLS}
1261+ PROJECT_DIRECTORY : ${PROJECT_DIRECTORY}
1262+ PROVIDER_NAME : azure
1263+ SCRIPT : run-oidc-auth-tests.sh
12271264 args :
12281265 - .evergreen/run-oidc-tests-azure.sh
1266+ - name : oidc-auth-test-gcp-latest
1267+ commands :
1268+ - command : expansions.update
1269+ type : setup
1270+ params :
1271+ updates :
1272+ - {key: NPM_VERSION, value: '9'}
1273+ - func : install dependencies
1274+ - command : subprocess.exec
1275+ params :
1276+ working_dir : src
1277+ binary : bash
1278+ env :
1279+ DRIVERS_TOOLS : ${DRIVERS_TOOLS}
1280+ PROJECT_DIRECTORY : ${PROJECT_DIRECTORY}
1281+ PROVIDER_NAME : gcp
1282+ SCRIPT : run-oidc-tests.sh
1283+ args :
1284+ - .evergreen/run-oidc-tests-gcp.sh
12291285 - name : test-aws-lambda-deployed
12301286 commands :
12311287 - command : expansions.update
@@ -1837,6 +1893,25 @@ tasks:
18371893 - func : bootstrap mongo-orchestration
18381894 - func : setup oidc roles
18391895 - func : run oidc tests aws
1896+ - name : test-auth-oidc-aws
1897+ tags :
1898+ - latest
1899+ - replica_set
1900+ - oidc
1901+ commands :
1902+ - command : expansions.update
1903+ type : setup
1904+ params :
1905+ updates :
1906+ - {key: VERSION, value: latest}
1907+ - {key: TOPOLOGY, value: replica_set}
1908+ - {key: AUTH, value: auth}
1909+ - {key: ORCHESTRATION_FILE, value: auth-oidc.json}
1910+ - func : install dependencies
1911+ - func : bootstrap oidc
1912+ - func : bootstrap mongo-orchestration
1913+ - func : setup oidc roles
1914+ - func : run oidc auth tests aws
18401915 - name : test-socks5
18411916 tags : []
18421917 commands :
@@ -3814,14 +3889,9 @@ task_groups:
38143889 script : |-
38153890 set -o errexit
38163891 ${PREPARE_SHELL}
3817- export AZUREOIDC_CLIENTID="${testazureoidc_clientid}"
3818- export AZUREOIDC_TENANTID="${testazureoic_tenantid}"
3819- export AZUREOIDC_SECRET="${testazureoidc_secret}"
3820- export AZUREOIDC_KEYVAULT=${testazureoidc_keyvault}
3821- export AZUREOIDC_DRIVERS_TOOLS="$DRIVERS_TOOLS"
38223892 export AZUREOIDC_VMNAME_PREFIX="NODE_DRIVER"
38233893 $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/create-and-setup-vm.sh
3824- teardown_group :
3894+ teardown_task :
38253895 - command : shell.exec
38263896 params :
38273897 shell : bash
@@ -3832,6 +3902,50 @@ task_groups:
38323902 setup_group_timeout_secs : 1800
38333903 tasks :
38343904 - oidc-auth-test-azure-latest
3905+ - name : testazureoidcauth_task_group
3906+ setup_group :
3907+ - func : fetch source
3908+ - command : shell.exec
3909+ params :
3910+ shell : bash
3911+ script : |-
3912+ set -o errexit
3913+ ${PREPARE_SHELL}
3914+ export AZUREOIDC_VMNAME_PREFIX="NODE_DRIVER"
3915+ $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/create-and-setup-vm.sh
3916+ teardown_task :
3917+ - command : shell.exec
3918+ params :
3919+ shell : bash
3920+ script : |-
3921+ ${PREPARE_SHELL}
3922+ $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/delete-vm.sh
3923+ setup_group_can_fail_task : true
3924+ setup_group_timeout_secs : 1800
3925+ tasks :
3926+ - oidc-auth-test-azure-latest-auth
3927+ - name : testgcpoidc_task_group
3928+ setup_group :
3929+ - func : fetch source
3930+ - command : shell.exec
3931+ params :
3932+ shell : bash
3933+ script : |-
3934+ set -o errexit
3935+ ${PREPARE_SHELL}
3936+ export GCPOIDC_VMNAME_PREFIX="NODE_DRIVER"
3937+ $DRIVERS_TOOLS/.evergreen/auth_oidc/gcp/create-and-setup-instance.sh
3938+ teardown_task :
3939+ - command : shell.exec
3940+ params :
3941+ shell : bash
3942+ script : |-
3943+ ${PREPARE_SHELL}
3944+ $DRIVERS_TOOLS/.evergreen/auth_oidc/gcp/delete-instance.sh
3945+ setup_group_can_fail_task : true
3946+ setup_group_timeout_secs : 1800
3947+ tasks :
3948+ - oidc-auth-test-gcp-latest
38353949 - name : test_atlas_task_group
38363950 setup_group :
38373951 - func : fetch source
@@ -3947,6 +4061,7 @@ buildvariants:
39474061 - test-auth-kerberos
39484062 - test-auth-ldap
39494063 - test-auth-oidc
4064+ - test-auth-oidc-aws
39504065 - test-socks5
39514066 - test-socks5-csfle
39524067 - test-socks5-tls
@@ -3998,6 +4113,7 @@ buildvariants:
39984113 - test-auth-kerberos
39994114 - test-auth-ldap
40004115 - test-auth-oidc
4116+ - test-auth-oidc-aws
40014117 - test-socks5
40024118 - test-socks5-csfle
40034119 - test-socks5-tls
@@ -4049,6 +4165,7 @@ buildvariants:
40494165 - test-auth-kerberos
40504166 - test-auth-ldap
40514167 - test-auth-oidc
4168+ - test-auth-oidc-aws
40524169 - test-socks5
40534170 - test-socks5-csfle
40544171 - test-socks5-tls
@@ -4099,6 +4216,7 @@ buildvariants:
40994216 - test-auth-kerberos
41004217 - test-auth-ldap
41014218 - test-auth-oidc
4219+ - test-auth-oidc-aws
41024220 - test-socks5
41034221 - test-socks5-csfle
41044222 - test-socks5-tls
@@ -4386,6 +4504,30 @@ buildvariants:
43864504 tasks :
43874505 - test_azurekms_task_group
43884506 - test-azurekms-fail-task
4507+ - name : ubuntu20-test-azure-oidc
4508+ display_name : Azure OIDC
4509+ run_on : ubuntu2004-small
4510+ expansions :
4511+ NODE_LTS_VERSION : 20
4512+ batchtime : 20160
4513+ tasks :
4514+ - testazureoidc_task_group
4515+ - name : ubuntu20-test-azure-oidc-auth
4516+ display_name : Azure OIDC Auth Tests
4517+ run_on : ubuntu2004-small
4518+ expansions :
4519+ NODE_LTS_VERSION : 20
4520+ batchtime : 20160
4521+ tasks :
4522+ - testazureoidcauth_task_group
4523+ - name : ubuntu20-test-gcp-oidc
4524+ display_name : GCP OIDC
4525+ expansions :
4526+ NODE_LTS_VERSION : 20
4527+ run_on : ubuntu2004-small
4528+ batchtime : 20160
4529+ tasks :
4530+ - testgcpoidc_task_group
43894531 - name : rhel8-test-atlas
43904532 display_name : Atlas Cluster Tests
43914533 run_on : rhel80-large
0 commit comments