Skip to content

Commit 4b8802e

Browse files
baileympearsonbaileympearson
committed
serverless uses secrets manager
1 parent 73def18 commit 4b8802e

File tree

6 files changed

+113
-154
lines changed

6 files changed

+113
-154
lines changed

‎.evergreen/config.in.yml‎

Lines changed: 17 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -238,27 +238,13 @@ functions:
238238
. ./set-temp-creds.sh
239239
popd
240240
241-
MONGODB_URI="${MONGODB_URI}" \
242-
AUTH=${AUTH} SSL=${SSL} TEST_CSFLE=true \
243-
MONGODB_API_VERSION="${MONGODB_API_VERSION}"
244-
245241
export MONGODB_API_VERSION="${MONGODB_API_VERSION}"
246242
export AUTH="auth"
247243
export SSL="ssl"
248-
export SERVERLESS="1"
249-
export SERVERLESS_ATLAS_USER="${SERVERLESS_ATLAS_USER}"
250-
export SERVERLESS_ATLAS_PASSWORD="${SERVERLESS_ATLAS_PASSWORD}"
251-
export SERVERLESS_URI="${SERVERLESS_URI}"
244+
export TEST_CSFLE=true
252245
253-
echo "setting SERVERLESS_URI: $SERVERLESS_URI"
254-
255-
export MONGODB_URI="${SERVERLESS_URI}"
256-
export SINGLE_MONGOS_LB_URI="${SERVERLESS_URI}"
257-
258-
# Setting MULTI_MONGOS to the SERVERLESS_URI is intentional
259-
# LB tests pick one host out of the comma separated list
260-
# so just passing the one host is equivalent
261-
export MULTI_MONGOS_LB_URI="${SERVERLESS_URI}"
246+
source secrets-export.sh
247+
source serverless.env
262248
263249
bash ${PROJECT_DIRECTORY}/.evergreen/run-serverless-tests.sh
264250
@@ -1427,32 +1413,24 @@ task_groups:
14271413
setup_group_timeout_secs: 1800 # 30 minutes
14281414
setup_group:
14291415
- func: "fetch source"
1430-
- command: shell.exec
1431-
params:
1432-
shell: bash
1433-
script: |
1434-
${PREPARE_SHELL}
1435-
set +o xtrace
1436-
LOADBALANCED=ON \
1437-
SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \
1438-
SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \
1439-
SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \
1440-
bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
1441-
- command: expansions.update
1416+
- command: subprocess.exec
14421417
params:
1443-
file: serverless-expansion.yml
1418+
working_dir: "src"
1419+
binary: bash
1420+
env:
1421+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
1422+
args:
1423+
- .evergreen/setup-serverless.sh
1424+
14441425
teardown_group:
14451426
- func: "upload test results"
1446-
- command: shell.exec
1427+
- command: subprocess.exec
14471428
params:
1448-
script: |
1449-
${PREPARE_SHELL}
1450-
set +o xtrace
1451-
SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \
1452-
SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \
1453-
SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \
1454-
SERVERLESS_INSTANCE_NAME=${SERVERLESS_INSTANCE_NAME} \
1455-
bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
1429+
working_dir: "src"
1430+
binary: bash
1431+
args:
1432+
- ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
1433+
14561434
tasks:
14571435
- ".serverless"
14581436

‎.evergreen/config.yml‎

Lines changed: 15 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -209,27 +209,13 @@ functions:
209209
. ./set-temp-creds.sh
210210
popd
211211
212-
MONGODB_URI="${MONGODB_URI}" \
213-
AUTH=${AUTH} SSL=${SSL} TEST_CSFLE=true \
214-
MONGODB_API_VERSION="${MONGODB_API_VERSION}"
215-
216212
export MONGODB_API_VERSION="${MONGODB_API_VERSION}"
217213
export AUTH="auth"
218214
export SSL="ssl"
219-
export SERVERLESS="1"
220-
export SERVERLESS_ATLAS_USER="${SERVERLESS_ATLAS_USER}"
221-
export SERVERLESS_ATLAS_PASSWORD="${SERVERLESS_ATLAS_PASSWORD}"
222-
export SERVERLESS_URI="${SERVERLESS_URI}"
215+
export TEST_CSFLE=true
223216
224-
echo "setting SERVERLESS_URI: $SERVERLESS_URI"
225-
226-
export MONGODB_URI="${SERVERLESS_URI}"
227-
export SINGLE_MONGOS_LB_URI="${SERVERLESS_URI}"
228-
229-
# Setting MULTI_MONGOS to the SERVERLESS_URI is intentional
230-
# LB tests pick one host out of the comma separated list
231-
# so just passing the one host is equivalent
232-
export MULTI_MONGOS_LB_URI="${SERVERLESS_URI}"
217+
source secrets-export.sh
218+
source serverless.env
233219
234220
bash ${PROJECT_DIRECTORY}/.evergreen/run-serverless-tests.sh
235221
start-load-balancer:
@@ -4458,32 +4444,22 @@ task_groups:
44584444
setup_group_timeout_secs: 1800
44594445
setup_group:
44604446
- func: fetch source
4461-
- command: shell.exec
4462-
params:
4463-
shell: bash
4464-
script: |
4465-
${PREPARE_SHELL}
4466-
set +o xtrace
4467-
LOADBALANCED=ON \
4468-
SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \
4469-
SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \
4470-
SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \
4471-
bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
4472-
- command: expansions.update
4447+
- command: subprocess.exec
44734448
params:
4474-
file: serverless-expansion.yml
4449+
working_dir: src
4450+
binary: bash
4451+
env:
4452+
DRIVERS_TOOLS: ${DRIVERS_TOOLS}
4453+
args:
4454+
- .evergreen/setup-serverless.sh
44754455
teardown_group:
44764456
- func: upload test results
4477-
- command: shell.exec
4457+
- command: subprocess.exec
44784458
params:
4479-
script: |
4480-
${PREPARE_SHELL}
4481-
set +o xtrace
4482-
SERVERLESS_DRIVERS_GROUP=${SERVERLESS_DRIVERS_GROUP} \
4483-
SERVERLESS_API_PUBLIC_KEY=${SERVERLESS_API_PUBLIC_KEY} \
4484-
SERVERLESS_API_PRIVATE_KEY=${SERVERLESS_API_PRIVATE_KEY} \
4485-
SERVERLESS_INSTANCE_NAME=${SERVERLESS_INSTANCE_NAME} \
4486-
bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
4459+
working_dir: src
4460+
binary: bash
4461+
args:
4462+
- ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
44874463
tasks:
44884464
- .serverless
44894465
- name: test_gcpkms_task_group

‎.evergreen/run-serverless-tests.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
source $DRIVERS_TOOLS/.evergreen/init-node-and-npm-env.sh
44

55
if [ -z ${SERVERLESS+omitted} ]; then echo "SERVERLESS is unset" && exit 1; fi
6-
if [ -z ${SERVERLESS_URI+omitted} ]; then echo "SERVERLESS_URI is unset" && exit 1; fi
76
if [ -z ${SINGLE_MONGOS_LB_URI+omitted} ]; then echo "SINGLE_MONGOS_LB_URI is unset" && exit 1; fi
87
if [ -z ${MULTI_MONGOS_LB_URI+omitted} ]; then echo "MULTI_MONGOS_LB_URI is unset" && exit 1; fi
98
if [ -z ${MONGODB_URI+omitted} ]; then echo "MONGODB_URI is unset" && exit 1; fi

‎.evergreen/setup-serverless.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/env bash
2+
3+
bash ${DRIVERS_TOOLS}/.evergreen/secrets_handling/setup-secrets.sh drivers/serverless
4+
bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
5+
6+
cp ${DRIVERS_TOOLS}/.evergreen/serverless/secrets-export.sh .
7+
8+
# generate a source-able expansion file
9+
cat serverless-expansion.yml | sed 's/: /=/g' > serverless.env
10+
11+
echo 'export MONGODB_URI="${SERVERLESS_URI}"' >> serverless.env
12+
echo 'export SINGLE_MONGOS_LB_URI="${SERVERLESS_URI}"' >> serverless.env
13+
echo 'export MULTI_MONGOS_LB_URI="${SERVERLESS_URI}"' >> serverless.env
14+
echo 'export SERVERLESS=1' >> serverless.env

0 commit comments

Comments
 (0)