fix kms_setup

Author: blink1073

.evergreen/scripts/kms_tester.py

@@ -8,7 +8,7 @@
 CSFLE_FOLDER = f"{DRIVERS_TOOLS}/.evergreen/csfle"
 
 
-def setup_azure_vm(base_env: dict[str, str]) -> None:
+def _setup_azure_vm(base_env: dict[str, str]) -> None:
     LOGGER.info("Setting up Azure VM...")
     env = base_env.copy()
     env["AZUREKMS_SRC"] = TMP_DRIVER_FILE
@@ -24,7 +24,7 @@ def setup_azure_vm(base_env: dict[str, str]) -> None:
     LOGGER.info("Setting up Azure VM... done.")
 
 
-def setup_gcp_vm(base_env: dict[str, str]) -> None:
+def _setup_gcp_vm(base_env: dict[str, str]) -> None:
     LOGGER.info("Setting up GCP VM...")
     env = base_env.copy()
     env["GCPKMS_SRC"] = TMP_DRIVER_FILE
@@ -33,14 +33,14 @@ def setup_gcp_vm(base_env: dict[str, str]) -> None:
 
     env = base_env.copy()
     env["GCPKMS_CMD"] = "tar xf mongo-python-driver.tgz"
-    run_command("{CSFLE_FOLDER}/gcpkms/run-command.sh", env=env)
+    run_command(f"{CSFLE_FOLDER}/gcpkms/run-command.sh", env=env)
 
     env["GCPKMS_CMD"] = "bash ./.evergreen/just.sh setup-test kms gcp-remote"
-    run_command("{CSFLE_FOLDER}/gcpkms/run-command.sh", env=env)
+    run_command(f"{CSFLE_FOLDER}/gcpkms/run-command.sh", env=env)
     LOGGER.info("Setting up GCP VM...")
 
 
-def create_archive():
+def _create_archive():
     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)
@@ -68,26 +68,23 @@ def setup_kms(sub_test_name: str) -> None:
     if sub_test_type == "remote":
         return
 
-    if sub_test_target == "azure":
-        os.environ["AZUREKMS_VMNAME_PREFIX"] = "PYTHON_DRIVER"
-
-    run_command(f"{CSFLE_FOLDER}/{sub_test_target}kms/setup-secrets.sh")
-
     if success:
-        create_archive()
-
+        _create_archive()
+        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}/gcpkms/secrets-export.sh")
+        config = read_env(f"{CSFLE_FOLDER}/{sub_test_target}/secrets-export.sh")
         base_env = os.environ.copy()
         for key, value in config.items():
             base_env[key] = str(value)
 
         if sub_test_target == "azure":
-            setup_azure_vm(base_env)
+            _setup_azure_vm(base_env)
         else:
-            setup_gcp_vm(base_env)
+            _setup_gcp_vm(base_env)
 
     if sub_test_target == "azure":
+        run_command(f"{CSFLE_FOLDER}/{sub_test_target}kms/setup-secrets.sh")
         config = read_env(f"{CSFLE_FOLDER}/{sub_test_target}kms/secrets-export.sh")
         write_env("KEY_NAME", config["AZUREKMS_KEYNAME"])
         write_env("KEY_VAULT_ENDPOINT", config["AZUREKMS_KEYVAULTENDPOINT"])
@@ -108,5 +105,9 @@ def test_kms_vm(sub_test_name: str) -> None:
     run_command(cmd, env=env)
 
 
+def teardown_kms(sub_test_name: str) -> None:
+    run_command(f"bash {CSFLE_FOLDER}/{sub_test_name}kms/teardown.sh")
+
+
 if __name__ == "__main__":
     setup_kms()

.evergreen/scripts/teardown-tests.sh

@@ -8,15 +8,15 @@ ROOT_DIR="$(dirname $SCRIPT_DIR)"
 pushd $ROOT_DIR > /dev/null
 
 # Try to source the env file.
-if [ -f $SCRIPT_DIR/scripts/env.sh ]; then
+if [ -f $SCRIPT_DIR/env.sh ]; then
   echo "Sourcing env inputs"
   . $SCRIPT_DIR/env.sh
 else
   echo "Not sourcing env inputs"
 fi
 
 # Handle test inputs.
-if [ -f $SCRIPT_DIR/scripts/test-env.sh ]; then
+if [ -f $SCRIPT_DIR/test-env.sh ]; then
   echo "Sourcing test inputs"
   . $SCRIPT_DIR/test-env.sh
 else

.evergreen/scripts/teardown_tests.py

@@ -2,11 +2,13 @@
 
 import os
 
-from utils import DRIVERS_TOOLS, run_command
+from utils import DRIVERS_TOOLS, LOGGER, run_command
 
-TEST_NAME = os.environ.get("TEST_NAME")
+TEST_NAME = os.environ.get("TEST_NAME", "unconfigured")
 SUB_TEST_NAME = os.environ.get("SUB_TEST_NAME")
 
+LOGGER.info(f"Tearing down tests of type '{TEST_NAME}'...")
+
 # Shut down csfle servers if applicable
 if TEST_NAME == "encryption":
     run_command(f"bash {DRIVERS_TOOLS}/.evergreen/csfle/stop-servers.sh")
@@ -17,4 +19,8 @@
 
 # Tear down kms VM if applicable.
 elif TEST_NAME == "kms" and SUB_TEST_NAME in ["azure", "gcp"]:
-    run_command(f"bash {DRIVERS_TOOLS}/.evergreen/csfle/{SUB_TEST_NAME}kms/teardown.sh")
+    from kms_tester import teardown_kms
+
+    teardown_kms(SUB_TEST_NAME)
+
+LOGGER.info(f"Tearing down tests of type '{TEST_NAME}'... done.")