From 2b21e78656660d0c9c2d7b3c84bca5de8f261493 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Tue, 27 Aug 2024 19:05:46 -0500 Subject: [PATCH] GODRIVER-3311 Fix AzureKMS and Atlas Startup Scripts (#478) --- .evergreen/atlas/setup.sh | 3 +++ .evergreen/csfle/azurekms/create-and-setup-vm.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/.evergreen/atlas/setup.sh b/.evergreen/atlas/setup.sh index e68e575e..2428dff6 100755 --- a/.evergreen/atlas/setup.sh +++ b/.evergreen/atlas/setup.sh @@ -9,3 +9,6 @@ SCRIPT_DIR=$(dirname ${BASH_SOURCE[0]}) source $SCRIPT_DIR/secrets-export.sh . ${DRIVERS_TOOLS}/.evergreen/check-connection.sh + +# Clean up binary directory. +rm -rf ${DRIVERS_TOOLS}/mongodb diff --git a/.evergreen/csfle/azurekms/create-and-setup-vm.sh b/.evergreen/csfle/azurekms/create-and-setup-vm.sh index 93a5cfc5..bbaaeaef 100755 --- a/.evergreen/csfle/azurekms/create-and-setup-vm.sh +++ b/.evergreen/csfle/azurekms/create-and-setup-vm.sh @@ -62,6 +62,7 @@ if [ -f secrets-export.sh ]; then echo "export AZUREKMS_VMNAME=\"$AZUREKMS_VMNAME\"" >> secrets-export.sh echo "export AZUREKMS_RESOURCEGROUP=\"$AZUREKMS_RESOURCEGROUP\"" >> secrets-export.sh echo "export AZUREKMS_SCOPE=\"$AZUREKMS_SCOPE\"" >> secrets-export.sh + echo "export AZUREKMS_PRIVATEKEYPATH=\"$AZUREKMS_PRIVATEKEYPATH\"" >> secrets-export.sh fi # Assign role. "$DRIVERS_TOOLS"/.evergreen/csfle/azurekms/assign-role.sh