From 84c10708ab13a9f7a61dce1ae2813fff05f8782d Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 06:37:02 -0500
Subject: [PATCH 01/21] bootstrap hatch

---
 .evergreen/config.yml               |  4 +--
 .evergreen/hatch.sh                 | 47 +++++++++++++++++++++--------
 .evergreen/scripts/configure-env.sh |  2 +-
 3 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 14e3426b32..71af714cae 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -2079,6 +2079,8 @@ axes:
         display_name: "RHEL 7.x"
         run_on: rhel79-small
         batchtime: 10080  # 7 days
+        variables:
+          SKIP_HATCH: true
       - id: rhel8
         display_name: "RHEL 8.x"
         run_on: rhel8.8-small
@@ -2105,8 +2107,6 @@ axes:
         display_name: "RHEL 8 (POWER8)"
         run_on: rhel8-power-small
         batchtime: 10080  # 7 days
-        variables:
-          SKIP_HATCH: true
       - id: rhel8-arm64
         display_name: "RHEL 8 (ARM64)"
         run_on: rhel82-arm64-small
diff --git a/.evergreen/hatch.sh b/.evergreen/hatch.sh
index db0da2f4d0..c7dc213ab1 100644
--- a/.evergreen/hatch.sh
+++ b/.evergreen/hatch.sh
@@ -8,6 +8,39 @@ if [ -z "$PYTHON_BINARY" ]; then
     PYTHON_BINARY=$(find_python3)
 fi
 
+# Bootstrap hatch if needed.
+if [ -z "$SKIP_HATCH" ] && [ ! command -v hatch &> /dev/null]; then
+  platform="$(uname -s)-$(uname -m)"
+  case $platform in
+    Linux-x86_64)
+      target=x86_64-unknown-linux-gnu
+      ;;
+    Linux-aarch64)
+      target=aarch64-unknown-linux-gnu
+      ;;
+    Linux-ppc64le)
+      target=powerpc64le-unknown-linux-gnu
+      ;;
+    CYGWIN_NT*)
+      target=x86_64-pc-windows-msvc
+      ;;
+    Darwin-x86_64)
+      target=x86_64-apple-darwin
+      ;;
+    Darwin-arm64)
+      target=aarch64-apple-darwin
+      ;;
+    *)
+      echo "Unsupported platform: $platform"
+      exit 1
+      ;;
+  esac
+  curl -L -o hatch.tgz https://github.com/pypa/hatch/releases/download/hatch-v1.12.0/hatch-$target.tar.gz
+  tar xfz hatch.tar.gz
+  mv hatch .bin
+  rm hatch.tar.gz
+fi
+
 # Check if we should skip hatch and run the tests directly.
 if [ -n "$SKIP_HATCH" ]; then
     ENV_NAME=testenv-$RANDOM
@@ -18,19 +51,9 @@ if [ -n "$SKIP_HATCH" ]; then
     run_hatch() {
       bash ./.evergreen/run-tests.sh
     }
-elif $PYTHON_BINARY -m hatch --version; then
-    run_hatch() {
-      $PYTHON_BINARY -m hatch run "$@"
-    }
-else # No toolchain hatch present, set up virtualenv before installing hatch
-    # Use a random venv name because the encryption tasks run this script multiple times in the same run.
-    ENV_NAME=hatchenv-$RANDOM
-    createvirtualenv "$PYTHON_BINARY" $ENV_NAME
-    # shellcheck disable=SC2064
-    trap "deactivate; rm -rf $ENV_NAME" EXIT HUP
-    python -m pip install -q hatch
+else
     run_hatch() {
-      python -m hatch run "$@"
+      HATCH_PYTHON="$PYTHON_BINARY" hatch run "$@"
     }
 fi
 
diff --git a/.evergreen/scripts/configure-env.sh b/.evergreen/scripts/configure-env.sh
index 0c9c8bb03a..6c81d36c65 100644
--- a/.evergreen/scripts/configure-env.sh
+++ b/.evergreen/scripts/configure-env.sh
@@ -40,7 +40,7 @@ export MONGODB_BINARIES="$MONGODB_BINARIES"
 export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
 
 export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
-export PATH="$MONGODB_BINARIES:$PATH"
+export PATH="$PROJECT_DIRECTORY/bin:$MONGODB_BINARIES:$PATH"
 # shellcheck disable=SC2154
 export PROJECT="$project"
 export PIP_QUIET=1

From f30aa1c8cd19d94a118124947a1bda5917151ce8 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 06:45:56 -0500
Subject: [PATCH 02/21] fix bootstrap

---
 .evergreen/hatch.sh | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/.evergreen/hatch.sh b/.evergreen/hatch.sh
index c7dc213ab1..8124ee259c 100644
--- a/.evergreen/hatch.sh
+++ b/.evergreen/hatch.sh
@@ -8,8 +8,19 @@ if [ -z "$PYTHON_BINARY" ]; then
     PYTHON_BINARY=$(find_python3)
 fi
 
+# Check if we should skip hatch and run the tests directly.
+if [ -n "$SKIP_HATCH" ]; then
+    ENV_NAME=testenv-$RANDOM
+    createvirtualenv "$PYTHON_BINARY" $ENV_NAME
+    # shellcheck disable=SC2064
+    trap "deactivate; rm -rf $ENV_NAME" EXIT HUP
+    python -m pip install -e ".[test]"
+    bash ./.evergreen/run-tests.sh
+    exit 0
+fi
+
 # Bootstrap hatch if needed.
-if [ -z "$SKIP_HATCH" ] && [ ! command -v hatch &> /dev/null]; then
+if ! command -v hatch > /dev/null ; then
   platform="$(uname -s)-$(uname -m)"
   case $platform in
     Linux-x86_64)
@@ -41,20 +52,4 @@ if [ -z "$SKIP_HATCH" ] && [ ! command -v hatch &> /dev/null]; then
   rm hatch.tar.gz
 fi
 
-# Check if we should skip hatch and run the tests directly.
-if [ -n "$SKIP_HATCH" ]; then
-    ENV_NAME=testenv-$RANDOM
-    createvirtualenv "$PYTHON_BINARY" $ENV_NAME
-    # shellcheck disable=SC2064
-    trap "deactivate; rm -rf $ENV_NAME" EXIT HUP
-    python -m pip install -e ".[test]"
-    run_hatch() {
-      bash ./.evergreen/run-tests.sh
-    }
-else
-    run_hatch() {
-      HATCH_PYTHON="$PYTHON_BINARY" hatch run "$@"
-    }
-fi
-
-run_hatch "${@:1}"
+HATCH_PYTHON="$PYTHON_BINARY" hatch run "$@"

From e77e1be731ede02379df9a99abf8e8a97e955353 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 07:34:22 -0500
Subject: [PATCH 03/21] fix bootstrap

---
 .evergreen/hatch.sh | 4 ++--
 .gitignore          | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.evergreen/hatch.sh b/.evergreen/hatch.sh
index 8124ee259c..3ce01989ac 100644
--- a/.evergreen/hatch.sh
+++ b/.evergreen/hatch.sh
@@ -47,9 +47,9 @@ if ! command -v hatch > /dev/null ; then
       ;;
   esac
   curl -L -o hatch.tgz https://github.com/pypa/hatch/releases/download/hatch-v1.12.0/hatch-$target.tar.gz
-  tar xfz hatch.tar.gz
+  tar xfz  hatch.tgz
   mv hatch .bin
-  rm hatch.tar.gz
+  rm  hatch.tgz
 fi
 
 HATCH_PYTHON="$PYTHON_BINARY" hatch run "$@"
diff --git a/.gitignore b/.gitignore
index 69dd20efa3..635c0f92bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ mongocryptd.pid
 .vscode/
 .nova/
 venv/
+.bin
 secrets-export.sh
 libmongocrypt.tar.gz
 libmongocrypt/

From 61a40b371afc0e4410f65d5004e3288c2d9dc831 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 07:43:53 -0500
Subject: [PATCH 04/21] fix bootstrap

---
 .evergreen/hatch.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.evergreen/hatch.sh b/.evergreen/hatch.sh
index 3ce01989ac..a0f4bbace0 100644
--- a/.evergreen/hatch.sh
+++ b/.evergreen/hatch.sh
@@ -2,6 +2,8 @@
 set -o errexit  # Exit the script with error if any of the commands fail
 set -x
 
+source .evergreen/scripts/env.sh
+
 . .evergreen/utils.sh
 
 if [ -z "$PYTHON_BINARY" ]; then

From e19080fd0ada1a3403415a555ec637f0a37ed829 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 08:04:02 -0500
Subject: [PATCH 05/21] fix bootstrap

---
 .evergreen/scripts/configure-env.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen/scripts/configure-env.sh b/.evergreen/scripts/configure-env.sh
index 6c81d36c65..45190260d8 100644
--- a/.evergreen/scripts/configure-env.sh
+++ b/.evergreen/scripts/configure-env.sh
@@ -40,7 +40,7 @@ export MONGODB_BINARIES="$MONGODB_BINARIES"
 export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
 
 export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
-export PATH="$PROJECT_DIRECTORY/bin:$MONGODB_BINARIES:$PATH"
+export PATH="$PROJECT_DIRECTORY/.bin:$MONGODB_BINARIES:$PATH"
 # shellcheck disable=SC2154
 export PROJECT="$project"
 export PIP_QUIET=1

From d9b78c5efb2f23736dfb5acfc22293d5b07474e3 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 08:10:22 -0500
Subject: [PATCH 06/21] fix bootstrap

---
 .evergreen/hatch.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.evergreen/hatch.sh b/.evergreen/hatch.sh
index a0f4bbace0..e8f92d3a3e 100644
--- a/.evergreen/hatch.sh
+++ b/.evergreen/hatch.sh
@@ -49,9 +49,11 @@ if ! command -v hatch > /dev/null ; then
       ;;
   esac
   curl -L -o hatch.tgz https://github.com/pypa/hatch/releases/download/hatch-v1.12.0/hatch-$target.tar.gz
-  tar xfz  hatch.tgz
-  mv hatch .bin
-  rm  hatch.tgz
+  tar xfz hatch.tgz
+  rm hatch.tgz
+  mkdir -p .bin
+  mv hatch .bin/
+  hatch --version
 fi
 
 HATCH_PYTHON="$PYTHON_BINARY" hatch run "$@"

From ecd2be9a4b75a61858b30a74070a301bd615cd90 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 08:22:57 -0500
Subject: [PATCH 07/21] skip power8 for now

---
 .evergreen/config.yml | 2 ++
 .evergreen/hatch.sh   | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 71af714cae..9ced2a17cc 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -2107,6 +2107,8 @@ axes:
         display_name: "RHEL 8 (POWER8)"
         run_on: rhel8-power-small
         batchtime: 10080  # 7 days
+        variables:
+          SKIP_HATCH: true
       - id: rhel8-arm64
         display_name: "RHEL 8 (ARM64)"
         run_on: rhel82-arm64-small
diff --git a/.evergreen/hatch.sh b/.evergreen/hatch.sh
index e8f92d3a3e..1a8c311785 100644
--- a/.evergreen/hatch.sh
+++ b/.evergreen/hatch.sh
@@ -31,9 +31,6 @@ if ! command -v hatch > /dev/null ; then
     Linux-aarch64)
       target=aarch64-unknown-linux-gnu
       ;;
-    Linux-ppc64le)
-      target=powerpc64le-unknown-linux-gnu
-      ;;
     CYGWIN_NT*)
       target=x86_64-pc-windows-msvc
       ;;

From 3f2e5c980d1139fbd962809dac3938b75642a0c8 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 09:58:53 -0500
Subject: [PATCH 08/21] fix windows

---
 .evergreen/hatch.sh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/.evergreen/hatch.sh b/.evergreen/hatch.sh
index 1a8c311785..763a7a67de 100644
--- a/.evergreen/hatch.sh
+++ b/.evergreen/hatch.sh
@@ -26,28 +26,33 @@ if ! command -v hatch > /dev/null ; then
   platform="$(uname -s)-$(uname -m)"
   case $platform in
     Linux-x86_64)
-      target=x86_64-unknown-linux-gnu
+      target=x86_64-unknown-linux-gnu.tar.gz
       ;;
     Linux-aarch64)
-      target=aarch64-unknown-linux-gnu
+      target=aarch64-unknown-linux-gnu.tar.gz
       ;;
     CYGWIN_NT*)
-      target=x86_64-pc-windows-msvc
+      target=x86_64-pc-windows-msvc.zip
       ;;
     Darwin-x86_64)
-      target=x86_64-apple-darwin
+      target=x86_64-apple-darwin.tar.gz
       ;;
     Darwin-arm64)
-      target=aarch64-apple-darwin
+      target=aarch64-apple-darwin.tar.gz
       ;;
     *)
       echo "Unsupported platform: $platform"
       exit 1
       ;;
   esac
-  curl -L -o hatch.tgz https://github.com/pypa/hatch/releases/download/hatch-v1.12.0/hatch-$target.tar.gz
-  tar xfz hatch.tgz
-  rm hatch.tgz
+  curl -L -o hatch.tgz https://github.com/pypa/hatch/releases/download/hatch-v1.12.0/hatch-$target
+  if [ "${OS:-}" == "Windows_NT" ]; then
+    unzip hatch.zip
+    rm hatch.zip
+  else
+    tar xfz hatch.tgz
+    rm hatch.tgz
+  fi
   mkdir -p .bin
   mv hatch .bin/
   hatch --version

From feebc056b833d57d66c3c6e290a5f8b71d376d49 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 10:28:35 -0500
Subject: [PATCH 09/21] fixup

---
 .evergreen/hatch.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.evergreen/hatch.sh b/.evergreen/hatch.sh
index 763a7a67de..41b767dd52 100644
--- a/.evergreen/hatch.sh
+++ b/.evergreen/hatch.sh
@@ -45,14 +45,13 @@ if ! command -v hatch > /dev/null ; then
       exit 1
       ;;
   esac
-  curl -L -o hatch.tgz https://github.com/pypa/hatch/releases/download/hatch-v1.12.0/hatch-$target
+  curl -L -o hatch.bin https://github.com/pypa/hatch/releases/download/hatch-v1.12.0/hatch-$target
   if [ "${OS:-}" == "Windows_NT" ]; then
-    unzip hatch.zip
-    rm hatch.zip
+    unzip hatch.bin
   else
-    tar xfz hatch.tgz
-    rm hatch.tgz
+    tar xfz hatch.bin
   fi
+  rm hatch.bin
   mkdir -p .bin
   mv hatch .bin/
   hatch --version

From aeba1b0ab7ff0626425c8a59c896b6785c2945bb Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 11:02:33 -0500
Subject: [PATCH 10/21] fixup

---
 .evergreen/hatch.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.evergreen/hatch.sh b/.evergreen/hatch.sh
index 41b767dd52..1cbc7d7803 100644
--- a/.evergreen/hatch.sh
+++ b/.evergreen/hatch.sh
@@ -46,14 +46,15 @@ if ! command -v hatch > /dev/null ; then
       ;;
   esac
   curl -L -o hatch.bin https://github.com/pypa/hatch/releases/download/hatch-v1.12.0/hatch-$target
+  mkdir -p .bin
   if [ "${OS:-}" == "Windows_NT" ]; then
     unzip hatch.bin
+    mv hatch.exe .bin
   else
     tar xfz hatch.bin
+    mv hatch .bin
   fi
   rm hatch.bin
-  mkdir -p .bin
-  mv hatch .bin/
   hatch --version
 fi
 

From c2c559442227399b6cb7de63c24d9faaebf36451 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 11:29:44 -0500
Subject: [PATCH 11/21] debug

---
 .evergreen/hatch.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.evergreen/hatch.sh b/.evergreen/hatch.sh
index 1cbc7d7803..6bc2180cd7 100644
--- a/.evergreen/hatch.sh
+++ b/.evergreen/hatch.sh
@@ -55,6 +55,8 @@ if ! command -v hatch > /dev/null ; then
     mv hatch .bin
   fi
   rm hatch.bin
+  ls .bin
+  echo $PATH
   hatch --version
 fi
 

From 7257bd2b1ca2c120ea746f8e25b26d07e3137544 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 11:49:41 -0500
Subject: [PATCH 12/21] try again

---
 .evergreen/scripts/configure-env.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.evergreen/scripts/configure-env.sh b/.evergreen/scripts/configure-env.sh
index 45190260d8..d3fbb3a6b9 100644
--- a/.evergreen/scripts/configure-env.sh
+++ b/.evergreen/scripts/configure-env.sh
@@ -11,11 +11,13 @@ fi
 
 PROJECT_DIRECTORY="$(pwd)"
 DRIVERS_TOOLS="$(dirname $PROJECT_DIRECTORY)/drivers-tools"
+BIN_DIR="$PROJECT_DIRECTORY/.bin"
 
 # Python has cygwin path problems on Windows. Detect prospective mongo-orchestration home directory
 if [ "Windows_NT" = "$OS" ]; then # Magic variable in cygwin
     DRIVERS_TOOLS=$(cygpath -m $DRIVERS_TOOLS)
     PROJECT_DIRECTORY=$(cygpath -m $PROJECT_DIRECTORY)
+    BIN_DIR=$(cygpath -m $BIN_DIR)
 fi
 
 SCRIPT_DIR="$PROJECT_DIRECTORY/.evergreen/scripts"
@@ -38,9 +40,8 @@ export DRIVERS_TOOLS="$DRIVERS_TOOLS"
 export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
 export MONGODB_BINARIES="$MONGODB_BINARIES"
 export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
-
 export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
-export PATH="$PROJECT_DIRECTORY/.bin:$MONGODB_BINARIES:$PATH"
+export PATH="$BIN_DIR:$MONGODB_BINARIES:$PATH"
 # shellcheck disable=SC2154
 export PROJECT="$project"
 export PIP_QUIET=1

From dbc3fcebadab8b48a3b1facdd08fc22a7e4e5497 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 11:51:39 -0500
Subject: [PATCH 13/21] try not skipping on windows

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

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 9ced2a17cc..c017523619 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -2121,7 +2121,7 @@ axes:
         variables:
           skip_ECS_auth_test: true
           skip_EC2_auth_test: true
-          skip_web_identity_auth_test: true
+          # skip_web_identity_auth_test: true
           venv_bin_dir: "Scripts"
           # CSOT tests are unreliable on our slow Windows hosts.
           SKIP_CSOT_TESTS: true

From 96d4a63856dd6d423b4dd8024ca5bd2a5794ca8e Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 12:55:11 -0500
Subject: [PATCH 14/21] try again

---
 .evergreen/hatch.sh                 | 14 +++++++++-----
 .evergreen/scripts/configure-env.sh |  4 +---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.evergreen/hatch.sh b/.evergreen/hatch.sh
index 6bc2180cd7..09ec4e7689 100644
--- a/.evergreen/hatch.sh
+++ b/.evergreen/hatch.sh
@@ -22,7 +22,7 @@ if [ -n "$SKIP_HATCH" ]; then
 fi
 
 # Bootstrap hatch if needed.
-if ! command -v hatch > /dev/null ; then
+if [ ! -f .bin/hatch ] && [ ! -f .bin/hatch.exe ] ; then
   platform="$(uname -s)-$(uname -m)"
   case $platform in
     Linux-x86_64)
@@ -50,14 +50,18 @@ if ! command -v hatch > /dev/null ; then
   if [ "${OS:-}" == "Windows_NT" ]; then
     unzip hatch.bin
     mv hatch.exe .bin
+    .bin/hatch.exe --version
   else
     tar xfz hatch.bin
     mv hatch .bin
+    .bin/hatch --version
   fi
   rm hatch.bin
-  ls .bin
-  echo $PATH
-  hatch --version
 fi
 
-HATCH_PYTHON="$PYTHON_BINARY" hatch run "$@"
+if [ "${OS:-}" == "Windows_NT" ]; then
+  HATCH=".bin/hatch.exe"
+else
+  HATCH="./bin/hatch"
+first
+HATCH_PYTHON="$PYTHON_BINARY" $HATCH run "$@"
diff --git a/.evergreen/scripts/configure-env.sh b/.evergreen/scripts/configure-env.sh
index d3fbb3a6b9..5e828f4622 100644
--- a/.evergreen/scripts/configure-env.sh
+++ b/.evergreen/scripts/configure-env.sh
@@ -11,13 +11,11 @@ fi
 
 PROJECT_DIRECTORY="$(pwd)"
 DRIVERS_TOOLS="$(dirname $PROJECT_DIRECTORY)/drivers-tools"
-BIN_DIR="$PROJECT_DIRECTORY/.bin"
 
 # Python has cygwin path problems on Windows. Detect prospective mongo-orchestration home directory
 if [ "Windows_NT" = "$OS" ]; then # Magic variable in cygwin
     DRIVERS_TOOLS=$(cygpath -m $DRIVERS_TOOLS)
     PROJECT_DIRECTORY=$(cygpath -m $PROJECT_DIRECTORY)
-    BIN_DIR=$(cygpath -m $BIN_DIR)
 fi
 
 SCRIPT_DIR="$PROJECT_DIRECTORY/.evergreen/scripts"
@@ -41,7 +39,7 @@ export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
 export MONGODB_BINARIES="$MONGODB_BINARIES"
 export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
 export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
-export PATH="$BIN_DIR:$MONGODB_BINARIES:$PATH"
+export PATH="$MONGODB_BINARIES:$PATH"
 # shellcheck disable=SC2154
 export PROJECT="$project"
 export PIP_QUIET=1

From 55a0d6423888f23d4678bc0c2f0919094dc93498 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 14:02:25 -0500
Subject: [PATCH 15/21] syntax

---
 .evergreen/hatch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen/hatch.sh b/.evergreen/hatch.sh
index 09ec4e7689..eee2dc3231 100644
--- a/.evergreen/hatch.sh
+++ b/.evergreen/hatch.sh
@@ -63,5 +63,5 @@ if [ "${OS:-}" == "Windows_NT" ]; then
   HATCH=".bin/hatch.exe"
 else
   HATCH="./bin/hatch"
-first
+fi
 HATCH_PYTHON="$PYTHON_BINARY" $HATCH run "$@"

From f2f61300b48b005dcfa5309ef3643a4623353eeb Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 14:09:30 -0500
Subject: [PATCH 16/21] try again

---
 .evergreen/hatch.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.evergreen/hatch.sh b/.evergreen/hatch.sh
index eee2dc3231..05e2e067c8 100644
--- a/.evergreen/hatch.sh
+++ b/.evergreen/hatch.sh
@@ -59,9 +59,9 @@ if [ ! -f .bin/hatch ] && [ ! -f .bin/hatch.exe ] ; then
   rm hatch.bin
 fi
 
+export HATCH_PYTHON="$PYTHON_BINARY"
 if [ "${OS:-}" == "Windows_NT" ]; then
-  HATCH=".bin/hatch.exe"
+  .bin/hatch.exe run "$@"
 else
-  HATCH="./bin/hatch"
+  ./bin/hatch" run "$@"
 fi
-HATCH_PYTHON="$PYTHON_BINARY" $HATCH run "$@"

From 5c4c46ac635fc4a78bb200357acde1070adb9db4 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 14:11:31 -0500
Subject: [PATCH 17/21] syntax

---
 .evergreen/hatch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen/hatch.sh b/.evergreen/hatch.sh
index 05e2e067c8..5d66ff2f39 100644
--- a/.evergreen/hatch.sh
+++ b/.evergreen/hatch.sh
@@ -63,5 +63,5 @@ export HATCH_PYTHON="$PYTHON_BINARY"
 if [ "${OS:-}" == "Windows_NT" ]; then
   .bin/hatch.exe run "$@"
 else
-  ./bin/hatch" run "$@"
+  ./bin/hatch run "$@"
 fi

From 2487530df21aa2dfc676360341bafe2d4592b576 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 14:14:34 -0500
Subject: [PATCH 18/21] rhel fix

---
 .evergreen/hatch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.evergreen/hatch.sh b/.evergreen/hatch.sh
index 5d66ff2f39..9b1948daaa 100644
--- a/.evergreen/hatch.sh
+++ b/.evergreen/hatch.sh
@@ -63,5 +63,5 @@ export HATCH_PYTHON="$PYTHON_BINARY"
 if [ "${OS:-}" == "Windows_NT" ]; then
   .bin/hatch.exe run "$@"
 else
-  ./bin/hatch run "$@"
+  .bin/hatch run "$@"
 fi

From e14da54609eebf330c4c7cc2773a3c656b17d012 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 14:52:30 -0500
Subject: [PATCH 19/21] make it executable

---
 .evergreen/hatch.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.evergreen/hatch.sh b/.evergreen/hatch.sh
index 9b1948daaa..57ae45308f 100644
--- a/.evergreen/hatch.sh
+++ b/.evergreen/hatch.sh
@@ -50,6 +50,7 @@ if [ ! -f .bin/hatch ] && [ ! -f .bin/hatch.exe ] ; then
   if [ "${OS:-}" == "Windows_NT" ]; then
     unzip hatch.bin
     mv hatch.exe .bin
+    chmod +x .bin/hatch.exe
     .bin/hatch.exe --version
   else
     tar xfz hatch.bin

From 7dd26ae310df52d06f13ae69a87192fd1c6864ff Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 16:52:41 -0500
Subject: [PATCH 20/21] undo change

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

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index c017523619..9ced2a17cc 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -2121,7 +2121,7 @@ axes:
         variables:
           skip_ECS_auth_test: true
           skip_EC2_auth_test: true
-          # skip_web_identity_auth_test: true
+          skip_web_identity_auth_test: true
           venv_bin_dir: "Scripts"
           # CSOT tests are unreliable on our slow Windows hosts.
           SKIP_CSOT_TESTS: true

From 2d54789da3a58bfbcd7bdfaa207aea13aa375cbe Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Fri, 20 Sep 2024 16:53:33 -0500
Subject: [PATCH 21/21] undo change

---
 .evergreen/scripts/configure-env.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.evergreen/scripts/configure-env.sh b/.evergreen/scripts/configure-env.sh
index 5e828f4622..0c9c8bb03a 100644
--- a/.evergreen/scripts/configure-env.sh
+++ b/.evergreen/scripts/configure-env.sh
@@ -38,6 +38,7 @@ export DRIVERS_TOOLS="$DRIVERS_TOOLS"
 export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
 export MONGODB_BINARIES="$MONGODB_BINARIES"
 export PROJECT_DIRECTORY="$PROJECT_DIRECTORY"
+
 export TMPDIR="$MONGO_ORCHESTRATION_HOME/db"
 export PATH="$MONGODB_BINARIES:$PATH"
 # shellcheck disable=SC2154