Evergreen test

Author: papafe

build.cake

@@ -229,6 +229,17 @@ Task("TestLoadBalanced")
 Task("TestLoadBalancedNetStandard21").IsDependentOn("TestLoadBalanced");
 Task("TestLoadBalancedNet60").IsDependentOn("TestLoadBalanced");
 
+Task("TestSocks5Proxy")
+    .IsDependentOn("TestLibMongoCrypt")
+    .DoesForEach(
+        items: GetFiles("./**/*.Tests.csproj"),
+        action: (BuildConfig buildConfig, Path testProject) =>
+            RunTests(buildConfig, testProject, filter: "Category=\"Socks5Proxy\""));
+
+Task("TestSocks5ProxyNet472").IsDependentOn("TestSocks5Proxy");
+Task("TestSocks5ProxyNetStandard21").IsDependentOn("TestSocks5Proxy");
+Task("TestSocks5ProxyNet60").IsDependentOn("TestSocks5Proxy");
+
 Task("TestCsfleWithMockedKms")
     .IsDependentOn("TestLibMongoCrypt")
     .DoesForEach(

evergreen/evergreen.yml

@@ -26,6 +26,42 @@ timeout:
 
 functions:
 
+  setup-socks5-proxy:
+    - command: shell.exec
+      params:
+        script: |
+          ${PREPARE_SHELL}
+          # Read the MongoDB URI connection string and extract an arbitrary member's host:port
+          HOST_PORT=$(echo "$MONGODB_URI" | sed 's|mongodb://||' | cut -d',' -f1)
+
+          # Start the SOCKS5 proxy with authentication on port 1080
+          python $DRIVERS_TOOLS/.evergreen/socks5srv.py --map "localhost:12345 to $HOST_PORT" --port 1080 --auth username:p4ssw0rd &
+
+          # Start the SOCKS5 proxy without authentication on port 1081
+          python $DRIVERS_TOOLS/.evergreen/socks5srv.py --map "localhost:12345 to $HOST_PORT" --port 1081 &
+
+#//TODO Check if we need all those parameters...
+  run-socks5-proxy-tests:
+    - command: shell.exec
+      type: test
+      params:
+        working_dir: "mongo-csharp-driver"
+        shell: "bash"
+        script: |
+          export SOCKS5_PROXY_SERVERS_ENABLED=true
+          ${PREPARE_SHELL}
+          OS=${OS} \
+            evergreen/add-ca-certs.sh
+          SSL=${SSL} \
+          MONGODB_URI="${MONGODB_URI}" \
+          TOPOLOGY=${TOPOLOGY} \
+          OS=${OS} \
+          FRAMEWORK=${FRAMEWORK} \
+          TARGET="TestSocks5Proxy" \
+            evergreen/run-tests.sh
+          OS=${OS} \
+            evergreen/cleanup-test-resources.sh
+
   fetch-source:
     # Executes git clone and applies the submitted patch, if any
     - command: git.get_project
@@ -1133,6 +1169,15 @@ tasks:
           vars:
             FRAMEWORK: net60
 
+#//TODO need to do the same with the other platforms
+    - name: test-socks5-proxy-net60
+      commands:
+        - func: setup-socks5-proxy
+        - func: bootstrap-mongo-orchestration
+        - func: run-socks5-proxy-tests
+          vars:
+            FRAMEWORK: net60
+
     - name: test-csfle-with-mocked-kms-tls-net472
       commands:
         - func: setup-csfle-secrets
@@ -2548,7 +2593,18 @@ buildvariants:
   tasks:
     - name: atlas-search-index-helpers-task-group
 
+# Socks5 Proxy tests
+# //TODO I don't think we need to do this tests with more than one version, right?
+# //TODO Do we need to run it also on other OSes? Java does only linux
+
+- matrix_name: "socks5-proxy-tests"
+  matrix_spec: { os: "ubuntu-2004", ssl: ["nossl", "ssl"], version: ["latest"], topology: ["replicaset"] }
+  display_name: "Socks5 Proxy ${version} ${os} ${ssl}"
+  tasks:
+    - name: test-socks5-proxy-net60
+
 # CSFLE tests
+
 - matrix_name: "csfle-with-mocked-kms-tests-windows"
   matrix_spec: { os: "windows-64", ssl: "nossl", version: ["4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "rapid", "latest"], topology: ["replicaset"] }
   display_name: "CSFLE Mocked KMS ${version} ${os}"

tests/MongoDB.Driver.Tests/Specifications/socks5-support/Socks5SupportProseTests.cs

@@ -15,18 +15,24 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 using MongoDB.Bson;
+using MongoDB.Driver.Core.Clusters;
+using MongoDB.Driver.Core.Misc;
 using MongoDB.Driver.Core.TestHelpers.Logging;
+using MongoDB.Driver.Core.TestHelpers.XunitExtensions;
+using MongoDB.TestHelpers.XunitExtensions;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace MongoDB.Driver.Tests.Specifications.socks5_support;
 
-[Trait("Category", "Integration")]
+[Trait("Category", "Socks5Proxy")]
 public class Socks5SupportProseTests(ITestOutputHelper testOutputHelper) : LoggableTestClass(testOutputHelper)
 {
+    //TODO Fix apicompat
     public static IEnumerable<object[]> GetTestCombinations()
     {
         var testCases = new (string ConnectionString, bool ExpectedResult)[]
@@ -48,7 +54,7 @@ public static IEnumerable<object[]> GetTestCombinations()
         {
             foreach (var isAsync in new[] { true, false })
             {
-                foreach (var useTls in new[] { true, false })
+                foreach (var useTls in new[] { false })
                 {
                     yield return [connectionString, expectedResult, useTls, isAsync];
                 }
@@ -60,9 +66,15 @@ public static IEnumerable<object[]> GetTestCombinations()
     [MemberData(nameof(GetTestCombinations))]
     public async Task TestConnectionStrings(string connectionString, bool expectedResult, bool useTls, bool async)
     {
-        //Requires server versions > 5.0 according to spec tests, not sure why
+        RequireServer.Check().Tls(required: useTls);
+        RequireServer.Check().ClusterType(ClusterType.ReplicaSet);
+        RequireEnvironment.Check().EnvironmentVariable("SOCKS5_PROXY_SERVERS_ENABLED");
 
-        connectionString = connectionString.Replace("<mappedhost>", "localhost:27017").Replace("<replicaset>", "localhost:27017");
+        //Convert the hosts to a format that can be used in the connection string (host:port), and join them into a string.
+        var hosts = CoreTestConfiguration.ConnectionString.Hosts;
+        var stringHosts = string.Join(",", hosts.Select(h => h.GetHostAndPort()).Select( h => $"{h.Host}:{h.Port}"));
+
+        connectionString = connectionString.Replace("<mappedhost>", "localhost:12345").Replace("<replicaset>", stringHosts);
         var mongoClientSettings = MongoClientSettings.FromConnectionString(connectionString);
 
         if (useTls)