test(NODE-6096): fix gcp kms tests (#4084)

Author: durran

.evergreen/config.in.yml

@@ -1371,14 +1371,8 @@ task_groups:
         params:
           working_dir: "src"
           binary: bash
-          add_expansions_to_env: true
-          env:
-            testgcpkms_key_file: ${gcpkms_key_file}
-            GCPKMS_SERVICEACCOUNT: ${gcpkms_service_account}
-            GCPKMS_DRIVERS_TOOLS: ${DRIVERS_TOOLS}
-            GCPKMS_MACHINETYPE: "e2-standard-4"
           args:
-            - .evergreen/setup-gcp-instance.sh
+            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/setup.sh
       - command: expansions.update
         # Load the GCPKMS_GCLOUD, GCPKMS_INSTANCE, GCPKMS_REGION, and GCPKMS_ZONE expansions.
         params:
@@ -1395,7 +1389,7 @@ task_groups:
             GCPKMS_ZONE: ${GCPKMS_ZONE}
             GCPKMS_INSTANCENAME: ${GCPKMS_INSTANCENAME}
           args:
-            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/delete-instance.sh
+            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/teardown.sh
     tasks:
       - test-gcpkms-task
 

.evergreen/config.yml

@@ -3803,14 +3803,8 @@ task_groups:
         params:
           working_dir: src
           binary: bash
-          add_expansions_to_env: true
-          env:
-            testgcpkms_key_file: ${gcpkms_key_file}
-            GCPKMS_SERVICEACCOUNT: ${gcpkms_service_account}
-            GCPKMS_DRIVERS_TOOLS: ${DRIVERS_TOOLS}
-            GCPKMS_MACHINETYPE: e2-standard-4
           args:
-            - .evergreen/setup-gcp-instance.sh
+            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/setup.sh
       - command: expansions.update
         params:
           file: src/testgcpkms-expansions.yml
@@ -3825,7 +3819,7 @@ task_groups:
             GCPKMS_ZONE: ${GCPKMS_ZONE}
             GCPKMS_INSTANCENAME: ${GCPKMS_INSTANCENAME}
           args:
-            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/delete-instance.sh
+            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/teardown.sh
     tasks:
       - test-gcpkms-task
   - name: test_azurekms_task_group

.evergreen/setup-gcp-instance.sh

@@ -1,5 +1,7 @@
 #! /usr/bin/env bash
 
+source "${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/secrets-export.sh"
+
 # Assert required environment variables are present without printing them
 if [ -z ${GCPKMS_GCLOUD+omitted} ]; then echo "GCPKMS_GCLOUD is unset" && exit 1; fi
 if [ -z ${GCPKMS_PROJECT+omitted} ]; then echo "GCPKMS_PROJECT is unset" && exit 1; fi