File tree Expand file tree Collapse file tree 4 files changed +19
-49
lines changed Expand file tree Collapse file tree 4 files changed +19
-49
lines changed Original file line number Diff line number Diff line change @@ -1223,17 +1223,7 @@ tasks:
1223
1223
binary : bash
1224
1224
add_expansions_to_env : true
1225
1225
args :
1226
- - src/.evergreen/copy-driver-to-azure.sh
1227
- - command : subprocess.exec
1228
- type : test
1229
- params :
1230
- working_dir : src
1231
- binary : bash
1232
- add_expansions_to_env : true
1233
- env :
1234
- AZUREKMS_CMD : " env EXPECTED_AZUREKMS_OUTCOME=success bash src/.evergreen/run-azure-kms-tests.sh"
1235
- args :
1236
- - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh
1226
+ - src/.evergreen/copy-driver-to-azure-and-run.sh
1237
1227
1238
1228
- name : " test-azurekms-fail-task"
1239
1229
commands :
@@ -1402,9 +1392,10 @@ task_groups:
1402
1392
params :
1403
1393
working_dir : " src"
1404
1394
binary : bash
1405
- add_expansions_to_env : true
1395
+ env :
1396
+ AZUREKMS_VMNAME_PREFIX : " NODE_DRIVER"
1406
1397
args :
1407
- - .evergreen/setup-azure-vm .sh
1398
+ - ${DRIVERS_TOOLS}/ .evergreen/csfle/azurekms/ setup.sh
1408
1399
- command : expansions.update
1409
1400
# Load AZUREKMS_VMNAME into the expansions.
1410
1401
params :
@@ -1420,7 +1411,7 @@ task_groups:
1420
1411
binary : bash
1421
1412
add_expansions_to_env : true
1422
1413
args :
1423
- - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/delete-vm .sh
1414
+ - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown .sh
1424
1415
tasks :
1425
1416
- test-azurekms-task
1426
1417
Original file line number Diff line number Diff line change @@ -1176,17 +1176,7 @@ tasks:
1176
1176
binary : bash
1177
1177
add_expansions_to_env : true
1178
1178
args :
1179
- - src/.evergreen/copy-driver-to-azure.sh
1180
- - command : subprocess.exec
1181
- type : test
1182
- params :
1183
- working_dir : src
1184
- binary : bash
1185
- add_expansions_to_env : true
1186
- env :
1187
- AZUREKMS_CMD : env EXPECTED_AZUREKMS_OUTCOME=success bash src/.evergreen/run-azure-kms-tests.sh
1188
- args :
1189
- - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh
1179
+ - src/.evergreen/copy-driver-to-azure-and-run.sh
1190
1180
- name : test-azurekms-fail-task
1191
1181
commands :
1192
1182
- command : expansions.update
@@ -3831,9 +3821,10 @@ task_groups:
3831
3821
params :
3832
3822
working_dir : src
3833
3823
binary : bash
3834
- add_expansions_to_env : true
3824
+ env :
3825
+ AZUREKMS_VMNAME_PREFIX : NODE_DRIVER
3835
3826
args :
3836
- - .evergreen/setup-azure-vm .sh
3827
+ - ${DRIVERS_TOOLS}/ .evergreen/csfle/azurekms/ setup.sh
3837
3828
- command : expansions.update
3838
3829
params :
3839
3830
file : src/testazurekms-expansions.yml
@@ -3846,7 +3837,7 @@ task_groups:
3846
3837
binary : bash
3847
3838
add_expansions_to_env : true
3848
3839
args :
3849
- - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/delete-vm .sh
3840
+ - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown .sh
3850
3841
tasks :
3851
3842
- test-azurekms-task
3852
3843
- name : testazureoidc_task_group
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
3
3
set -o errexit
4
+ source " ${DRIVERS_TOOLS} /.evergreen/csfle/azurekms/secrets-export.sh"
4
5
5
6
if [ -z ${AZUREKMS_RESOURCEGROUP+omitted} ]; then echo " AZUREKMS_RESOURCEGROUP is unset" && exit 1; fi
6
7
if [ -z ${AZUREKMS_VMNAME+omitted} ]; then echo " AZUREKMS_VMNAME is unset" && exit 1; fi
7
- if [ -z ${AZUREKMS_PRIVATEKEYPATH+omitted} ]; then echo " AZUREKMS_PRIVATEKEYPATH is unset" && exit 1; fi
8
8
9
9
source " ${PROJECT_DIRECTORY} /.evergreen/init-node-and-npm-env.sh"
10
10
11
+ export AZUREKMS_PUBLICKEYPATH=/tmp/testazurekms_publickey
12
+ export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
13
+
11
14
echo " compressing node driver source ... begin"
12
15
tar -czf node-driver-source.tgz src
13
16
echo " compressing node driver source ... end"
@@ -22,3 +25,8 @@ echo "decompressing node driver tar on azure ... begin"
22
25
export AZUREKMS_CMD=" tar xf node-driver-source.tgz"
23
26
" ${DRIVERS_TOOLS} /.evergreen/csfle/azurekms/run-command.sh"
24
27
echo " decompressing node driver tar on azure ... end"
28
+
29
+ echo " Running test ... begin"
30
+ export AZUREKMS_CMD=" env EXPECTED_AZUREKMS_OUTCOME=success bash src/.evergreen/run-azure-kms-tests.sh"
31
+ ${DRIVERS_TOOLS} /.evergreen/csfle/azurekms/run-command.sh
32
+ echo " Running test ... end"
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments