From 26455138e98c6615c0cffaa584b8141846f5e284 Mon Sep 17 00:00:00 2001 From: Durran Jordan Date: Thu, 18 Apr 2024 17:09:56 +0200 Subject: [PATCH] test(NODE-6097): fix azure kms tests (#4086) --- .evergreen/config.in.yml | 19 +++++------------- .evergreen/config.yml | 19 +++++------------- ...ure.sh => copy-driver-to-azure-and-run.sh} | 10 +++++++++- .evergreen/setup-azure-vm.sh | 20 ------------------- 4 files changed, 19 insertions(+), 49 deletions(-) rename .evergreen/{copy-driver-to-azure.sh => copy-driver-to-azure-and-run.sh} (67%) delete mode 100644 .evergreen/setup-azure-vm.sh diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml index e1c6d333b4..8961baa6f9 100644 --- a/.evergreen/config.in.yml +++ b/.evergreen/config.in.yml @@ -1223,17 +1223,7 @@ tasks: binary: bash add_expansions_to_env: true args: - - src/.evergreen/copy-driver-to-azure.sh - - command: subprocess.exec - type: test - params: - working_dir: src - binary: bash - add_expansions_to_env: true - env: - AZUREKMS_CMD: "env EXPECTED_AZUREKMS_OUTCOME=success bash src/.evergreen/run-azure-kms-tests.sh" - args: - - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh + - src/.evergreen/copy-driver-to-azure-and-run.sh - name: "test-azurekms-fail-task" commands: @@ -1402,9 +1392,10 @@ task_groups: params: working_dir: "src" binary: bash - add_expansions_to_env: true + env: + AZUREKMS_VMNAME_PREFIX: "NODE_DRIVER" args: - - .evergreen/setup-azure-vm.sh + - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup.sh - command: expansions.update # Load AZUREKMS_VMNAME into the expansions. params: @@ -1420,7 +1411,7 @@ task_groups: binary: bash add_expansions_to_env: true args: - - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/delete-vm.sh + - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown.sh tasks: - test-azurekms-task diff --git a/.evergreen/config.yml b/.evergreen/config.yml index fcc77a2f19..0db1fbe007 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1176,17 +1176,7 @@ tasks: binary: bash add_expansions_to_env: true args: - - src/.evergreen/copy-driver-to-azure.sh - - command: subprocess.exec - type: test - params: - working_dir: src - binary: bash - add_expansions_to_env: true - env: - AZUREKMS_CMD: env EXPECTED_AZUREKMS_OUTCOME=success bash src/.evergreen/run-azure-kms-tests.sh - args: - - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh + - src/.evergreen/copy-driver-to-azure-and-run.sh - name: test-azurekms-fail-task commands: - command: expansions.update @@ -3831,9 +3821,10 @@ task_groups: params: working_dir: src binary: bash - add_expansions_to_env: true + env: + AZUREKMS_VMNAME_PREFIX: NODE_DRIVER args: - - .evergreen/setup-azure-vm.sh + - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup.sh - command: expansions.update params: file: src/testazurekms-expansions.yml @@ -3846,7 +3837,7 @@ task_groups: binary: bash add_expansions_to_env: true args: - - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/delete-vm.sh + - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown.sh tasks: - test-azurekms-task - name: testazureoidc_task_group diff --git a/.evergreen/copy-driver-to-azure.sh b/.evergreen/copy-driver-to-azure-and-run.sh similarity index 67% rename from .evergreen/copy-driver-to-azure.sh rename to .evergreen/copy-driver-to-azure-and-run.sh index 25b10e3417..7adbdf08fc 100644 --- a/.evergreen/copy-driver-to-azure.sh +++ b/.evergreen/copy-driver-to-azure-and-run.sh @@ -1,13 +1,16 @@ #! /usr/bin/env bash set -o errexit +source "${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/secrets-export.sh" if [ -z ${AZUREKMS_RESOURCEGROUP+omitted} ]; then echo "AZUREKMS_RESOURCEGROUP is unset" && exit 1; fi if [ -z ${AZUREKMS_VMNAME+omitted} ]; then echo "AZUREKMS_VMNAME is unset" && exit 1; fi -if [ -z ${AZUREKMS_PRIVATEKEYPATH+omitted} ]; then echo "AZUREKMS_PRIVATEKEYPATH is unset" && exit 1; fi source "${PROJECT_DIRECTORY}/.evergreen/init-node-and-npm-env.sh" +export AZUREKMS_PUBLICKEYPATH=/tmp/testazurekms_publickey +export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey + echo "compressing node driver source ... begin" tar -czf node-driver-source.tgz src echo "compressing node driver source ... end" @@ -22,3 +25,8 @@ echo "decompressing node driver tar on azure ... begin" export AZUREKMS_CMD="tar xf node-driver-source.tgz" "${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh" echo "decompressing node driver tar on azure ... end" + +echo "Running test ... begin" +export AZUREKMS_CMD="env EXPECTED_AZUREKMS_OUTCOME=success bash src/.evergreen/run-azure-kms-tests.sh" +${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/run-command.sh +echo "Running test ... end" \ No newline at end of file diff --git a/.evergreen/setup-azure-vm.sh b/.evergreen/setup-azure-vm.sh deleted file mode 100644 index a1902849be..0000000000 --- a/.evergreen/setup-azure-vm.sh +++ /dev/null @@ -1,20 +0,0 @@ -#! /usr/bin/env bash - -echo "${testazurekms_publickey}" > /tmp/testazurekms_publickey -echo "${testazurekms_privatekey}" > /tmp/testazurekms_privatekey - -# Set 600 permissions on private key file. Otherwise ssh / scp may error with permissions "are too open". -chmod 600 /tmp/testazurekms_privatekey -export AZUREKMS_CLIENTID=${AZUREKMS_CLIENTID} -export AZUREKMS_TENANTID=${AZUREKMS_TENANTID} -export AZUREKMS_SECRET=${AZUREKMS_SECRET} -export AZUREKMS_DRIVERS_TOOLS=$DRIVERS_TOOLS -export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP} -export AZUREKMS_PUBLICKEYPATH=/tmp/testazurekms_publickey -export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey -export AZUREKMS_SCOPE=${AZUREKMS_SCOPE} -export AZUREKMS_VMNAME_PREFIX=NODEDRIVER - -$DRIVERS_TOOLS/.evergreen/csfle/azurekms/create-and-setup-vm.sh - -echo "AZUREKMS_PRIVATEKEYPATH: /tmp/testazurekms_privatekey" >> testazurekms-expansions.yml