Skip to content

Commit 5cb35dd

Browse files
authored
GODRIVER-3149: OIDC Spec Cleanup (#1757)
1 parent 87ae788 commit 5cb35dd

File tree

5 files changed

+266
-28
lines changed

5 files changed

+266
-28
lines changed

.evergreen/config.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1963,11 +1963,11 @@ tasks:
19631963
popd
19641964
./.evergreen/run-deployed-lambda-aws-tests.sh
19651965
1966-
- name: "oidc-auth-test-latest"
1966+
- name: "oidc-auth-test"
19671967
commands:
19681968
- func: "run-oidc-auth-test-with-test-credentials"
19691969

1970-
- name: "oidc-auth-test-azure-latest"
1970+
- name: "oidc-auth-test-azure"
19711971
commands:
19721972
- command: shell.exec
19731973
params:
@@ -1992,7 +1992,7 @@ tasks:
19921992
export AZUREOIDC_TEST_CMD="PROJECT_DIRECTORY='.' OIDC_ENV=azure OIDC=oidc ./etc/run-oidc-test.sh ./test"
19931993
bash $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/run-driver-test.sh
19941994
1995-
- name: "oidc-auth-test-gcp-latest"
1995+
- name: "oidc-auth-test-gcp"
19961996
commands:
19971997
- command: shell.exec
19981998
params:
@@ -2306,13 +2306,14 @@ task_groups:
23062306
- func: fix-absolute-paths
23072307
- func: make-files-executable
23082308
- func: assume-ec2-role
2309-
- command: shell.exec
2309+
- command: subprocess.exec
23102310
params:
2311-
shell: bash
2311+
binary: bash
23122312
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
2313-
script: |
2314-
${PREPARE_SHELL}
2315-
${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh
2313+
env:
2314+
MONGODB_VERSION: "8.0"
2315+
args:
2316+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh
23162317
teardown_task:
23172318
- command: subprocess.exec
23182319
params:
@@ -2322,7 +2323,7 @@ task_groups:
23222323
setup_group_can_fail_task: true
23232324
setup_group_timeout_secs: 1800
23242325
tasks:
2325-
- oidc-auth-test-latest
2326+
- oidc-auth-test
23262327

23272328
- name: testazureoidc_task_group
23282329
setup_group:
@@ -2346,7 +2347,7 @@ task_groups:
23462347
setup_group_can_fail_task: true
23472348
setup_group_timeout_secs: 1800
23482349
tasks:
2349-
- oidc-auth-test-azure-latest
2350+
- oidc-auth-test-azure
23502351

23512352
- name: testgcpoidc_task_group
23522353
setup_group:
@@ -2370,7 +2371,7 @@ task_groups:
23702371
setup_group_can_fail_task: true
23712372
setup_group_timeout_secs: 1800
23722373
tasks:
2373-
- oidc-auth-test-gcp-latest
2374+
- oidc-auth-test-gcp
23742375

23752376
- name: test-aws-lambda-task-group
23762377
setup_group:

0 commit comments

Comments
 (0)