From 8d9cf9a2f139ba907a93d8171a0d4e6b9274e47a Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 11:23:29 -0600
Subject: [PATCH 01/17] DRIVERS-3032 Write uri.txt

---
 .evergreen/orchestration/drivers_orchestration.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.evergreen/orchestration/drivers_orchestration.py b/.evergreen/orchestration/drivers_orchestration.py
index b9ba6ef0..c14a0701 100644
--- a/.evergreen/orchestration/drivers_orchestration.py
+++ b/.evergreen/orchestration/drivers_orchestration.py
@@ -177,6 +177,7 @@ def run(opts):
     expansion_yaml.unlink(missing_ok=True)
     expansion_sh = Path("mo-expansion.sh")
     expansion_sh.unlink(missing_ok=True)
+    uri_txt = DRIVERS_TOOLS / "uri.txt"
 
     # The evergreen directory to path.
     os.environ["PATH"] = f"{EVG_PATH}:{os.environ['PATH']}"
@@ -297,6 +298,7 @@ def run(opts):
     # Handle the cluster uri.
     uri = resp.get("mongodb_auth_uri", resp["mongodb_uri"])
     expansion_yaml.write_text(expansion_yaml.read_text() + f"\nMONGODB_URI: {uri}")
+    uri_txt.write_text(uri)
     LOGGER.info(f"Cluster URI: {uri}")
 
     # Write the results file.

From f0517aeccc397b051f57f55d56b9d05687bde501 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 12:44:42 -0600
Subject: [PATCH 02/17] test github action

---
 .github/workflows/tests.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index eb74039c..1da1eb14 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -41,7 +41,7 @@ jobs:
           fetch-depth: 2
 
       - id: setup-mongodb
-        name: "Test GitHub Action"
+        name: "Run GitHub Action"
         uses: ./
         with:
           version: ${{ matrix.mongodb-version }}
@@ -49,6 +49,12 @@ jobs:
           auth: ${{ matrix.auth }}
           ssl: ${{ matrix.ssl }}
 
+      - id: test-mongodb
+        name: "Test GitHub Action"
+        run: |
+          pwd
+          ls
+
   pre-commit:
     runs-on: ubuntu-latest
     steps:

From 4319071600ad7484828d3ca601720cedd968c7f2 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 12:47:14 -0600
Subject: [PATCH 03/17] run a ping

---
 .github/workflows/tests.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1da1eb14..e9b9da89 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -52,8 +52,7 @@ jobs:
       - id: test-mongodb
         name: "Test GitHub Action"
         run: |
-          pwd
-          ls
+          mongodb/bin/mongodb://127.0.0.1:27017/?directConnection=true --eval "db.runCommand({ ping: 1 })"
 
   pre-commit:
     runs-on: ubuntu-latest

From 020a1f72435f338e817c997b1b10b64526b28408 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 12:48:43 -0600
Subject: [PATCH 04/17] fix invocation

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e9b9da89..9aede01a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -52,7 +52,7 @@ jobs:
       - id: test-mongodb
         name: "Test GitHub Action"
         run: |
-          mongodb/bin/mongodb://127.0.0.1:27017/?directConnection=true --eval "db.runCommand({ ping: 1 })"
+          mongodb/bin/mongosh mongodb://127.0.0.1:27017/?directConnection=true --eval "db.runCommand({ ping: 1 })"
 
   pre-commit:
     runs-on: ubuntu-latest

From 5e6c7d6ec410a9183b23d7591620e0966a422868 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 13:04:35 -0600
Subject: [PATCH 05/17] make bin executable

---
 .github/workflows/tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9aede01a..0f4e19f2 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -52,6 +52,7 @@ jobs:
       - id: test-mongodb
         name: "Test GitHub Action"
         run: |
+          chmod +x mongodb/bin/mongosh
           mongodb/bin/mongosh mongodb://127.0.0.1:27017/?directConnection=true --eval "db.runCommand({ ping: 1 })"
 
   pre-commit:

From bad3e5e18b7ed42794d780038dfa39e0555e37de Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 13:06:17 -0600
Subject: [PATCH 06/17] add ssl

---
 .github/workflows/tests.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0f4e19f2..fbca6c3b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -53,7 +53,11 @@ jobs:
         name: "Test GitHub Action"
         run: |
           chmod +x mongodb/bin/mongosh
-          mongodb/bin/mongosh mongodb://127.0.0.1:27017/?directConnection=true --eval "db.runCommand({ ping: 1 })"
+          args=""
+          if [ ${{ matrix.ssl }} == "ssl" ]; then
+            args="--tls"
+          fi
+          mongodb/bin/mongosh mongodb://127.0.0.1:27017/?directConnection=true $args --eval "db.runCommand({ ping: 1 })"
 
   pre-commit:
     runs-on: ubuntu-latest

From 2a1dcfe99986746a220851716f510f32fd566776 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 13:08:32 -0600
Subject: [PATCH 07/17] use cert file

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fbca6c3b..016d64d1 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -55,7 +55,7 @@ jobs:
           chmod +x mongodb/bin/mongosh
           args=""
           if [ ${{ matrix.ssl }} == "ssl" ]; then
-            args="--tls"
+            args="--tls --tlsCertificateKeyFile $(pwd)/.evergreen/x509gen/client.pem"
           fi
           mongodb/bin/mongosh mongodb://127.0.0.1:27017/?directConnection=true $args --eval "db.runCommand({ ping: 1 })"
 

From 35079d30d372eb70833dae68070f3bdd98370b20 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 13:16:24 -0600
Subject: [PATCH 08/17] use ca file

---
 .github/workflows/tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 016d64d1..77d649ad 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -53,9 +53,10 @@ jobs:
         name: "Test GitHub Action"
         run: |
           chmod +x mongodb/bin/mongosh
+          URI=$(cat )
           args=""
           if [ ${{ matrix.ssl }} == "ssl" ]; then
-            args="--tls --tlsCertificateKeyFile $(pwd)/.evergreen/x509gen/client.pem"
+            args="--tls --tlsCertificateKeyFile $(pwd)/.evergreen/x509gen/client.pem --tlsCAFile $(pwd)/.evergreen/x5095gen/ca.pem"
           fi
           mongodb/bin/mongosh mongodb://127.0.0.1:27017/?directConnection=true $args --eval "db.runCommand({ ping: 1 })"
 

From 399282c8217083a2f79fb3c7b4e6ea5d4a9ceef3 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 13:17:54 -0600
Subject: [PATCH 09/17] fix ca file

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 77d649ad..f0662d20 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -56,7 +56,7 @@ jobs:
           URI=$(cat )
           args=""
           if [ ${{ matrix.ssl }} == "ssl" ]; then
-            args="--tls --tlsCertificateKeyFile $(pwd)/.evergreen/x509gen/client.pem --tlsCAFile $(pwd)/.evergreen/x5095gen/ca.pem"
+            args="--tls --tlsCertificateKeyFile $(pwd)/.evergreen/x509gen/client.pem --tlsCAFile $(pwd)/.evergreen/x509gen/ca.pem"
           fi
           mongodb/bin/mongosh mongodb://127.0.0.1:27017/?directConnection=true $args --eval "db.runCommand({ ping: 1 })"
 

From b4830e1721d8a8fe4395c069001a62170e80616f Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 13:18:24 -0600
Subject: [PATCH 10/17] use the uri.txt file

---
 .github/workflows/tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f0662d20..07f6b210 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -53,12 +53,12 @@ jobs:
         name: "Test GitHub Action"
         run: |
           chmod +x mongodb/bin/mongosh
-          URI=$(cat )
+          URI=$(cat uri.txt)
           args=""
           if [ ${{ matrix.ssl }} == "ssl" ]; then
             args="--tls --tlsCertificateKeyFile $(pwd)/.evergreen/x509gen/client.pem --tlsCAFile $(pwd)/.evergreen/x509gen/ca.pem"
           fi
-          mongodb/bin/mongosh mongodb://127.0.0.1:27017/?directConnection=true $args --eval "db.runCommand({ ping: 1 })"
+          mongodb/bin/mongosh ${URI}/?directConnection=true $args --eval "db.runCommand({ ping: 1 })"
 
   pre-commit:
     runs-on: ubuntu-latest

From 7139f5dabf8acfe861f6143fa76936f3877ed317 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 13:20:35 -0600
Subject: [PATCH 11/17] debug

---
 .github/workflows/tests.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 07f6b210..50dfb376 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -52,13 +52,15 @@ jobs:
       - id: test-mongodb
         name: "Test GitHub Action"
         run: |
+          cat uri.txt
+          exit 1
           chmod +x mongodb/bin/mongosh
           URI=$(cat uri.txt)
-          args=""
+          ARGS=""
           if [ ${{ matrix.ssl }} == "ssl" ]; then
-            args="--tls --tlsCertificateKeyFile $(pwd)/.evergreen/x509gen/client.pem --tlsCAFile $(pwd)/.evergreen/x509gen/ca.pem"
+            ARGS="--tls --tlsCertificateKeyFile $(pwd)/.evergreen/x509gen/client.pem --tlsCAFile $(pwd)/.evergreen/x509gen/ca.pem"
           fi
-          mongodb/bin/mongosh ${URI}/?directConnection=true $args --eval "db.runCommand({ ping: 1 })"
+          mongodb/bin/mongosh ${URI}/?directConnection=true $ARGS --eval "db.runCommand({ ping: 1 })"
 
   pre-commit:
     runs-on: ubuntu-latest

From bdce404dcf1626481cd54beaad82e642a1db230f Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 13:22:22 -0600
Subject: [PATCH 12/17] debug

---
 .github/workflows/tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 50dfb376..5824b5de 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -52,10 +52,10 @@ jobs:
       - id: test-mongodb
         name: "Test GitHub Action"
         run: |
-          cat uri.txt
-          exit 1
           chmod +x mongodb/bin/mongosh
           URI=$(cat uri.txt)
+          echo "URI: ${URI}"
+          exit 1
           ARGS=""
           if [ ${{ matrix.ssl }} == "ssl" ]; then
             ARGS="--tls --tlsCertificateKeyFile $(pwd)/.evergreen/x509gen/client.pem --tlsCAFile $(pwd)/.evergreen/x509gen/ca.pem"

From 6359c4725d2c845058b69f7599fcb28fc5179967 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 13:25:40 -0600
Subject: [PATCH 13/17] handle auth

---
 .github/workflows/tests.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5824b5de..36ba04c0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -54,13 +54,16 @@ jobs:
         run: |
           chmod +x mongodb/bin/mongosh
           URI=$(cat uri.txt)
-          echo "URI: ${URI}"
-          exit 1
+          if [ ${{ matrix.auth }} == "auth"]; then
+            URI="${URI}&directConnection=true"
+          else
+            URI="${URI}/?directConnection=true"
+          fi
           ARGS=""
           if [ ${{ matrix.ssl }} == "ssl" ]; then
             ARGS="--tls --tlsCertificateKeyFile $(pwd)/.evergreen/x509gen/client.pem --tlsCAFile $(pwd)/.evergreen/x509gen/ca.pem"
           fi
-          mongodb/bin/mongosh ${URI}/?directConnection=true $ARGS --eval "db.runCommand({ ping: 1 })"
+          mongodb/bin/mongosh $URI $ARGS --eval "db.runCommand({ ping: 1 })"
 
   pre-commit:
     runs-on: ubuntu-latest

From b567486e64b612f2a8b41d97239cf59d8a8ece5f Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 13:27:01 -0600
Subject: [PATCH 14/17] fix syntax

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 36ba04c0..be6f91e6 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -54,7 +54,7 @@ jobs:
         run: |
           chmod +x mongodb/bin/mongosh
           URI=$(cat uri.txt)
-          if [ ${{ matrix.auth }} == "auth"]; then
+          if [ ${{ matrix.auth }} == "auth" ]; then
             URI="${URI}&directConnection=true"
           else
             URI="${URI}/?directConnection=true"

From 4f48b5955470ac6d4c140fbfeb2797ee6f03bb71 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 13:28:52 -0600
Subject: [PATCH 15/17] use uri directly

---
 .github/workflows/tests.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index be6f91e6..cbd99495 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -54,11 +54,6 @@ jobs:
         run: |
           chmod +x mongodb/bin/mongosh
           URI=$(cat uri.txt)
-          if [ ${{ matrix.auth }} == "auth" ]; then
-            URI="${URI}&directConnection=true"
-          else
-            URI="${URI}/?directConnection=true"
-          fi
           ARGS=""
           if [ ${{ matrix.ssl }} == "ssl" ]; then
             ARGS="--tls --tlsCertificateKeyFile $(pwd)/.evergreen/x509gen/client.pem --tlsCAFile $(pwd)/.evergreen/x509gen/ca.pem"

From 0abc008dc2d60c61c462296944b0c32f6e7d9100 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 13:29:31 -0600
Subject: [PATCH 16/17] add skips

---
 .github/workflows/tests.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index cbd99495..7eb51805 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,6 +8,10 @@ on:
     branches:
       - "master"
 
+concurrency:
+  group: tests-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   tests:
     name: "Tests"

From ade671bcae0b8a16de451fca386987cd5b410db8 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Tue, 28 Jan 2025 13:33:14 -0600
Subject: [PATCH 17/17] windows fix

---
 .github/workflows/tests.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7eb51805..017c998f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,6 +12,10 @@ concurrency:
   group: tests-${{ github.ref }}
   cancel-in-progress: true
 
+defaults:
+  run:
+    shell: bash -eux {0}
+
 jobs:
   tests:
     name: "Tests"