fix kms_setup

Author: blink1073

.evergreen/scripts/cleanup.sh

@@ -1,7 +1,4 @@
 #!/bin/bash
 
-if [ -f "$DRIVERS_TOOLS"/.evergreen/csfle/secrets-export.sh ]; then
-  bash .evergreen/teardown-encryption.sh
-fi
 rm -rf "${DRIVERS_TOOLS}" || true
 rm -f ./secrets-export.sh || true

.evergreen/scripts/kms_tester.py

@@ -40,12 +40,19 @@ def _setup_gcp_vm(base_env: dict[str, str]) -> None:
     LOGGER.info("Setting up GCP VM...")
 
 
-def _create_archive():
+def _create_archive() -> None:
     run_command("git add .", cwd=ROOT)
     run_command('git commit -m "add files"', check=False, cwd=ROOT)
     run_command(f"git archive -o {TMP_DRIVER_FILE} HEAD", cwd=ROOT)
 
 
+def _load_kms_config(sub_test_target: str) -> None:
+    config = read_env(f"{CSFLE_FOLDER}/{sub_test_target}kms/secrets-export.sh")
+    base_env = os.environ.copy()
+    for key, value in config.items():
+        base_env[key] = str(value)
+
+
 def setup_kms(sub_test_name: str) -> None:
     if "-" in sub_test_name:
         sub_test_target, sub_test_type = sub_test_name.split("-")
@@ -73,10 +80,7 @@ def setup_kms(sub_test_name: str) -> None:
         if sub_test_target == "azure":
             os.environ["AZUREKMS_VMNAME_PREFIX"] = "PYTHON_DRIVER"
         run_command(f"{CSFLE_FOLDER}/{sub_test_target}kms/setup.sh")
-        config = read_env(f"{CSFLE_FOLDER}/{sub_test_target}kms/secrets-export.sh")
-        base_env = os.environ.copy()
-        for key, value in config.items():
-            base_env[key] = str(value)
+        base_env = _load_kms_config(sub_test_target)
 
         if sub_test_target == "azure":
             _setup_azure_vm(base_env)
@@ -91,17 +95,16 @@ def setup_kms(sub_test_name: str) -> None:
 
 
 def test_kms_vm(sub_test_name: str) -> None:
-    env = os.environ.copy()
+    env = _load_kms_config(sub_test_name)
     if sub_test_name == "azure":
         key_name = os.environ["KEY_NAME"]
         key_vault_endpoint = os.environ["KEY_VAULT_ENDPOINT"]
         env[
             "AZUREKMS_CMD"
         ] = f'KEY_NAME="{key_name}" KEY_VAULT_ENDPOINT="{key_vault_endpoint}" bash ./.evergreen/just.sh run-tests'
-        cmd = f"{CSFLE_FOLDER}/azurekms/run-command.sh"
     else:
         env["GCPKMS_CMD"] = "./.evergreen/just.sh run-tests"
-        cmd = f"{CSFLE_FOLDER}/gcpkms/run-command.sh"
+    cmd = f"{CSFLE_FOLDER}/{sub_test_name}kms/run-command.sh"
     run_command(cmd, env=env)
 
 

.evergreen/scripts/setup-dev-env.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eux
+set -eu
 
 HERE=$(dirname ${BASH_SOURCE:-$0})
 HERE="$( cd -- "$HERE" > /dev/null 2>&1 && pwd )"