CSHARP-5568: Remove Serverless testing (#1725)

Author: sanych-sun

build.cake

@@ -202,17 +202,6 @@ Task("TestMongoDbOidc")
         action: (BuildConfig buildConfig, Path testProject) =>
             RunTests(buildConfig, testProject, filter: "Category=\"MongoDbOidc\""));
 
-Task("TestServerless")
-    .IsDependentOn("Build")
-    .DoesForEach(
-        items: GetFiles("./**/MongoDB.Driver.Tests.csproj"),
-        action: (BuildConfig buildConfig, Path testProject) =>
-            RunTests(buildConfig, testProject, filter: "Category=\"Serverless\""));
-
-Task("TestServerlessNet472").IsDependentOn("TestServerless");
-Task("TestServerlessNetStandard21").IsDependentOn("TestServerless");
-Task("TestServerlessNet60").IsDependentOn("TestServerless");
-
 Task("TestLibMongoCrypt")
     .IsDependentOn("Build")
     .DoesForEach(

evergreen/evergreen.yml

@@ -727,19 +727,6 @@ functions:
         args:
           - evergreen/run-mongodb-oidc-tests.sh
 
-  run-serverless-tests:
-    - command: shell.exec
-      type: test
-      params:
-        working_dir: mongo-csharp-driver
-        script: |
-          ${PREPARE_SHELL}
-          AUTH=${AUTH} \
-          FRAMEWORK=${FRAMEWORK} \
-          SSL=${SSL} \
-          CRYPT_SHARED_LIB_PATH=${CRYPT_SHARED_LIB_PATH} \
-            evergreen/run-serverless-tests.sh
-
   run-smoke-tests:
     - command: shell.exec
       type: test
@@ -1339,12 +1326,6 @@ tasks:
           vars:
             K8S_VARIANT: aks
 
-    - name: test-serverless
-      exec_timeout_secs: 2700 # 45 minutes: 15 for setup + 30 for tests
-      commands:
-        - func: setup-csfle-secrets
-        - func: run-serverless-tests
-
     - name: test-ocsp-rsa-valid-cert-server-staples-ca-responder
       tags: ["ocsp"]
       commands:
@@ -1899,14 +1880,6 @@ axes:
         variables:
           FRAMEWORK: net80
 
-  - id: serverless
-    display_name: Serverless
-    values:
-      - id: "Passthrough"
-        display_name: "Serverless Passthrough Proxy"
-        variables:
-          VAULT_NAME: "serverless"
-
 task_groups:
   - name: testazurekms-task-group
     setup_group_can_fail_task: true
@@ -2180,39 +2153,6 @@ task_groups:
     tasks:
       - test-oidc-k8s
 
-  - name: serverless-task-group
-    setup_group_can_fail_task: true
-    setup_group_timeout_secs: 1800 # 30 minutes
-    setup_group:
-      - func: fetch-source
-      - func: prepare-resources
-      - func: fix-absolute-paths
-      - func: make-files-executable
-      - func: assume-ec2-role
-      - command: subprocess.exec
-        params:
-          binary: bash
-          env:
-            VAULT_NAME: ${VAULT_NAME}
-          include_expansions_in_env:
-            - "AWS_ACCESS_KEY_ID"
-            - "AWS_SECRET_ACCESS_KEY"
-            - "AWS_SESSION_TOKEN"
-          args:
-            - ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
-      - command: expansions.update
-        params:
-          file: serverless-expansion.yml
-    teardown_group:
-      - func: upload-test-results
-      - command: subprocess.exec
-        params:
-          binary: bash
-          args:
-            - ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh
-    tasks:
-      - test-serverless
-
   - name: validate-apicompat-task-group
     setup_group_can_fail_task: true
     setup_group_timeout_secs: 1800 # 30 minutes
@@ -2483,21 +2423,6 @@ buildvariants:
     - name: "test-load-balancer-netstandard21"
     - name: "test-load-balancer-net60"
 
-# Serverless tests
-- matrix_name: serverless-tests-windows
-  matrix_spec: { auth: "auth", ssl: "ssl", compressor: "zlib", os: "windows-64", target_framework: ["net472", "netstandard21", "net60"], serverless: "*" }
-  display_name: "${serverless} ${compressor} ${auth} ${ssl} ${os} ${target_framework}"
-  batchtime: 10080  # 7 days
-  tasks:
-    - name: serverless-task-group
-
-- matrix_name: serverless-tests-ubuntu
-  matrix_spec: { auth: "auth", ssl: "ssl", compressor: "zlib", os: "ubuntu-2004", target_framework: ["netstandard21", "net60"], serverless: "*" }
-  display_name: "${serverless} ${compressor} ${auth} ${ssl} ${os} ${target_framework}"
-  batchtime: 10080  # 7 days
-  tasks:
-    - name: serverless-task-group
-
 # Performance tests
 - name: driver-performance-tests
   display_name: "Driver Performance Tests"

evergreen/run-serverless-tests.sh

@@ -39,13 +39,11 @@ public ConnectivityTests(ITestOutputHelper testOutputHelper)
         [InlineData("ATLAS_FREE")]
         [InlineData("ATLAS_TLS11")]
         [InlineData("ATLAS_TLS12")]
-        [InlineData("ATLAS_SERVERLESS")]
         [InlineData("ATLAS_SRV_REPL")]
         [InlineData("ATLAS_SRV_SHRD")]
         [InlineData("ATLAS_SRV_FREE")]
         [InlineData("ATLAS_SRV_TLS11")]
         [InlineData("ATLAS_SRV_TLS12")]
-        [InlineData("ATLAS_SRV_SERVERLESS")]
         public void Connection_to_Atlas_should_work(string environmentVariableName)
         {
             var connectionString = Environment.GetEnvironmentVariable(environmentVariableName);

tests/AtlasConnectivity.Tests/ConnectivityTests.cs

@@ -49,7 +49,6 @@ public static class CoreTestConfiguration
         private static MessageEncoderSettings __messageEncoderSettings = new MessageEncoderSettings();
         private static Lazy<int> __numberOfMongoses = new Lazy<int>(GetNumberOfMongoses, isThreadSafe: true);
         private static Lazy<ServerApi> __serverApi = new Lazy<ServerApi>(GetServerApi, isThreadSafe: true);
-        private static Lazy<bool> __serverless = new Lazy<bool>(GetServerless, isThreadSafe: true);
         private static Lazy<SemanticVersion> __serverVersion = new Lazy<SemanticVersion>(GetServerVersion, isThreadSafe: true);
         private static Lazy<string> __storageEngine = new Lazy<string>(GetStorageEngine, isThreadSafe: true);
         private static TraceSource __traceSource;
@@ -109,11 +108,6 @@ public static ServerApi ServerApi
             get { return __serverApi.Value; }
         }
 
-        public static bool Serverless
-        {
-            get { return __serverless.Value; }
-        }
-
         public static SemanticVersion ServerVersion => __serverVersion.Value;
 
         public static int MaxWireVersion => __maxWireVersion.Value;
@@ -293,13 +287,6 @@ private static ServerApi GetServerApi()
             return new ServerApi(ServerApiVersion.V1);
         }
 
-        private static bool GetServerless()
-        {
-            var serverless = Environment.GetEnvironmentVariable("SERVERLESS");
-
-            return serverless?.ToLower() == "true";
-        }
-
         public static DatabaseNamespace GetDatabaseNamespaceForTestClass(Type testClassType)
         {
             var databaseName = TruncateDatabaseNameIfTooLong(__databaseNamespace.Value.DatabaseName + "-" + testClassType.Name);
@@ -469,8 +456,7 @@ private static string GetStorageEngine()
             switch (clusterType)
             {
                 case ClusterType.LoadBalanced:
-                case var _ when Serverless:
-                    // Load balancing and serverless are only supported for servers higher than 50
+                    // Load balancing only supported for servers higher than 50
                     result = "wiredTiger";
                     break;
                 case ClusterType.Sharded:

tests/MongoDB.Driver.TestHelpers/Core/CoreTestConfiguration.cs

@@ -18,7 +18,6 @@
 using MongoDB.Bson;
 using MongoDB.Driver.Core.Clusters;
 using MongoDB.Driver.Core.Misc;
-using Xunit;
 using Xunit.Sdk;
 
 namespace MongoDB.Driver.Core.TestHelpers.XunitExtensions
@@ -129,18 +128,6 @@ public RequireServer RunOn(BsonArray requirements)
             throw new SkipException($"Test skipped because cluster does not meet runOn requirements: {requirements}.");
         }
 
-        public RequireServer Serverless(bool require = true)
-        {
-            var isServerless = CoreTestConfiguration.Serverless;
-
-            if (isServerless == require)
-            {
-                return this;
-            }
-
-            throw new SkipException("Test skipped because serverless is " + (require ? "required" : "not required") + ".");
-        }
-
         public RequireServer StableServer(bool stable = true)
         {
             var serverVersion = CoreTestConfiguration.ServerVersion;
@@ -321,12 +308,8 @@ private bool IsRequirementSatisfied(BsonElement requirement)
                     var serverlessValue = requirement.Value.AsString;
                     switch (serverlessValue)
                     {
-                        case "allow":
-                            return true;
                         case "forbid":
-                            return CoreTestConfiguration.Serverless == false;
-                        case "require":
-                            return CoreTestConfiguration.Serverless == true;
+                            return true;
                         default:
                             throw new FormatException($"Invalid runOn requirement serverless field value: '{requirement.Value}'.");
                     }

tests/MongoDB.Driver.TestHelpers/Core/XunitExtensions/RequireServer.cs

@@ -126,15 +126,15 @@ public void LoadBalancers(JsonDrivenTestCase testCase)
            Run(testCase);
         }
 
-        [Category("Serverless", "SupportLoadBalancing")]
+        [Category("SupportLoadBalancing")]
         [UnifiedTestsTheory("read_write_concern.tests.operation")]
         public void ReadWriteConcern(JsonDrivenTestCase testCase) => Run(testCase);
 
-        [Category("Serverless", "SupportLoadBalancing")]
+        [Category("SupportLoadBalancing")]
         [UnifiedTestsTheory("retryable_reads.tests.unified")]
         public void RetryableReads(JsonDrivenTestCase testCase) => Run(testCase);
 
-        [Category("Serverless", "SupportLoadBalancing")]
+        [Category("SupportLoadBalancing")]
         [UnifiedTestsTheory("retryable_writes.tests.unified")]
         public void RetryableWrites(JsonDrivenTestCase testCase)
         {
@@ -156,11 +156,10 @@ public void ServerDiscoveryAndMonitoring(JsonDrivenTestCase testCase) =>
         [UnifiedTestsTheory("server_selection.tests.logging")]
         public void ServerSelection(JsonDrivenTestCase testCase) => Run(testCase);
 
-        [Category("Serverless")]
         [UnifiedTestsTheory("sessions.tests")]
         public void Sessions(JsonDrivenTestCase testCase) => Run(testCase);
 
-        [Category("Serverless", "SupportLoadBalancing")]
+        [Category("SupportLoadBalancing")]
         [UnifiedTestsTheory("transactions.tests.unified")]
         public void Transactions(JsonDrivenTestCase testCase)
         {
@@ -203,7 +202,7 @@ public void UnifiedTestFormatValidPass(JsonDrivenTestCase testCase)
             Run(testCase);
         }
 
-        [Category("Serverless", "SupportLoadBalancing")]
+        [Category("SupportLoadBalancing")]
         [UnifiedTestsTheory("versioned_api.tests")]
         public void VersionedApi(JsonDrivenTestCase testCase) => Run(testCase);
 

tests/MongoDB.Driver.Tests/Specifications/UnifiedTestSpecRunner.cs

@@ -28,7 +28,6 @@
 namespace MongoDB.Driver.Tests.Specifications.client_side_encryption
 {
     [Trait("Category", "CSFLE")]
-    [Trait("Category", "Serverless")]
     [Trait("Category", "Integration")]
     public class ClientSideEncryptionTestRunner : MongoClientJsonDrivenTestRunnerBase
     {

tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/ClientSideEncryptionTestRunner.cs

@@ -31,7 +31,6 @@
 
 namespace MongoDB.Driver.Tests.Specifications.crud
 {
-    [Trait("Category", "Serverless")]
     [Trait("Category", "Integration")]
     public class CrudTestRunner : LoggableTestClass
     {
@@ -313,11 +312,7 @@ private void SkipTestIfNeeded(BsonDocument definition, BsonDocument test)
 
             if (definition.TryGetValue("serverless", out var serverless))
             {
-                if (serverless == "forbid")
-                {
-                    RequireServer.Check().Serverless(false);
-                }
-                else
+                if (serverless != "forbid")
                 {
                     throw new FormatException($"Invalid serverless field value: '{serverless.AsString}'.");
                 }