Skip to content

test(NODE-6097): fix azure kms tests #4086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 5 additions & 14 deletions .evergreen/config.in.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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

Expand Down
19 changes: 5 additions & 14 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
20 changes: 0 additions & 20 deletions .evergreen/setup-azure-vm.sh

This file was deleted.