Skip to content

Commit 2645513

Browse files
authored
test(NODE-6097): fix azure kms tests (#4086)
1 parent 9c3ade5 commit 2645513

File tree

4 files changed

+19
-49
lines changed

4 files changed

+19
-49
lines changed

.evergreen/config.in.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,17 +1223,7 @@ tasks:
12231223
binary: bash
12241224
add_expansions_to_env: true
12251225
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
12371227

12381228
- name: "test-azurekms-fail-task"
12391229
commands:
@@ -1402,9 +1392,10 @@ task_groups:
14021392
params:
14031393
working_dir: "src"
14041394
binary: bash
1405-
add_expansions_to_env: true
1395+
env:
1396+
AZUREKMS_VMNAME_PREFIX: "NODE_DRIVER"
14061397
args:
1407-
- .evergreen/setup-azure-vm.sh
1398+
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup.sh
14081399
- command: expansions.update
14091400
# Load AZUREKMS_VMNAME into the expansions.
14101401
params:
@@ -1420,7 +1411,7 @@ task_groups:
14201411
binary: bash
14211412
add_expansions_to_env: true
14221413
args:
1423-
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/delete-vm.sh
1414+
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown.sh
14241415
tasks:
14251416
- test-azurekms-task
14261417

.evergreen/config.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,17 +1176,7 @@ tasks:
11761176
binary: bash
11771177
add_expansions_to_env: true
11781178
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
11901180
- name: test-azurekms-fail-task
11911181
commands:
11921182
- command: expansions.update
@@ -3831,9 +3821,10 @@ task_groups:
38313821
params:
38323822
working_dir: src
38333823
binary: bash
3834-
add_expansions_to_env: true
3824+
env:
3825+
AZUREKMS_VMNAME_PREFIX: NODE_DRIVER
38353826
args:
3836-
- .evergreen/setup-azure-vm.sh
3827+
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup.sh
38373828
- command: expansions.update
38383829
params:
38393830
file: src/testazurekms-expansions.yml
@@ -3846,7 +3837,7 @@ task_groups:
38463837
binary: bash
38473838
add_expansions_to_env: true
38483839
args:
3849-
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/delete-vm.sh
3840+
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown.sh
38503841
tasks:
38513842
- test-azurekms-task
38523843
- name: testazureoidc_task_group

.evergreen/copy-driver-to-azure.sh renamed to .evergreen/copy-driver-to-azure-and-run.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
#! /usr/bin/env bash
22

33
set -o errexit
4+
source "${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/secrets-export.sh"
45

56
if [ -z ${AZUREKMS_RESOURCEGROUP+omitted} ]; then echo "AZUREKMS_RESOURCEGROUP is unset" && exit 1; fi
67
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
88

99
source "${PROJECT_DIRECTORY}/.evergreen/init-node-and-npm-env.sh"
1010

11+
export AZUREKMS_PUBLICKEYPATH=/tmp/testazurekms_publickey
12+
export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
13+
1114
echo "compressing node driver source ... begin"
1215
tar -czf node-driver-source.tgz src
1316
echo "compressing node driver source ... end"
@@ -22,3 +25,8 @@ echo "decompressing node driver tar on azure ... begin"
2225
export AZUREKMS_CMD="tar xf node-driver-source.tgz"
2326
"${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh"
2427
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"

.evergreen/setup-azure-vm.sh

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)