Skip to content

Commit 4893330

Browse files
durrandurran
authored
feat(NODE-5815): remove oidc (#3981)
1 parent f524a94 commit 4893330

35 files changed

+9
-3752
lines changed

‎.evergreen/config.in.yml

-100
Original file line numberDiff line numberDiff line change
@@ -132,58 +132,6 @@ functions:
132132
env:
133133
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
134134

135-
"bootstrap oidc":
136-
- command: ec2.assume_role
137-
params:
138-
role_arn: ${OIDC_AWS_ROLE_ARN}
139-
- command: shell.exec
140-
type: test
141-
params:
142-
working_dir: "src"
143-
shell: bash
144-
script: |
145-
${PREPARE_SHELL}
146-
cd "${DRIVERS_TOOLS}"/.evergreen/auth_oidc
147-
148-
# This is a bit confusing but the ec2.assume_role command before
149-
# this task will overwrite these variables to a different value
150-
# than we have set in our evergreen project config. As these are
151-
# now specific to the OIDC ARN, we re-export for the python
152-
# scripts.
153-
export AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
154-
export AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
155-
export AWS_SESSION_TOKEN=${AWS_SESSION_TOKEN}
156-
export OIDC_TOKEN_DIR=/tmp/tokens
157-
158-
. ./activate-authoidcvenv.sh
159-
python oidc_write_orchestration.py
160-
python oidc_get_tokens.py
161-
162-
"setup oidc roles":
163-
- command: subprocess.exec
164-
params:
165-
working_dir: src
166-
binary: bash
167-
args:
168-
- .evergreen/setup-oidc-roles.sh
169-
env:
170-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
171-
172-
"run oidc tests aws":
173-
- command: shell.exec
174-
type: test
175-
params:
176-
working_dir: "src"
177-
timeout_secs: 300
178-
shell: bash
179-
script: |
180-
${PREPARE_SHELL}
181-
182-
OIDC_TOKEN_DIR="/tmp/tokens" \
183-
AWS_WEB_IDENTITY_TOKEN_FILE="/tmp/tokens/test_user1" \
184-
PROJECT_DIRECTORY="${PROJECT_DIRECTORY}" \
185-
bash ${PROJECT_DIRECTORY}/.evergreen/run-oidc-tests.sh
186-
187135
"run tests":
188136
- command: shell.exec
189137
type: test
@@ -1254,26 +1202,6 @@ tasks:
12541202
args:
12551203
- src/.evergreen/run-azure-kms-tests.sh
12561204

1257-
- name: "oidc-auth-test-azure-latest"
1258-
commands:
1259-
- command: expansions.update
1260-
type: setup
1261-
params:
1262-
updates:
1263-
- { key: NPM_VERSION, value: "9" }
1264-
- func: "install dependencies"
1265-
- command: subprocess.exec
1266-
params:
1267-
working_dir: src
1268-
binary: bash
1269-
env:
1270-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
1271-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
1272-
AZUREOIDC_CLIENTID: ${testazureoidc_clientid}
1273-
PROVIDER_NAME: azure
1274-
args:
1275-
- .evergreen/run-oidc-tests-azure.sh
1276-
12771205
- name: "test-aws-lambda-deployed"
12781206
commands:
12791207
- command: expansions.update
@@ -1400,34 +1328,6 @@ task_groups:
14001328
tasks:
14011329
- test-azurekms-task
14021330

1403-
- name: testazureoidc_task_group
1404-
setup_group:
1405-
- func: fetch source
1406-
- command: shell.exec
1407-
params:
1408-
shell: bash
1409-
script: |-
1410-
set -o errexit
1411-
${PREPARE_SHELL}
1412-
export AZUREOIDC_CLIENTID="${testazureoidc_clientid}"
1413-
export AZUREOIDC_TENANTID="${testazureoic_tenantid}"
1414-
export AZUREOIDC_SECRET="${testazureoidc_secret}"
1415-
export AZUREOIDC_KEYVAULT=${testazureoidc_keyvault}
1416-
export AZUREOIDC_DRIVERS_TOOLS="$DRIVERS_TOOLS"
1417-
export AZUREOIDC_VMNAME_PREFIX="NODE_DRIVER"
1418-
$DRIVERS_TOOLS/.evergreen/auth_oidc/azure/create-and-setup-vm.sh
1419-
teardown_group:
1420-
- command: shell.exec
1421-
params:
1422-
shell: bash
1423-
script: |-
1424-
${PREPARE_SHELL}
1425-
$DRIVERS_TOOLS/.evergreen/auth_oidc/azure/delete-vm.sh
1426-
setup_group_can_fail_task: true
1427-
setup_group_timeout_secs: 1800
1428-
tasks:
1429-
- oidc-auth-test-azure-latest
1430-
14311331
- name: test_atlas_task_group
14321332
setup_group:
14331333
- func: fetch source

‎.evergreen/config.yml

-125
Original file line numberDiff line numberDiff line change
@@ -104,55 +104,6 @@ functions:
104104
- .evergreen/run-azure-kms-mock-server.sh
105105
env:
106106
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
107-
bootstrap oidc:
108-
- command: ec2.assume_role
109-
params:
110-
role_arn: ${OIDC_AWS_ROLE_ARN}
111-
- command: shell.exec
112-
type: test
113-
params:
114-
working_dir: src
115-
shell: bash
116-
script: |
117-
${PREPARE_SHELL}
118-
cd "${DRIVERS_TOOLS}"/.evergreen/auth_oidc
119-
120-
# This is a bit confusing but the ec2.assume_role command before
121-
# this task will overwrite these variables to a different value
122-
# than we have set in our evergreen project config. As these are
123-
# now specific to the OIDC ARN, we re-export for the python
124-
# scripts.
125-
export AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
126-
export AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
127-
export AWS_SESSION_TOKEN=${AWS_SESSION_TOKEN}
128-
export OIDC_TOKEN_DIR=/tmp/tokens
129-
130-
. ./activate-authoidcvenv.sh
131-
python oidc_write_orchestration.py
132-
python oidc_get_tokens.py
133-
setup oidc roles:
134-
- command: subprocess.exec
135-
params:
136-
working_dir: src
137-
binary: bash
138-
args:
139-
- .evergreen/setup-oidc-roles.sh
140-
env:
141-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
142-
run oidc tests aws:
143-
- command: shell.exec
144-
type: test
145-
params:
146-
working_dir: src
147-
timeout_secs: 300
148-
shell: bash
149-
script: |
150-
${PREPARE_SHELL}
151-
152-
OIDC_TOKEN_DIR="/tmp/tokens" \
153-
AWS_WEB_IDENTITY_TOKEN_FILE="/tmp/tokens/test_user1" \
154-
PROJECT_DIRECTORY="${PROJECT_DIRECTORY}" \
155-
bash ${PROJECT_DIRECTORY}/.evergreen/run-oidc-tests.sh
156107
run tests:
157108
- command: shell.exec
158109
type: test
@@ -1205,25 +1156,6 @@ tasks:
12051156
EXPECTED_AZUREKMS_OUTCOME: failure
12061157
args:
12071158
- src/.evergreen/run-azure-kms-tests.sh
1208-
- name: oidc-auth-test-azure-latest
1209-
commands:
1210-
- command: expansions.update
1211-
type: setup
1212-
params:
1213-
updates:
1214-
- {key: NPM_VERSION, value: '9'}
1215-
- func: install dependencies
1216-
- command: subprocess.exec
1217-
params:
1218-
working_dir: src
1219-
binary: bash
1220-
env:
1221-
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
1222-
PROJECT_DIRECTORY: ${PROJECT_DIRECTORY}
1223-
AZUREOIDC_CLIENTID: ${testazureoidc_clientid}
1224-
PROVIDER_NAME: azure
1225-
args:
1226-
- .evergreen/run-oidc-tests-azure.sh
12271159
- name: test-aws-lambda-deployed
12281160
commands:
12291161
- command: expansions.update
@@ -1794,25 +1726,6 @@ tasks:
17941726
commands:
17951727
- func: install dependencies
17961728
- func: run ldap tests
1797-
- name: test-auth-oidc
1798-
tags:
1799-
- latest
1800-
- replica_set
1801-
- oidc
1802-
commands:
1803-
- command: expansions.update
1804-
type: setup
1805-
params:
1806-
updates:
1807-
- {key: VERSION, value: latest}
1808-
- {key: TOPOLOGY, value: replica_set}
1809-
- {key: AUTH, value: auth}
1810-
- {key: ORCHESTRATION_FILE, value: auth-oidc.json}
1811-
- func: install dependencies
1812-
- func: bootstrap oidc
1813-
- func: bootstrap mongo-orchestration
1814-
- func: setup oidc roles
1815-
- func: run oidc tests aws
18161729
- name: test-socks5
18171730
tags: []
18181731
commands:
@@ -3735,33 +3648,6 @@ task_groups:
37353648
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/delete-vm.sh
37363649
tasks:
37373650
- test-azurekms-task
3738-
- name: testazureoidc_task_group
3739-
setup_group:
3740-
- func: fetch source
3741-
- command: shell.exec
3742-
params:
3743-
shell: bash
3744-
script: |-
3745-
set -o errexit
3746-
${PREPARE_SHELL}
3747-
export AZUREOIDC_CLIENTID="${testazureoidc_clientid}"
3748-
export AZUREOIDC_TENANTID="${testazureoic_tenantid}"
3749-
export AZUREOIDC_SECRET="${testazureoidc_secret}"
3750-
export AZUREOIDC_KEYVAULT=${testazureoidc_keyvault}
3751-
export AZUREOIDC_DRIVERS_TOOLS="$DRIVERS_TOOLS"
3752-
export AZUREOIDC_VMNAME_PREFIX="NODE_DRIVER"
3753-
$DRIVERS_TOOLS/.evergreen/auth_oidc/azure/create-and-setup-vm.sh
3754-
teardown_group:
3755-
- command: shell.exec
3756-
params:
3757-
shell: bash
3758-
script: |-
3759-
${PREPARE_SHELL}
3760-
$DRIVERS_TOOLS/.evergreen/auth_oidc/azure/delete-vm.sh
3761-
setup_group_can_fail_task: true
3762-
setup_group_timeout_secs: 1800
3763-
tasks:
3764-
- oidc-auth-test-azure-latest
37653651
- name: test_atlas_task_group
37663652
setup_group:
37673653
- func: fetch source
@@ -3846,7 +3732,6 @@ buildvariants:
38463732
- test-6.0-load-balanced
38473733
- test-latest-load-balanced
38483734
- test-auth-ldap
3849-
- test-auth-oidc
38503735
- test-socks5
38513736
- test-socks5-csfle
38523737
- test-socks5-tls
@@ -3898,7 +3783,6 @@ buildvariants:
38983783
- test-6.0-load-balanced
38993784
- test-latest-load-balanced
39003785
- test-auth-ldap
3901-
- test-auth-oidc
39023786
- test-socks5
39033787
- test-socks5-csfle
39043788
- test-socks5-tls
@@ -3948,7 +3832,6 @@ buildvariants:
39483832
- test-6.0-load-balanced
39493833
- test-latest-load-balanced
39503834
- test-auth-ldap
3951-
- test-auth-oidc
39523835
- test-socks5
39533836
- test-socks5-csfle
39543837
- test-socks5-tls
@@ -3998,7 +3881,6 @@ buildvariants:
39983881
- test-6.0-load-balanced
39993882
- test-latest-load-balanced
40003883
- test-auth-ldap
4001-
- test-auth-oidc
40023884
- test-socks5
40033885
- test-socks5-csfle
40043886
- test-socks5-tls
@@ -4047,7 +3929,6 @@ buildvariants:
40473929
- test-6.0-load-balanced
40483930
- test-latest-load-balanced
40493931
- test-auth-ldap
4050-
- test-auth-oidc
40513932
- test-socks5
40523933
- test-socks5-csfle
40533934
- test-socks5-tls
@@ -4331,12 +4212,6 @@ buildvariants:
43314212
tasks:
43324213
- test_azurekms_task_group
43334214
- test-azurekms-fail-task
4334-
- name: ubuntu20-test-azure-oidc
4335-
display_name: Azure OIDC
4336-
run_on: ubuntu2004-small
4337-
batchtime: 20160
4338-
tasks:
4339-
- testazureoidc_task_group
43404215
- name: rhel8-test-atlas
43414216
display_name: Atlas Cluster Tests
43424217
run_on: rhel80-large

‎.evergreen/generate_evergreen_tasks.js

+1-27
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ const WINDOWS_SKIP_TAGS = new Set([
4444
'atlas-connect',
4545
'auth',
4646
'load_balancer',
47-
'socks5-csfle',
48-
'oidc'
47+
'socks5-csfle'
4948
]);
5049

5150
const TASKS = [];
@@ -188,23 +187,6 @@ TASKS.push(
188187
tags: ['auth', 'ldap'],
189188
commands: [{ func: 'install dependencies' }, { func: 'run ldap tests' }]
190189
},
191-
{
192-
name: 'test-auth-oidc',
193-
tags: ['latest', 'replica_set', 'oidc'],
194-
commands: [
195-
updateExpansions({
196-
VERSION: 'latest',
197-
TOPOLOGY: 'replica_set',
198-
AUTH: 'auth',
199-
ORCHESTRATION_FILE: 'auth-oidc.json'
200-
}),
201-
{ func: 'install dependencies' },
202-
{ func: 'bootstrap oidc' },
203-
{ func: 'bootstrap mongo-orchestration' },
204-
{ func: 'setup oidc roles' },
205-
{ func: 'run oidc tests aws' }
206-
]
207-
},
208190
{
209191
name: 'test-socks5',
210192
tags: [],
@@ -701,14 +683,6 @@ BUILD_VARIANTS.push({
701683
tasks: ['test_azurekms_task_group', 'test-azurekms-fail-task']
702684
});
703685

704-
BUILD_VARIANTS.push({
705-
name: 'ubuntu20-test-azure-oidc',
706-
display_name: 'Azure OIDC',
707-
run_on: UBUNTU_20_OS,
708-
batchtime: 20160,
709-
tasks: ['testazureoidc_task_group']
710-
});
711-
712686
BUILD_VARIANTS.push({
713687
name: 'rhel8-test-atlas',
714688
display_name: 'Atlas Cluster Tests',

‎.evergreen/run-oidc-tests-azure.sh

-11
This file was deleted.

0 commit comments

Comments
 (0)