Skip to content

Commit f66d482

Browse files
durranbaileympearson
authored andcommitted
test(NODE-6097): fix azure kms tests (#4086)
1 parent 65780c0 commit f66d482

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
@@ -1169,17 +1169,7 @@ tasks:
11691169
binary: bash
11701170
add_expansions_to_env: true
11711171
args:
1172-
- src/.evergreen/copy-driver-to-azure.sh
1173-
- command: subprocess.exec
1174-
type: test
1175-
params:
1176-
working_dir: src
1177-
binary: bash
1178-
add_expansions_to_env: true
1179-
env:
1180-
AZUREKMS_CMD: "env EXPECTED_AZUREKMS_OUTCOME=success bash src/.evergreen/run-azure-kms-tests.sh"
1181-
args:
1182-
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh
1172+
- src/.evergreen/copy-driver-to-azure-and-run.sh
11831173

11841174
- name: "test-azurekms-fail-task"
11851175
commands:
@@ -1300,9 +1290,10 @@ task_groups:
13001290
params:
13011291
working_dir: "src"
13021292
binary: bash
1303-
add_expansions_to_env: true
1293+
env:
1294+
AZUREKMS_VMNAME_PREFIX: "NODE_DRIVER"
13041295
args:
1305-
- .evergreen/setup-azure-vm.sh
1296+
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup.sh
13061297
- command: expansions.update
13071298
# Load AZUREKMS_VMNAME into the expansions.
13081299
params:
@@ -1318,7 +1309,7 @@ task_groups:
13181309
binary: bash
13191310
add_expansions_to_env: true
13201311
args:
1321-
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/delete-vm.sh
1312+
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown.sh
13221313
tasks:
13231314
- test-azurekms-task
13241315

.evergreen/config.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,17 +1125,7 @@ tasks:
11251125
binary: bash
11261126
add_expansions_to_env: true
11271127
args:
1128-
- src/.evergreen/copy-driver-to-azure.sh
1129-
- command: subprocess.exec
1130-
type: test
1131-
params:
1132-
working_dir: src
1133-
binary: bash
1134-
add_expansions_to_env: true
1135-
env:
1136-
AZUREKMS_CMD: env EXPECTED_AZUREKMS_OUTCOME=success bash src/.evergreen/run-azure-kms-tests.sh
1137-
args:
1138-
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh
1128+
- src/.evergreen/copy-driver-to-azure-and-run.sh
11391129
- name: test-azurekms-fail-task
11401130
commands:
11411131
- command: expansions.update
@@ -3624,9 +3614,10 @@ task_groups:
36243614
params:
36253615
working_dir: src
36263616
binary: bash
3627-
add_expansions_to_env: true
3617+
env:
3618+
AZUREKMS_VMNAME_PREFIX: NODE_DRIVER
36283619
args:
3629-
- .evergreen/setup-azure-vm.sh
3620+
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup.sh
36303621
- command: expansions.update
36313622
params:
36323623
file: src/testazurekms-expansions.yml
@@ -3639,7 +3630,7 @@ task_groups:
36393630
binary: bash
36403631
add_expansions_to_env: true
36413632
args:
3642-
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/delete-vm.sh
3633+
- ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown.sh
36433634
tasks:
36443635
- test-azurekms-task
36453636
- name: test_atlas_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)