From 9e23d6e9ada8de4e991c23dbe4ab6a92f91e97ca Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 27 Aug 2024 10:06:39 -0500
Subject: [PATCH 01/10] GODRIVER-3311 Use setup and teardown scripts from
 drivers-tools

---
 .evergreen/config.yml | 247 +++++++++++-------------------------------
 1 file changed, 65 insertions(+), 182 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 6f87470c7c..adafeb1334 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -141,61 +141,28 @@ functions:
         script: |
           ${PREPARE_SHELL}
           rm -rf $DRIVERS_TOOLS
-          if [ "${project}" = "drivers-tools" ]; then
-            # If this was a patch build, doing a fresh clone would not actually test the patch
-            cp -R ${PROJECT_DIRECTORY}/ $DRIVERS_TOOLS
-          else
-            git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
-          fi
-          echo "{ \"releases\": { \"default\": \"$MONGODB_BINARIES\" }}" > $MONGO_ORCHESTRATION_HOME/orchestration.config
-    - command: shell.exec
-      params:
-        shell: "bash"
-        working_dir: src/go.mongodb.org/mongo-driver
-        script: |
-          ${PREPARE_SHELL}
-
-          # initialize submodules
-          git submodule init
-          git submodule update
-    - command: shell.exec
-      params:
-        shell: "bash"
-        working_dir: src/go.mongodb.org/mongo-driver
-        script: |
-          . ${DRIVERS_TOOLS}/.evergreen/venv-utils.sh
-          . ${DRIVERS_TOOLS}/.evergreen/find-python3.sh
-
-          export PYTHON3_BINARY="$(find_python3 2>/dev/null)"
-          venvcreate "$PYTHON3_BINARY" venv
-
-          echo "PYTHON3_BINARY: $PYTHON3_BINARY" >>expansion.yml
-    # Load the expansion file to make an evergreen variable with the current unique version
-    - command: expansions.update
+          git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
+    - command: subprocess.exec
       params:
-        file: src/go.mongodb.org/mongo-driver/expansion.yml
+        binary: "bash"
+        args:
+          - ${DRIVERS_TOOLS}/.evergreen/setup.sh
 
   handle-test-artifacts:
     - command: gotest.parse_files
       params:
         files:
           - "src/go.mongodb.org/mongo-driver/*.suite"
-    - command: shell.exec
-      params:
-        shell: "bash"
-        script: |
-          ${PREPARE_SHELL}
-          find $MONGO_ORCHESTRATION_HOME -name \*.log | xargs tar czf mongodb-logs.tar.gz
     - command: s3.put
       params:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: mongodb-logs.tar.gz
-        remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-mongodb-logs.tar.gz
+        local_file: ${DRIVERS_TOOLS}/.evergreen/test_logs.tar.gz
+        remote_file: ${UPLOAD_BUCKET}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-drivers-tools-logs.tar.gz
         bucket: mciuploads
         permissions: public-read
         content_type: ${content_type|application/x-gzip}
-        display_name: "mongodb-logs.tar.gz"
+        display_name: "drivers-tools-logs.tar.gz"
     - command: s3.put
       params:
         aws_key: ${aws_key}
@@ -275,74 +242,23 @@ functions:
       params:
         file: mo-expansion.yml
 
-  cleanup:
-    - command: shell.exec
+  teardown:
+    - command: subprocess.exec
       params:
-        shell: "bash"
-        script: |
+        binary: "bash"
+        args: 
           # Ensure the instance profile is reassigned for aws tests.
-          cd "${DRIVERS_TOOLS}/.evergreen/auth_aws"
-          if [ -f "./aws_e2e_setup.json" ]; then
-            . ./activate-authawsvenv.sh
-            python ./lib/aws_assign_instance_profile.py
-          fi
-    - command: shell.exec
-      params:
-        shell: "bash"
-        script: |
-          # Attempt to shut down a running load balancer. Ignore any errors that happen if the load
-          # balancer is not running.
-          DRIVERS_TOOLS=${DRIVERS_TOOLS} MONGODB_URI=${MONGODB_URI} bash ${DRIVERS_TOOLS}/.evergreen/run-load-balancer.sh stop || echo "Ignoring load balancer stop error"
-    - command: shell.exec
-      params:
-        shell: "bash"
-        script: |
-          ${PREPARE_SHELL}
-          # Clean up cse servers
-          bash ${DRIVERS_TOOLS}/.evergreen/csfle/stop-servers.sh
-    - command: shell.exec
-      params:
-        shell: "bash"
-        script: |
-          ${PREPARE_SHELL}
-          # Stop orchestration and remove drivers tools.
-          bash ${DRIVERS_TOOLS}/.evergreen/stop-orchestration.sh
-          cd -
-          rm -rf $DRIVERS_TOOLS || true
-
-
-  fix-absolute-paths:
-    - command: shell.exec
-      params:
-        shell: "bash"
-        script: |
-          ${PREPARE_SHELL}
-          for filename in $(find ${DRIVERS_TOOLS} -name \*.json); do
-            perl -p -i -e "s|ABSOLUTE_PATH_REPLACEMENT_TOKEN|${DRIVERS_TOOLS}|g" $filename
-          done
-
-  windows-fix:
-    - command: shell.exec
+          - ${DRIVERS_TOOLS}/.evergreen/auth_aws/teardown.sh
+    - command: subprocess.exec
       params:
-        shell: "bash"
-        script: |
-          ${PREPARE_SHELL}
-          for i in $(find ${DRIVERS_TOOLS}/.evergreen ${PROJECT_DIRECTORY} -name \*.sh); do
-            cat $i | tr -d '\r' > $i.new
-            mv $i.new $i
-          done
-          # Copy client certificate because symlinks do not work on Windows. Ignore any copy errors.
-          cp ${DRIVERS_TOOLS}/.evergreen/x509gen/client.pem ${MONGO_ORCHESTRATION_HOME}/lib/client.pem || echo "Ignoring copy error"
-
-  make-files-executable:
-    - command: shell.exec
+        binary: "bash"
+        args: 
+          - ${DRIVERS_TOOLS}/.evergreen/csfle/teardown.sh
+    - command: subprocess.exec
       params:
-        shell: "bash"
-        script: |
-          ${PREPARE_SHELL}
-          for i in $(find ${DRIVERS_TOOLS}/.evergreen ${PROJECT_DIRECTORY} -name \*.sh); do
-            chmod +x $i
-          done
+        binary: "bash"
+        args: 
+          - ${DRIVERS_TOOLS}/.evergreen/teardown.sh
 
   assume-ec2-role:
     - command: ec2.assume_role
@@ -883,13 +799,10 @@ functions:
 pre:
   - func: fetch-source
   - func: prepare-resources
-  - func: windows-fix
-  - func: fix-absolute-paths
-  - func: make-files-executable
 
 post:
+  - func: teardown
   - func: handle-test-artifacts
-  - func: cleanup
 
 tasks:
   - name: static-analysis
@@ -2175,16 +2088,12 @@ task_groups:
     setup_group:
       - func: fetch-source
       - func: prepare-resources
-      - func: fix-absolute-paths
-      - func: make-files-executable
       - func: start-cse-servers
-      - command: shell.exec
+      - command: subprocess.exec
         params:
-          shell: "bash"
-          script: |
-            ${PREPARE_SHELL}
-            bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh ${VAULT_NAME}
-            bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
+          binary: "bash"
+          args: 
+            - ${DRIVERS_TOOLS}/.evergreen/serverless/setup.sh
       - command: expansions.update
         params:
           file: serverless-expansion.yml
@@ -2215,14 +2124,14 @@ task_groups:
           file: crypt-expansion.yml
 
     teardown_group:
-      - command: shell.exec
+      - command: subprocess.exec
         params:
-          shell: "bash"
-          script: |
-            ${PREPARE_SHELL}
-            bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
+          binary: "bash"
+          args:
+            - ${DRIVERS_TOOLS}/.evergreen/serverless/teardown.sh
+      - func: teardown
       - func: handle-test-artifacts
-      - func: cleanup
+      
     tasks:
       - ".serverless"
 
@@ -2232,27 +2141,19 @@ task_groups:
     setup_group:
       - func: fetch-source
       - func: prepare-resources
-      - func: fix-absolute-paths
-      - func: make-files-executable
-      - command: shell.exec
-        params:
-          shell: "bash"
-          script: |
-            ${PREPARE_SHELL}
-            $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/create-and-setup-instance.sh
-      # Load the GCPKMS_GCLOUD, GCPKMS_INSTANCE, GCPKMS_REGION, and GCPKMS_ZONE expansions.
-      - command: expansions.update
+      - command: subprocess.exec
         params:
-          file: testgcpkms-expansions.yml
+          binary: "bash"
+          args: 
+            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/setup.sh
     teardown_group:
-      - command: shell.exec
+      - command: subprocess.exec
         params:
-          shell: "bash"
-          script: |
-            ${PREPARE_SHELL}
-            $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/delete-instance.sh
+          binary: "bash"
+          args: 
+            - ${DRIVERS_TOOLS}/.evergreen/csfle/gcpkms/teardown.sh
+      - func: teardown
       - func: handle-test-artifacts
-      - func: cleanup
     tasks:
       - testgcpkms-task
 
@@ -2263,8 +2164,6 @@ task_groups:
     setup_group:
       - func: fetch-source
       - func: prepare-resources
-      - func: fix-absolute-paths
-      - func: make-files-executable
       - command: shell.exec
         params:
           shell: "bash"
@@ -2275,24 +2174,15 @@ task_groups:
             # Get azurekms credentials from the vault.
             . ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup-secrets.sh
             ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/create-and-setup-vm.sh
-      - command: expansions.update
-        params:
-          file: testazurekms-expansions.yml
     teardown_group:
-      # setup_group may have failed before updating expansions. Try to update again to clean up resources on setup failure.
-      - command: expansions.update
-        params:
-          file: testazurekms-expansions.yml
-      - command: shell.exec
+      - command: subprocess.exec
         params:
-          shell: "bash"
-          script: |
-            ${PREPARE_SHELL}
-            export AZUREKMS_SCOPE=${AZUREKMS_SCOPE}
-            export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
-            $DRIVERS_TOOLS/.evergreen/csfle/azurekms/delete-vm.sh
+          binary: "bash"
+          args: 
+           - ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/teardown.sh
+      - func: teardown
       - func: handle-test-artifacts
-      - func: cleanup
+      
     tasks:
       - testazurekms-task
 
@@ -2300,22 +2190,21 @@ task_groups:
     setup_group:
       - func: fetch-source
       - func: prepare-resources
-      - func: fix-absolute-paths
-      - func: make-files-executable
       - func: assume-ec2-role
-      - command: shell.exec
+      - command: subprocess.exec
         params:
-          shell: bash
+          binary: bash
           include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN"]
-          script: |
-            ${PREPARE_SHELL}
-            ${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh
+          args:
+            - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/setup.sh
     teardown_task:
       - command: subprocess.exec
         params:
           binary: bash
           args:
             - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/teardown.sh
+      - func: teardown
+      - func: handle-test-artifacts
     setup_group_can_fail_task: true
     setup_group_timeout_secs: 1800
     tasks:
@@ -2325,21 +2214,21 @@ task_groups:
     setup_group:
       - func: fetch-source
       - func: prepare-resources
-      - func: fix-absolute-paths
-      - func: make-files-executable
       - command: subprocess.exec
         params:
           binary: bash
           env:
             AZUREOIDC_VMNAME_PREFIX: "GO_DRIVER"
           args:
-            - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/azure/create-and-setup-vm.sh
+            - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/azure/setup.sh
     teardown_task:
       - command: subprocess.exec
         params:
           binary: bash
           args:
-            - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/azure/delete-vm.sh
+            - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/azure/teardown.sh
+      - func: teardown
+      - func: handle-test-artifacts
     setup_group_can_fail_task: true
     setup_group_timeout_secs: 1800
     tasks:
@@ -2349,8 +2238,6 @@ task_groups:
     setup_group:
       - func: fetch-source
       - func: prepare-resources
-      - func: fix-absolute-paths
-      - func: make-files-executable
       - command: subprocess.exec
         params:
           binary: bash
@@ -2364,6 +2251,8 @@ task_groups:
           binary: bash
           args:
             - ${DRIVERS_TOOLS}/.evergreen/auth_oidc/gcp/teardown.sh
+      - func: teardown
+      - func: handle-test-artifacts
     setup_group_can_fail_task: true
     setup_group_timeout_secs: 1800
     tasks:
@@ -2379,11 +2268,8 @@ task_groups:
           binary: bash
           env:
             LAMBDA_STACK_NAME: dbx-go-lambda
-            AWS_REGION: us-east-1
-            task_id: ${task_id}
-            execution: ${execution}
           args:
-            - ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
+            - ${DRIVERS_TOOLS}/.evergreen/atlas/setup.sh
     teardown_group:
       - command: subprocess.exec
         params:
@@ -2393,9 +2279,9 @@ task_groups:
             LAMBDA_STACK_NAME: dbx-go-lambda
             AWS_REGION: us-east-1
           args:
-            - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
+            - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown.sh
+      - func: teardown
       - func: handle-test-artifacts
-      - func: cleanup
     setup_group_can_fail_task: true
     setup_group_timeout_secs: 1800
     tasks:
@@ -2412,11 +2298,8 @@ task_groups:
           env:
             MONGODB_VERSION: "7.0"
             LAMBDA_STACK_NAME: dbx-go-lambda
-            AWS_REGION: us-east-1
-            task_id: ${task_id}
-            execution: ${execution}
           args:
-            - ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
+            - ${DRIVERS_TOOLS}/.evergreen/atlas/setup.sh
       - command: expansions.update
         params:
           file: src/go.mongodb.org/mongo-driver/atlas-expansion.yml
@@ -2435,9 +2318,9 @@ task_groups:
           working_dir: src/go.mongodb.org/mongo-driver
           binary: bash
           args:
-            - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown-atlas-cluster.sh
+            - ${DRIVERS_TOOLS}/.evergreen/atlas/teardown.sh
+      - func: teardown
       - func: handle-test-artifacts
-      - func: cleanup
     setup_group_can_fail_task: true
     setup_group_timeout_secs: 1800
     tasks:

From d297508b0a0d3bd2b654437ed12f79eb59f6e37e Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 27 Aug 2024 11:15:45 -0500
Subject: [PATCH 02/10] include project directory

---
 .evergreen/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index adafeb1334..59e70b0409 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -145,6 +145,7 @@ functions:
     - command: subprocess.exec
       params:
         binary: "bash"
+        include_expansions_in_env: ["PROJECT_DIRECTORY"]
         args:
           - ${DRIVERS_TOOLS}/.evergreen/setup.sh
 

From 8c1a16529d7307cd5ad92ffe65cb0e64b2297395 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 27 Aug 2024 13:01:22 -0500
Subject: [PATCH 03/10] cleanup

---
 .evergreen/config.yml                  | 15 +--------------
 .evergreen/run-mongodb-aws-ecs-test.sh |  0
 .evergreen/run-mongodb-aws-test.sh     |  0
 .evergreen/run-tests.sh                |  0
 etc/docker_entry.sh                    |  0
 etc/install-libmongocrypt.sh           |  0
 etc/run-atlas-test.sh                  |  0
 etc/run-awskms-test.sh                 |  0
 etc/run-enterprise-gssapi-test.sh      |  0
 etc/run-enterprise-plain-test.sh       |  0
 etc/run-oidc-test.sh                   |  0
 etc/run-serverless-test.sh             |  0
 etc/run_docker.sh                      |  0
 etc/setup-encryption.sh                |  0
 14 files changed, 1 insertion(+), 14 deletions(-)
 mode change 100644 => 100755 .evergreen/run-mongodb-aws-ecs-test.sh
 mode change 100644 => 100755 .evergreen/run-mongodb-aws-test.sh
 mode change 100644 => 100755 .evergreen/run-tests.sh
 mode change 100644 => 100755 etc/docker_entry.sh
 mode change 100644 => 100755 etc/install-libmongocrypt.sh
 mode change 100644 => 100755 etc/run-atlas-test.sh
 mode change 100644 => 100755 etc/run-awskms-test.sh
 mode change 100644 => 100755 etc/run-enterprise-gssapi-test.sh
 mode change 100644 => 100755 etc/run-enterprise-plain-test.sh
 mode change 100644 => 100755 etc/run-oidc-test.sh
 mode change 100644 => 100755 etc/run-serverless-test.sh
 mode change 100644 => 100755 etc/run_docker.sh
 mode change 100644 => 100755 etc/setup-encryption.sh

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 59e70b0409..9052c91632 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1712,10 +1712,6 @@ tasks:
           echo "Building build-kms-test ... end"
           source $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/secrets-export.sh
           echo "Copying files ... begin"
-          export GCPKMS_GCLOUD=${GCPKMS_GCLOUD}
-          export GCPKMS_PROJECT=${GCPKMS_PROJECT}
-          export GCPKMS_ZONE=${GCPKMS_ZONE}
-          export GCPKMS_INSTANCENAME=${GCPKMS_INSTANCENAME}
           tar czf testgcpkms.tgz ./testkms ./install/libmongocrypt/lib64/libmongocrypt.*
           GCPKMS_SRC=testgcpkms.tgz GCPKMS_DST=$GCPKMS_INSTANCENAME: $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/copy-file.sh
           echo "Copying files ... end"
@@ -1732,10 +1728,6 @@ tasks:
         script: |
           ${PREPARE_SHELL}
           source $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/secrets-export.sh
-          export GCPKMS_GCLOUD=${GCPKMS_GCLOUD}
-          export GCPKMS_PROJECT=${GCPKMS_PROJECT}
-          export GCPKMS_ZONE=${GCPKMS_ZONE}
-          export GCPKMS_INSTANCENAME=${GCPKMS_INSTANCENAME}
           GCPKMS_CMD="LD_LIBRARY_PATH=./install/libmongocrypt/lib64 MONGODB_URI='mongodb://localhost:27017' PROVIDER='gcp' ./testkms" $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/run-command.sh
 
   - name: "testgcpkms-fail-task"
@@ -1801,9 +1793,7 @@ tasks:
           echo "Building build-kms-test ... end"
 
           echo "Copying files ... begin"
-          export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
-          export AZUREKMS_VMNAME=${AZUREKMS_VMNAME}
-          export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
+          source $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/secrets-export.sh
           tar czf testazurekms.tgz ./testkms ./install/libmongocrypt/lib64/libmongocrypt.*
           AZUREKMS_SRC=testazurekms.tgz AZUREKMS_DST=/tmp $DRIVERS_TOOLS/.evergreen/csfle/azurekms/copy-file.sh
           echo "Copying files ... end"
@@ -1819,9 +1809,6 @@ tasks:
         script: |
           ${PREPARE_SHELL}
           source ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup-secrets.sh
-          export AZUREKMS_RESOURCEGROUP=${AZUREKMS_RESOURCEGROUP}
-          export AZUREKMS_VMNAME=${AZUREKMS_VMNAME}
-          export AZUREKMS_PRIVATEKEYPATH=/tmp/testazurekms_privatekey
           AZUREKMS_CMD="LD_LIBRARY_PATH=./install/libmongocrypt/lib64 MONGODB_URI='mongodb://localhost:27017' PROVIDER='azure' AZUREKMS_KEY_NAME='${AZUREKMS_KEY_NAME}' AZUREKMS_KEY_VAULT_ENDPOINT='${AZUREKMS_KEY_VAULT_ENDPOINT}' ./testkms" $DRIVERS_TOOLS/.evergreen/csfle/azurekms/run-command.sh
 
   - name: "testazurekms-fail-task"
diff --git a/.evergreen/run-mongodb-aws-ecs-test.sh b/.evergreen/run-mongodb-aws-ecs-test.sh
old mode 100644
new mode 100755
diff --git a/.evergreen/run-mongodb-aws-test.sh b/.evergreen/run-mongodb-aws-test.sh
old mode 100644
new mode 100755
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
old mode 100644
new mode 100755
diff --git a/etc/docker_entry.sh b/etc/docker_entry.sh
old mode 100644
new mode 100755
diff --git a/etc/install-libmongocrypt.sh b/etc/install-libmongocrypt.sh
old mode 100644
new mode 100755
diff --git a/etc/run-atlas-test.sh b/etc/run-atlas-test.sh
old mode 100644
new mode 100755
diff --git a/etc/run-awskms-test.sh b/etc/run-awskms-test.sh
old mode 100644
new mode 100755
diff --git a/etc/run-enterprise-gssapi-test.sh b/etc/run-enterprise-gssapi-test.sh
old mode 100644
new mode 100755
diff --git a/etc/run-enterprise-plain-test.sh b/etc/run-enterprise-plain-test.sh
old mode 100644
new mode 100755
diff --git a/etc/run-oidc-test.sh b/etc/run-oidc-test.sh
old mode 100644
new mode 100755
diff --git a/etc/run-serverless-test.sh b/etc/run-serverless-test.sh
old mode 100644
new mode 100755
diff --git a/etc/run_docker.sh b/etc/run_docker.sh
old mode 100644
new mode 100755
diff --git a/etc/setup-encryption.sh b/etc/setup-encryption.sh
old mode 100644
new mode 100755

From b03c5fe36003bba0e80c9115ffcdc6aed18ce60c Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 27 Aug 2024 16:24:34 -0500
Subject: [PATCH 04/10] try again

---
 .evergreen/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 9052c91632..314e4b78c4 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -1793,7 +1793,7 @@ tasks:
           echo "Building build-kms-test ... end"
 
           echo "Copying files ... begin"
-          source $DRIVERS_TOOLS/.evergreen/csfle/gcpkms/secrets-export.sh
+          source $DRIVERS_TOOLS/.evergreen/csfle/azurekms/secrets-export.sh
           tar czf testazurekms.tgz ./testkms ./install/libmongocrypt/lib64/libmongocrypt.*
           AZUREKMS_SRC=testazurekms.tgz AZUREKMS_DST=/tmp $DRIVERS_TOOLS/.evergreen/csfle/azurekms/copy-file.sh
           echo "Copying files ... end"
@@ -1808,7 +1808,7 @@ tasks:
         working_dir: src/go.mongodb.org/mongo-driver
         script: |
           ${PREPARE_SHELL}
-          source ${DRIVERS_TOOLS}/.evergreen/csfle/azurekms/setup-secrets.sh
+          source $DRIVERS_TOOLS/.evergreen/csfle/azurekms/secrets-export.sh
           AZUREKMS_CMD="LD_LIBRARY_PATH=./install/libmongocrypt/lib64 MONGODB_URI='mongodb://localhost:27017' PROVIDER='azure' AZUREKMS_KEY_NAME='${AZUREKMS_KEY_NAME}' AZUREKMS_KEY_VAULT_ENDPOINT='${AZUREKMS_KEY_VAULT_ENDPOINT}' ./testkms" $DRIVERS_TOOLS/.evergreen/csfle/azurekms/run-command.sh
 
   - name: "testazurekms-fail-task"

From 7a47abe5c055785447912ccf09f307d926364919 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 27 Aug 2024 16:51:43 -0500
Subject: [PATCH 05/10] try kms fix

---
 .evergreen/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 314e4b78c4..3cc3e264f0 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -141,7 +141,7 @@ functions:
         script: |
           ${PREPARE_SHELL}
           rm -rf $DRIVERS_TOOLS
-          git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
+          git clone --branch GODRIVER-3311 https://github.com/blink1073/drivers-evergreen-tools.git $DRIVERS_TOOLS
     - command: subprocess.exec
       params:
         binary: "bash"

From e70a3c9f8ef4bc7b594609137d59fa2bbf9b568a Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 27 Aug 2024 17:07:15 -0500
Subject: [PATCH 06/10] use setup-atlas-cluster

---
 .evergreen/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 3cc3e264f0..a57763b5ea 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -2287,7 +2287,7 @@ task_groups:
             MONGODB_VERSION: "7.0"
             LAMBDA_STACK_NAME: dbx-go-lambda
           args:
-            - ${DRIVERS_TOOLS}/.evergreen/atlas/setup.sh
+            - ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
       - command: expansions.update
         params:
           file: src/go.mongodb.org/mongo-driver/atlas-expansion.yml

From 48bbd3688ee51131d1d2ffceb40df7299704e383 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 27 Aug 2024 17:09:14 -0500
Subject: [PATCH 07/10] use setup

---
 .evergreen/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index a57763b5ea..3cc3e264f0 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -2287,7 +2287,7 @@ task_groups:
             MONGODB_VERSION: "7.0"
             LAMBDA_STACK_NAME: dbx-go-lambda
           args:
-            - ${DRIVERS_TOOLS}/.evergreen/atlas/setup-atlas-cluster.sh
+            - ${DRIVERS_TOOLS}/.evergreen/atlas/setup.sh
       - command: expansions.update
         params:
           file: src/go.mongodb.org/mongo-driver/atlas-expansion.yml

From cd0a4406a3f40ca7b8fa5a9a6c2deeaf91ab3032 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 27 Aug 2024 17:11:55 -0500
Subject: [PATCH 08/10] add pre-commit check

---
 .pre-commit-config.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 733618dead..ec2a89ef6e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -54,3 +54,11 @@ repos:
   rev: v1.59.1
   hooks:
   - id: golangci-lint
+
+- repo: local
+  hooks:
+  - id: executable-shell
+    name: executable-shell
+    entry: chmod +x
+    language: system
+    types: [shell]
\ No newline at end of file

From f8e6744d281fa97161a6099d3885f3a2307c44aa Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 27 Aug 2024 17:17:13 -0500
Subject: [PATCH 09/10] executable

---
 etc/gen-ec-certs/gen-ec-certs.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 etc/gen-ec-certs/gen-ec-certs.sh

diff --git a/etc/gen-ec-certs/gen-ec-certs.sh b/etc/gen-ec-certs/gen-ec-certs.sh
old mode 100644
new mode 100755

From 4364a9ebc2bb0f807e17f3b739a8dd856cf64213 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 27 Aug 2024 19:06:15 -0500
Subject: [PATCH 10/10] use upstream

---
 .evergreen/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 3cc3e264f0..314e4b78c4 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -141,7 +141,7 @@ functions:
         script: |
           ${PREPARE_SHELL}
           rm -rf $DRIVERS_TOOLS
-          git clone --branch GODRIVER-3311 https://github.com/blink1073/drivers-evergreen-tools.git $DRIVERS_TOOLS
+          git clone https://github.com/mongodb-labs/drivers-evergreen-tools.git $DRIVERS_TOOLS
     - command: subprocess.exec
       params:
         binary: "bash"