Skip to content

Commit 47ed77d

Browse files
blink1073pmereditmatthewdale
authored
GODRIVER-3149 [master] OIDC Spec Cleanup (#1769)
Co-authored-by: Patrick Meredith <[email protected]> Co-authored-by: Matt Dale <[email protected]>
1 parent ed56f8a commit 47ed77d

File tree

5 files changed

+312
-32
lines changed

5 files changed

+312
-32
lines changed

.evergreen/config.yml

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

1967-
- name: "oidc-auth-test-azure-latest"
1967+
- name: "oidc-auth-test-azure"
19681968
commands:
19691969
- command: shell.exec
19701970
params:
@@ -1989,7 +1989,7 @@ tasks:
19891989
export AZUREOIDC_TEST_CMD="PROJECT_DIRECTORY='.' OIDC_ENV=azure OIDC=oidc ./etc/run-oidc-test.sh ./test"
19901990
bash $DRIVERS_TOOLS/.evergreen/auth_oidc/azure/run-driver-test.sh
19911991
1992-
- name: "oidc-auth-test-gcp-latest"
1992+
- name: "oidc-auth-test-gcp"
19931993
commands:
19941994
- command: shell.exec
19951995
params:
@@ -2303,13 +2303,14 @@ task_groups:
23032303
- func: fix-absolute-paths
23042304
- func: make-files-executable
23052305
- func: assume-ec2-role
2306-
- command: shell.exec
2306+
- command: subprocess.exec
23072307
params:
2308-
shell: bash
2308+
binary: bash
23092309
include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
2310-
script: |
2311-
${PREPARE_SHELL}
2312-
${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh
2310+
env:
2311+
MONGODB_VERSION: "8.0"
2312+
args:
2313+
- ${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh
23132314
teardown_task:
23142315
- command: subprocess.exec
23152316
params:
@@ -2319,7 +2320,7 @@ task_groups:
23192320
setup_group_can_fail_task: true
23202321
setup_group_timeout_secs: 1800
23212322
tasks:
2322-
- oidc-auth-test-latest
2323+
- oidc-auth-test
23232324

23242325
- name: testazureoidc_task_group
23252326
setup_group:
@@ -2343,7 +2344,7 @@ task_groups:
23432344
setup_group_can_fail_task: true
23442345
setup_group_timeout_secs: 1800
23452346
tasks:
2346-
- oidc-auth-test-azure-latest
2347+
- oidc-auth-test-azure
23472348

23482349
- name: testgcpoidc_task_group
23492350
setup_group:
@@ -2367,7 +2368,7 @@ task_groups:
23672368
setup_group_can_fail_task: true
23682369
setup_group_timeout_secs: 1800
23692370
tasks:
2370-
- oidc-auth-test-gcp-latest
2371+
- oidc-auth-test-gcp
23712372

23722373
- name: test-aws-lambda-task-group
23732374
setup_group:

0 commit comments

Comments
 (0)