@@ -171,14 +171,12 @@ functions:
171
171
./run-mongohouse-image.sh
172
172
173
173
" create serverless instance " :
174
- - command : shell .exec
174
+ - command : subprocess .exec
175
175
params :
176
176
working_dir : " src"
177
- script : |
178
- ${PREPARE_SHELL}
179
-
180
- bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh
181
- bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
177
+ binary : bash
178
+ args :
179
+ - ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
182
180
- command : expansions.update
183
181
params :
184
182
file : src/serverless-expansion.yml
@@ -190,17 +188,19 @@ functions:
190
188
script : |
191
189
${PREPARE_SHELL}
192
190
193
- bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh serverless_next
191
+ VAULT_NAME= serverless_next \
194
192
bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
195
193
- command : expansions.update
196
194
params :
197
195
file : src/serverless-expansion.yml
198
196
199
197
" delete serverless instance " :
200
- - command : shell .exec
198
+ - command : subprocess .exec
201
199
params :
202
- script : |
203
- bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
200
+ working_dir : " src"
201
+ binary : bash
202
+ args :
203
+ - ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
204
204
205
205
" run tests " :
206
206
- command : shell.exec
@@ -274,12 +274,15 @@ functions:
274
274
export KMS_TLS_CA_FILE="${client_side_encryption_kms_tls_ca_file}"
275
275
export KMS_TLS_CERTIFICATE_KEY_FILE="${client_side_encryption_kms_tls_certificate_key_file}"
276
276
export MONGODB_IS_SERVERLESS=on
277
- export MONGODB_USERNAME=${SERVERLESS_ATLAS_USER}
278
- export MONGODB_PASSWORD=${SERVERLESS_ATLAS_PASSWORD}
277
+ export MONGODB_URI="${SERVERLESS_URI}"
279
278
export PATH="${PHP_PATH}/bin:$PATH"
280
279
280
+ . ${DRIVERS_TOOLS}/.evergreen/serverless/secrets-export.sh
281
+
282
+ export MONGODB_USERNAME=$SERVERLESS_ATLAS_USER
283
+ export MONGODB_PASSWORD=$SERVERLESS_ATLAS_PASSWORD
284
+
281
285
CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH} \
282
- MONGODB_URI="${SERVERLESS_URI}" \
283
286
TESTS="serverless" \
284
287
${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
285
288
0 commit comments