Remove serverless testing (#1745)

JAVA-5849

Author: jyemin

.evergreen/.evg.yml

@@ -185,27 +185,6 @@ functions:
  DRIVERS_TOOLS="${DRIVERS_TOOLS}" bash ${DRIVERS_TOOLS}/.evergreen/atlas_data_lake/teardown.sh || true
 
 
- "start-serverless":
- - command: shell.exec
- params:
- shell: "bash"
- include_expansions_in_env: [ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN" ]
- script: |
- ${PREPARE_SHELL}
- bash ${DRIVERS_TOOLS}/.evergreen/serverless/setup-secrets.sh ${VAULT_NAME}
- bash ${DRIVERS_TOOLS}/.evergreen/serverless/create-instance.sh
- - command: expansions.update
- params:
- file: serverless-expansion.yml
- "stop-serverless":
- - command: shell.exec
- params:
- shell: "bash"
- include_expansions_in_env: [ "AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN" ]
- script: |
- ${PREPARE_SHELL}
- bash ${DRIVERS_TOOLS}/.evergreen/serverless/delete-instance.sh || true
-
  "start-load-balancer":
  - command: shell.exec
  params:
@@ -475,17 +454,6 @@ functions:
  MULTI_MONGOS_LB_URI="${MULTI_MONGOS_LB_URI}" \
  .evergreen/run-load-balancer-tests.sh
 
- "run-serverless-tests":
- - command: shell.exec
- type: "test"
- params:
- working_dir: "src"
- shell: "bash"
- include_expansions_in_env: ["JAVA_VERSION", "SERVERLESS_URI", "SERVERLESS_ATLAS_USER", "SERVERLESS_ATLAS_PASSWORD"]
- script: |
- ${PREPARE_SHELL}
- .evergreen/run-serverless-tests.sh
-
  "run-reactive-streams-tck-tests":
  - command: shell.exec
  type: "test"
@@ -837,7 +805,6 @@ post:
  - func: "upload-test-results"
  - func: "assume-aws-test-secrets-role"
  - func: "stop-load-balancer"
- - func: "stop-serverless"
  - func: "stop-aws"
  - func: "stop-mongohoused"
  - func: "stop-csfle-servers"
@@ -999,13 +966,6 @@ tasks:
  VARIANT: gke
 
 
- - name: "serverless-test-task"
- disable: true # TODO JAVA-5849
- commands:
- - func: "assume-aws-test-secrets-role"
- - func: "start-serverless"
- - func: "run-serverless-tests"
-
  - name: "accept-api-version-2-test-task"
  commands:
  - func: "start-csfle-servers"
@@ -1513,7 +1473,7 @@ tasks:
  script: |
  # DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
  # The connection strings are pipe-delimited
- MONGODB_URIS="${atlas_free_tier_uri}|${atlas_replica_set_uri}|${atlas_sharded_uri}|${atlas_tls_v11_uri}|${atlas_tls_v12_uri}|${atlas_free_tier_uri_srv}|${atlas_replica_set_uri_srv}|${atlas_sharded_uri_srv}|${atlas_tls_v11_uri_srv}|${atlas_tls_v12_uri_srv}|${atlas_serverless_uri}|${atlas_serverless_uri_srv}" \
+ MONGODB_URIS="${atlas_free_tier_uri}|${atlas_replica_set_uri}|${atlas_sharded_uri}|${atlas_tls_v11_uri}|${atlas_tls_v12_uri}|${atlas_free_tier_uri_srv}|${atlas_replica_set_uri_srv}|${atlas_sharded_uri_srv}|${atlas_tls_v11_uri_srv}|${atlas_tls_v12_uri_srv}" \
  JAVA_VERSION="8" \
  .evergreen/run-connectivity-tests.sh
 
@@ -1942,15 +1902,6 @@ axes:
  variables:
  AWS_CREDENTIAL_PROVIDER: "builtIn"
 
- - id: "serverless"
- display_name: "Serverless"
- values:
- - id: "passthrough"
- display_name: "Serverless Passthrough Proxy"
- variables:
- VAULT_NAME: "serverless"
- batchtime: 10080 # 7 days
-
 task_groups:
  - name: "atlas-deployed-task-group"
  max_hosts: -1
@@ -2438,12 +2389,6 @@ buildvariants:
  tasks:
  - name: "load-balancer-test-task"
 
- - matrix_name: "tests-serverless"
- matrix_spec: { serverless: "*", jdk: [ "jdk21" ], os: "ubuntu" }
- display_name: "${serverless} ${jdk} ${os}"
- tasks:
- - name: "serverless-test-task"
-
  - matrix_name: "tests-slow-task"
  matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "jdk21", version: [ "7.0" ], topology: "standalone", os: "linux" }
  display_name: "Slow: ${version} ${topology} ${ssl} ${jdk} ${os} "

.evergreen/run-serverless-tests.sh

@@ -119,7 +119,6 @@ public final class ClusterFixture {
  public static final String MONGODB_URI_SYSTEM_PROPERTY_NAME = "org.mongodb.test.uri";
  public static final String MONGODB_API_VERSION = "org.mongodb.test.api.version";
  public static final String MONGODB_MULTI_MONGOS_URI_SYSTEM_PROPERTY_NAME = "org.mongodb.test.multi.mongos.uri";
- public static final String SERVERLESS_TEST_SYSTEM_PROPERTY_NAME = "org.mongodb.test.serverless";
  public static final String DATA_LAKE_TEST_SYSTEM_PROPERTY_NAME = "org.mongodb.test.data.lake";
  public static final String ATLAS_SEARCH_TEST_SYSTEM_PROPERTY_NAME = "org.mongodb.test.atlas.search";
  private static final String MONGODB_OCSP_SHOULD_SUCCEED = "org.mongodb.test.ocsp.tls.should.succeed";
@@ -293,10 +292,6 @@ public static synchronized ConnectionString getMultiMongosConnectionString() {
  return getConnectionStringFromSystemProperty(MONGODB_MULTI_MONGOS_URI_SYSTEM_PROPERTY_NAME);
  }
 
- public static boolean isServerlessTest() {
- return System.getProperty(SERVERLESS_TEST_SYSTEM_PROPERTY_NAME, "").equals("true");
- }
-
  public static synchronized boolean isDataLakeTest() {
  String isDataLakeSystemProperty = System.getProperty(DATA_LAKE_TEST_SYSTEM_PROPERTY_NAME);
  return "true".equals(isDataLakeSystemProperty);
@@ -842,10 +837,4 @@ public static ClusterSettings.Builder setDirectConnection(final ClusterSettings.
  return builder.mode(ClusterConnectionMode.SINGLE).hosts(singletonList(getPrimary()));
  }
 
- public static int applyTimeoutMultiplierForServerless(final int timeoutMs) {
- if (ClusterFixture.isServerlessTest()) {
- return timeoutMs * 2;
- }
- return timeoutMs;
- }
 }

driver-core/src/test/functional/com/mongodb/ClusterFixture.java

@@ -112,9 +112,8 @@ public static boolean topologyMatches(final BsonArray topologyTypes) {
  public static boolean serverlessMatches(final String serverlessRequirement) {
  switch (serverlessRequirement) {
  case "require":
- return ClusterFixture.isServerlessTest();
+ return false;
  case "forbid":
- return !ClusterFixture.isServerlessTest();
  case "allow":
  return true;
  default:

driver-core/src/test/functional/com/mongodb/JsonTestServerVersionChecker.java

@@ -326,8 +326,6 @@ public open class MongoCluster protected constructor(private val wrapped: JMongo
  * `bulkWrite` commands. The eligibility for retries is determined per each `bulkWrite` command:
  * [ClientNamespacedUpdateManyModel], [ClientNamespacedDeleteManyModel] in a command render it non-retryable.
  *
- * This operation is not supported by MongoDB Atlas Serverless instances.
- *
  * @param models The [individual write operations][ClientNamespacedWriteModel].
  * @return The [ClientBulkWriteResult] if the operation is successful.
  * @throws ClientBulkWriteException If and only if the operation is unsuccessful or partially unsuccessful, and
@@ -349,8 +347,6 @@ public open class MongoCluster protected constructor(private val wrapped: JMongo
  * `bulkWrite` commands. The eligibility for retries is determined per each `bulkWrite` command:
  * [ClientNamespacedUpdateManyModel], [ClientNamespacedDeleteManyModel] in a command render it non-retryable.
  *
- * This operation is not supported by MongoDB Atlas Serverless instances.
- *
  * @param models The [individual write operations][ClientNamespacedWriteModel].
  * @param options The [options][ClientBulkWriteOptions].
  * @return The [ClientBulkWriteResult] if the operation is successful.
@@ -377,8 +373,6 @@ public open class MongoCluster protected constructor(private val wrapped: JMongo
  * `bulkWrite` commands. The eligibility for retries is determined per each `bulkWrite` command:
  * [ClientNamespacedUpdateManyModel], [ClientNamespacedDeleteManyModel] in a command render it non-retryable.
  *
- * This operation is not supported by MongoDB Atlas Serverless instances.
- *
  * @param clientSession The [client session][ClientSession] with which to associate this operation.
  * @param models The [individual write operations][ClientNamespacedWriteModel].
  * @return The [ClientBulkWriteResult] if the operation is successful.
@@ -403,8 +397,6 @@ public open class MongoCluster protected constructor(private val wrapped: JMongo
  * `bulkWrite` commands. The eligibility for retries is determined per each `bulkWrite` command:
  * [ClientNamespacedUpdateManyModel], [ClientNamespacedDeleteManyModel] in a command render it non-retryable.
  *
- * This operation is not supported by MongoDB Atlas Serverless instances.
- *
  * @param clientSession The [client session][ClientSession] with which to associate this operation.
  * @param models The [individual write operations][ClientNamespacedWriteModel].
  * @param options The [options][ClientBulkWriteOptions].

driver-kotlin-coroutine/src/main/kotlin/com/mongodb/kotlin/client/coroutine/MongoCluster.kt

@@ -322,8 +322,6 @@ public open class MongoCluster protected constructor(private val wrapped: JMongo
  * `bulkWrite` commands. The eligibility for retries is determined per each `bulkWrite` command:
  * [ClientNamespacedUpdateManyModel], [ClientNamespacedDeleteManyModel] in a command render it non-retryable.
  *
- * This operation is not supported by MongoDB Atlas Serverless instances.
- *
  * @param models The [individual write operations][ClientNamespacedWriteModel].
  * @return The [ClientBulkWriteResult] if the operation is successful.
  * @throws ClientBulkWriteException If and only if the operation is unsuccessful or partially unsuccessful, and
@@ -344,8 +342,6 @@ public open class MongoCluster protected constructor(private val wrapped: JMongo
  * `bulkWrite` commands. The eligibility for retries is determined per each `bulkWrite` command:
  * [ClientNamespacedUpdateManyModel], [ClientNamespacedDeleteManyModel] in a command render it non-retryable.
  *
- * This operation is not supported by MongoDB Atlas Serverless instances.
- *
  * @param models The [individual write operations][ClientNamespacedWriteModel].
  * @param options The [options][ClientBulkWriteOptions].
  * @return The [ClientBulkWriteResult] if the operation is successful.
@@ -372,8 +368,6 @@ public open class MongoCluster protected constructor(private val wrapped: JMongo
  * `bulkWrite` commands. The eligibility for retries is determined per each `bulkWrite` command:
  * [ClientNamespacedUpdateManyModel], [ClientNamespacedDeleteManyModel] in a command render it non-retryable.
  *
- * This operation is not supported by MongoDB Atlas Serverless instances.
- *
  * @param clientSession The [client session][ClientSession] with which to associate this operation.
  * @param models The [individual write operations][ClientNamespacedWriteModel].
  * @return The [ClientBulkWriteResult] if the operation is successful.
@@ -398,8 +392,6 @@ public open class MongoCluster protected constructor(private val wrapped: JMongo
  * multiple `bulkWrite` commands. The eligibility for retries is determined per each `bulkWrite` command:
  * [ClientNamespacedUpdateManyModel], [ClientNamespacedDeleteManyModel] in a command render it non-retryable.
  *
- * This operation is not supported by MongoDB Atlas Serverless instances.
- *
  * @param clientSession The [client session][ClientSession] with which to associate this operation.
  * @param models The [individual write operations][ClientNamespacedWriteModel].
  * @param options The [options][ClientBulkWriteOptions].

driver-kotlin-sync/src/main/kotlin/com/mongodb/kotlin/client/MongoCluster.kt

@@ -372,8 +372,6 @@ public interface MongoCluster {
  * executing this operation may require multiple {@code bulkWrite} commands.
  * The eligibility for retries is determined per each {@code bulkWrite} command:
  * {@link ClientNamespacedUpdateManyModel}, {@link ClientNamespacedDeleteManyModel} in a command render it non-retryable.</p>
- * <p>
- * This operation is not supported by MongoDB Atlas Serverless instances.</p>
  *
  * @param models The {@linkplain ClientNamespacedWriteModel individual write operations}.
  * @return The {@link Publisher} signalling at most one element {@link ClientBulkWriteResult} if the operation is successful,
@@ -401,8 +399,6 @@ public interface MongoCluster {
  * executing this operation may require multiple {@code bulkWrite} commands.
  * The eligibility for retries is determined per each {@code bulkWrite} command:
  * {@link ClientNamespacedUpdateManyModel}, {@link ClientNamespacedDeleteManyModel} in a command render it non-retryable.</p>
- * <p>
- * This operation is not supported by MongoDB Atlas Serverless instances.</p>
  *
  * @param models The {@linkplain ClientNamespacedWriteModel individual write operations}.
  * @param options The options.
@@ -435,8 +431,6 @@ Publisher<ClientBulkWriteResult> bulkWrite(
  * executing this operation may require multiple {@code bulkWrite} commands.
  * The eligibility for retries is determined per each {@code bulkWrite} command:
  * {@link ClientNamespacedUpdateManyModel}, {@link ClientNamespacedDeleteManyModel} in a command render it non-retryable.</p>
- * <p>
- * This operation is not supported by MongoDB Atlas Serverless instances.</p>
  *
  * @param clientSession The {@linkplain ClientSession client session} with which to associate this operation.
  * @param models The {@linkplain ClientNamespacedWriteModel individual write operations}.
@@ -467,8 +461,6 @@ Publisher<ClientBulkWriteResult> bulkWrite(
  * executing this operation may require multiple {@code bulkWrite} commands.
  * The eligibility for retries is determined per each {@code bulkWrite} command:
  * {@link ClientNamespacedUpdateManyModel}, {@link ClientNamespacedDeleteManyModel} in a command render it non-retryable.</p>
- * <p>
- * This operation is not supported by MongoDB Atlas Serverless instances.</p>
  *
  * @param clientSession The {@linkplain ClientSession client session} with which to associate this operation.
  * @param models The {@linkplain ClientNamespacedWriteModel individual write operations}.

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/MongoCluster.java

@@ -58,16 +58,13 @@
 import java.util.stream.Collectors;
 
 import static com.mongodb.ClusterFixture.TIMEOUT_DURATION;
-import static com.mongodb.ClusterFixture.applyTimeoutMultiplierForServerless;
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
-import static com.mongodb.ClusterFixture.isServerlessTest;
 import static com.mongodb.ClusterFixture.serverVersionAtLeast;
 import static com.mongodb.ClusterFixture.sleep;
 import static java.util.Collections.singletonList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 
@@ -120,12 +117,12 @@ public void testGridFSUploadViaOpenUploadStreamTimeout() {
  + " data: {"
  + " failCommands: [\"insert\"],"
  + " blockConnection: true,"
- + " blockTimeMS: " + (rtt + applyTimeoutMultiplierForServerless(405))
+ + " blockTimeMS: " + (rtt + 405)
  + " }"
  + "}");
 
  try (MongoClient client = createReactiveClient(getMongoClientSettingsBuilder()
- .timeout(rtt + applyTimeoutMultiplierForServerless(400), TimeUnit.MILLISECONDS))) {
+ .timeout(rtt + 400, TimeUnit.MILLISECONDS))) {
  MongoDatabase database = client.getDatabase(gridFsFileNamespace.getDatabaseName());
  GridFSBucket gridFsBucket = createReaciveGridFsBucket(database, GRID_FS_BUCKET_NAME);
 
@@ -179,12 +176,12 @@ public void testAbortingGridFsUploadStreamTimeout() throws ExecutionException, I
  + " data: {"
  + " failCommands: [\"delete\"],"
  + " blockConnection: true,"
- + " blockTimeMS: " + (rtt + applyTimeoutMultiplierForServerless(405))
+ + " blockTimeMS: " + (rtt + 405)
  + " }"
  + "}");
 
  try (MongoClient client = createReactiveClient(getMongoClientSettingsBuilder()
- .timeout(rtt + applyTimeoutMultiplierForServerless(400), TimeUnit.MILLISECONDS))) {
+ .timeout(rtt + 400, TimeUnit.MILLISECONDS))) {
  MongoDatabase database = client.getDatabase(gridFsFileNamespace.getDatabaseName());
  GridFSBucket gridFsBucket = createReaciveGridFsBucket(database, GRID_FS_BUCKET_NAME);
 
@@ -229,7 +226,6 @@ public void testAbortingGridFsUploadStreamTimeout() throws ExecutionException, I
  public void testTimeoutMSAppliesToFullResumeAttemptInNextCall() {
  assumeTrue(serverVersionAtLeast(4, 4));
  assumeTrue(isDiscoverableReplicaSet());
- assumeFalse(isServerlessTest());
 
  //given
  long rtt = ClusterFixture.getPrimaryRTT();
@@ -284,7 +280,6 @@ public void testTimeoutMSAppliesToFullResumeAttemptInNextCall() {
  public void testTimeoutMSAppliedToInitialAggregate() {
  assumeTrue(serverVersionAtLeast(4, 4));
  assumeTrue(isDiscoverableReplicaSet());
- assumeFalse(isServerlessTest());
 
  //given
  long rtt = ClusterFixture.getPrimaryRTT();
@@ -332,7 +327,6 @@ public void testTimeoutMSAppliedToInitialAggregate() {
  public void testTimeoutMsRefreshedForGetMoreWhenMaxAwaitTimeMsNotSet() {
  assumeTrue(serverVersionAtLeast(4, 4));
  assumeTrue(isDiscoverableReplicaSet());
- assumeFalse(isServerlessTest());
 
  //given
  BsonTimestamp startTime = new BsonTimestamp((int) Instant.now().getEpochSecond(), 0);
@@ -401,7 +395,6 @@ public void testTimeoutMsRefreshedForGetMoreWhenMaxAwaitTimeMsNotSet() {
  public void testTimeoutMsRefreshedForGetMoreWhenMaxAwaitTimeMsSet() {
  assumeTrue(serverVersionAtLeast(4, 4));
  assumeTrue(isDiscoverableReplicaSet());
- assumeFalse(isServerlessTest());
 
  //given
  BsonTimestamp startTime = new BsonTimestamp((int) Instant.now().getEpochSecond(), 0);
@@ -463,7 +456,6 @@ public void testTimeoutMsRefreshedForGetMoreWhenMaxAwaitTimeMsSet() {
  public void testTimeoutMsISHonoredForNnextOperationWhenSeveralGetMoreExecutedInternally() {
  assumeTrue(serverVersionAtLeast(4, 4));
  assumeTrue(isDiscoverableReplicaSet());
- assumeFalse(isServerlessTest());
 
  //given
  long rtt = ClusterFixture.getPrimaryRTT();