@@ -171,10 +171,29 @@ functions:
171171 ${PREPARE_SHELL}
172172
173173 OIDC_TOKEN_DIR="/tmp/tokens" \
174+ PROVIDER_NAME="aws" \
174175 AWS_WEB_IDENTITY_TOKEN_FILE="/tmp/tokens/test_user1" \
176+ OIDC_ATLAS_URI_SINGLE="${OIDC_ATLAS_URI_SINGLE}" \
177+ OIDC_ATLAS_URI_MULTI="${OIDC_ATLAS_URI_MULTI}" \
175178 PROJECT_DIRECTORY="${PROJECT_DIRECTORY}" \
176179 bash ${PROJECT_DIRECTORY}/.evergreen/run-oidc-tests.sh
177180
181+ " run oidc auth tests aws " :
182+ - command : shell.exec
183+ type : test
184+ params :
185+ working_dir : " src"
186+ timeout_secs : 300
187+ shell : bash
188+ script : |
189+ ${PREPARE_SHELL}
190+
191+ OIDC_TOKEN_DIR="/tmp/tokens" \
192+ PROVIDER_NAME="aws" \
193+ AWS_WEB_IDENTITY_TOKEN_FILE="/tmp/tokens/test_user1" \
194+ PROJECT_DIRECTORY="${PROJECT_DIRECTORY}" \
195+ bash ${PROJECT_DIRECTORY}/.evergreen/run-oidc-auth-tests.sh
196+
178197 " run tests " :
179198 - command : shell.exec
180199 type : test
@@ -1258,11 +1277,21 @@ tasks:
12581277
12591278 - name : " oidc-auth-test-azure-latest"
12601279 commands :
1261- - command : expansions.update
1262- type : setup
1280+ - func : " install dependencies "
1281+ - command : subprocess.exec
12631282 params :
1264- updates :
1265- - { key: NPM_VERSION, value: "9" }
1283+ working_dir : src
1284+ binary : bash
1285+ env :
1286+ DRIVERS_TOOLS : ${DRIVERS_TOOLS}
1287+ PROJECT_DIRECTORY : ${PROJECT_DIRECTORY}
1288+ PROVIDER_NAME : azure
1289+ SCRIPT : run-oidc-tests.sh
1290+ args :
1291+ - .evergreen/run-oidc-tests-azure.sh
1292+
1293+ - name : " oidc-auth-test-azure-latest-auth"
1294+ commands :
12661295 - func : " install dependencies"
12671296 - command : subprocess.exec
12681297 params :
@@ -1271,11 +1300,41 @@ tasks:
12711300 env :
12721301 DRIVERS_TOOLS : ${DRIVERS_TOOLS}
12731302 PROJECT_DIRECTORY : ${PROJECT_DIRECTORY}
1274- AZUREOIDC_CLIENTID : ${testazureoidc_clientid}
12751303 PROVIDER_NAME : azure
1304+ SCRIPT : run-oidc-auth-tests.sh
12761305 args :
12771306 - .evergreen/run-oidc-tests-azure.sh
12781307
1308+ - name : " oidc-auth-test-gcp-latest"
1309+ commands :
1310+ - func : " install dependencies"
1311+ - command : subprocess.exec
1312+ params :
1313+ working_dir : src
1314+ binary : bash
1315+ env :
1316+ DRIVERS_TOOLS : ${DRIVERS_TOOLS}
1317+ PROJECT_DIRECTORY : ${PROJECT_DIRECTORY}
1318+ PROVIDER_NAME : gcp
1319+ SCRIPT : run-oidc-tests.sh
1320+ args :
1321+ - .evergreen/run-oidc-tests-gcp.sh
1322+
1323+ - name : " oidc-auth-test-gcp-latest-auth"
1324+ commands :
1325+ - func : " install dependencies"
1326+ - command : subprocess.exec
1327+ params :
1328+ working_dir : src
1329+ binary : bash
1330+ env :
1331+ DRIVERS_TOOLS : ${DRIVERS_TOOLS}
1332+ PROJECT_DIRECTORY : ${PROJECT_DIRECTORY}
1333+ PROVIDER_NAME : gcp
1334+ SCRIPT : run-oidc-auth-tests.sh
1335+ args :
1336+ - .evergreen/run-oidc-tests-gcp.sh
1337+
12791338 - name : " test-aws-lambda-deployed"
12801339 commands :
12811340 - command : expansions.update
@@ -1427,14 +1486,9 @@ task_groups:
14271486 script : |-
14281487 set -o errexit
14291488 ${PREPARE_SHELL}
1430- export AZUREOIDC_CLIENTID="${testazureoidc_clientid}"
1431- export AZUREOIDC_TENANTID="${testazureoic_tenantid}"
1432- export AZUREOIDC_SECRET="${testazureoidc_secret}"
1433- export AZUREOIDC_KEYVAULT=${testazureoidc_keyvault}
1434- export AZUREOIDC_DRIVERS_TOOLS="$DRIVERS_TOOLS"
14351489 export AZUREOIDC_VMNAME_PREFIX="NODE_DRIVER"
14361490 $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/create-and-setup-vm.sh
1437- teardown_group :
1491+ teardown_task :
14381492 - command : shell.exec
14391493 params :
14401494 shell : bash
@@ -1446,6 +1500,75 @@ task_groups:
14461500 tasks :
14471501 - oidc-auth-test-azure-latest
14481502
1503+ - name : testazureoidcauth_task_group
1504+ setup_group :
1505+ - func : fetch source
1506+ - command : shell.exec
1507+ params :
1508+ shell : bash
1509+ script : |-
1510+ set -o errexit
1511+ ${PREPARE_SHELL}
1512+ export AZUREOIDC_VMNAME_PREFIX="NODE_DRIVER"
1513+ $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/create-and-setup-vm.sh
1514+ teardown_task :
1515+ - command : shell.exec
1516+ params :
1517+ shell : bash
1518+ script : |-
1519+ ${PREPARE_SHELL}
1520+ $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/delete-vm.sh
1521+ setup_group_can_fail_task : true
1522+ setup_group_timeout_secs : 1800
1523+ tasks :
1524+ - oidc-auth-test-azure-latest-auth
1525+
1526+ - name : testgcpoidc_task_group
1527+ setup_group :
1528+ - func : fetch source
1529+ - command : shell.exec
1530+ params :
1531+ shell : bash
1532+ script : |-
1533+ set -o errexit
1534+ ${PREPARE_SHELL}
1535+ export GCPOIDC_VMNAME_PREFIX="NODE_DRIVER"
1536+ $DRIVERS_TOOLS/.evergreen/auth_oidc/gcp/create-and-setup-instance.sh
1537+ teardown_task :
1538+ - command : shell.exec
1539+ params :
1540+ shell : bash
1541+ script : |-
1542+ ${PREPARE_SHELL}
1543+ $DRIVERS_TOOLS/.evergreen/auth_oidc/gcp/delete-instance.sh
1544+ setup_group_can_fail_task : true
1545+ setup_group_timeout_secs : 1800
1546+ tasks :
1547+ - oidc-auth-test-gcp-latest
1548+
1549+ - name : testgcpoidcauth_task_group
1550+ setup_group :
1551+ - func : fetch source
1552+ - command : shell.exec
1553+ params :
1554+ shell : bash
1555+ script : |-
1556+ set -o errexit
1557+ ${PREPARE_SHELL}
1558+ export GCPOIDC_VMNAME_PREFIX="NODE_DRIVER"
1559+ $DRIVERS_TOOLS/.evergreen/auth_oidc/gcp/create-and-setup-instance.sh
1560+ teardown_task :
1561+ - command : shell.exec
1562+ params :
1563+ shell : bash
1564+ script : |-
1565+ ${PREPARE_SHELL}
1566+ $DRIVERS_TOOLS/.evergreen/auth_oidc/gcp/delete-instance.sh
1567+ setup_group_can_fail_task : true
1568+ setup_group_timeout_secs : 1800
1569+ tasks :
1570+ - oidc-auth-test-gcp-latest-auth
1571+
14491572 - name : test_atlas_task_group
14501573 setup_group :
14511574 - func : fetch source
@@ -1461,7 +1584,7 @@ task_groups:
14611584 - command : expansions.update
14621585 params :
14631586 file : src/atlas-expansion.yml
1464- teardown_group :
1587+ teardown_task :
14651588 - command : subprocess.exec
14661589 params :
14671590 working_dir : src
@@ -1489,7 +1612,7 @@ task_groups:
14891612 - command : expansions.update
14901613 params :
14911614 file : src/atlas-expansion.yml
1492- teardown_group :
1615+ teardown_task :
14931616 - command : subprocess.exec
14941617 params :
14951618 working_dir : src
0 commit comments