From b3e9a8fefcf25cb528ea5dc9fc5f0a163af3adf4 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Wed, 29 Oct 2025 14:44:34 +0100 Subject: [PATCH] chore: remove serverless connection tests Our serverless cluster is no longer a serverless cluster, since they are being converted to Flex tier clusters. This does not remove every mention of serverless from the Compass source code, although I imagine we would be able to do so relatively soon. Refs: https://www.mongodb.com/docs/atlas/billing/serverless-instance-costs/ --- .evergreen/connectivity-tests/run.sh | 1 - .evergreen/functions.yml | 1 - .../tests/connection.test.ts | 47 ------------------- packages/data-service/src/connect.spec.ts | 22 +-------- 4 files changed, 2 insertions(+), 69 deletions(-) diff --git a/.evergreen/connectivity-tests/run.sh b/.evergreen/connectivity-tests/run.sh index 61cc986d590..000b2ac5955 100644 --- a/.evergreen/connectivity-tests/run.sh +++ b/.evergreen/connectivity-tests/run.sh @@ -18,7 +18,6 @@ docker run \ -e E2E_TESTS_ATLAS_HOST="${E2E_TESTS_ATLAS_HOST}" \ -e E2E_TESTS_DATA_LAKE_HOST="${E2E_TESTS_DATA_LAKE_HOST}" \ -e E2E_TESTS_ANALYTICS_NODE_HOST="${E2E_TESTS_ANALYTICS_NODE_HOST}" \ - -e E2E_TESTS_SERVERLESS_HOST="${E2E_TESTS_SERVERLESS_HOST}" \ -e E2E_TESTS_FREE_TIER_HOST="${E2E_TESTS_FREE_TIER_HOST}" \ -e E2E_TESTS_ATLAS_USERNAME="${E2E_TESTS_ATLAS_USERNAME}" \ -e E2E_TESTS_ATLAS_PASSWORD="${E2E_TESTS_ATLAS_PASSWORD}" \ diff --git a/.evergreen/functions.yml b/.evergreen/functions.yml index 6d658411b20..8bca78cf3a9 100644 --- a/.evergreen/functions.yml +++ b/.evergreen/functions.yml @@ -58,7 +58,6 @@ variables: E2E_TESTS_METRICS_URI: ${e2e_tests_metrics_string} E2E_TESTS_ATLAS_HOST: ${e2e_tests_atlas_host} E2E_TESTS_DATA_LAKE_HOST: ${e2e_tests_data_lake_host} - E2E_TESTS_SERVERLESS_HOST: ${e2e_tests_serverless_host} E2E_TESTS_ANALYTICS_NODE_HOST: ${e2e_tests_analytics_node_host} E2E_TESTS_FREE_TIER_HOST: ${e2e_tests_free_tier_host} E2E_TESTS_ATLAS_USERNAME: ${e2e_tests_atlas_username} diff --git a/packages/compass-e2e-tests/tests/connection.test.ts b/packages/compass-e2e-tests/tests/connection.test.ts index 36d1155941a..8e5c1f14342 100644 --- a/packages/compass-e2e-tests/tests/connection.test.ts +++ b/packages/compass-e2e-tests/tests/connection.test.ts @@ -40,7 +40,6 @@ function hasAtlasEnvironmentVariables(): boolean { 'E2E_TESTS_ATLAS_HOST', 'E2E_TESTS_DATA_LAKE_HOST', 'E2E_TESTS_ANALYTICS_NODE_HOST', - 'E2E_TESTS_SERVERLESS_HOST', 'E2E_TESTS_FREE_TIER_HOST', 'E2E_TESTS_ATLAS_USERNAME', 'E2E_TESTS_ATLAS_PASSWORD', @@ -388,30 +387,6 @@ describe('Connection string', function () { } }); - it('can connect to Atlas Serverless', async function () { - if (!hasAtlasEnvironmentVariables()) { - return this.skip(); - } - - const username = process.env.E2E_TESTS_ATLAS_USERNAME ?? ''; - const password = process.env.E2E_TESTS_ATLAS_PASSWORD ?? ''; - const host = process.env.E2E_TESTS_SERVERLESS_HOST ?? ''; - const connectionString = `mongodb+srv://${username}:${password}@${host}`; - const connectionName = connectionNameFromString(connectionString); - - await browser.connectWithConnectionString(connectionString); - - if (!TEST_COMPASS_WEB) { - const result = await browser.shellEval( - connectionName, - 'db.runCommand({ connectionStatus: 1 })', - true - ); - assertNotError(result); - expect(result).to.have.property('ok', 1); - } - }); - it('can connect to Atlas Datalake', async function () { if (!hasAtlasEnvironmentVariables()) { return this.skip(); @@ -881,28 +856,6 @@ describe('Connection form', function () { expect(result).to.have.property('ok', 1); }); - it('can connect to Atlas Serverless', async function () { - if (!hasAtlasEnvironmentVariables()) { - return this.skip(); - } - - const atlasConnectionOptions: ConnectFormState = basicAtlasOptions( - process.env.E2E_TESTS_SERVERLESS_HOST ?? '' - ); - const connectionName = this.test?.fullTitle() ?? ''; - await browser.connectWithConnectionForm({ - ...atlasConnectionOptions, - connectionName, - }); - const result = await browser.shellEval( - connectionName, - 'db.runCommand({ connectionStatus: 1 })', - true - ); - assertNotError(result); - expect(result).to.have.property('ok', 1); - }); - it('can connect to Atlas Datalake', async function () { if (!hasAtlasEnvironmentVariables()) { return this.skip(); diff --git a/packages/data-service/src/connect.spec.ts b/packages/data-service/src/connect.spec.ts index ca689472dab..b9785efb3aa 100644 --- a/packages/data-service/src/connect.spec.ts +++ b/packages/data-service/src/connect.spec.ts @@ -27,7 +27,6 @@ const { E2E_TESTS_ATLAS_PASSWORD, E2E_TESTS_ATLAS_HOST, E2E_TESTS_DATA_LAKE_HOST, - E2E_TESTS_SERVERLESS_HOST, E2E_TESTS_FREE_TIER_HOST, E2E_TESTS_ANALYTICS_NODE_HOST, E2E_TESTS_ATLAS_X509_PEM_BASE64, @@ -99,13 +98,6 @@ const COMPASS_TEST_DATA_LAKE_URL = buildConnectionString( { tls: 'true' } ); -const COMPASS_TEST_SERVERLESS_URL = buildConnectionString( - 'mongodb+srv', - E2E_TESTS_ATLAS_USERNAME, - E2E_TESTS_ATLAS_PASSWORD, - E2E_TESTS_SERVERLESS_HOST -); - const envs = createTestEnvs([ 'enterprise', 'ldap', @@ -250,16 +242,6 @@ describe('connect', function () { connectionString: COMPASS_TEST_DATA_LAKE_URL, }); }); - - it('connects to serverless', async function () { - if (!IS_CI && !COMPASS_TEST_SERVERLESS_URL) { - return this.skip(); - } - - await connectAndGetAuthInfo({ - connectionString: COMPASS_TEST_SERVERLESS_URL, - }); - }); }); describe('docker', function () { @@ -492,11 +474,11 @@ describe('connect', function () { ANALYTICS. readPreference=secondary would more closely mirror the original ticket, but this cluster also has no secondaries so that would fail regardless of readPreferenceTags. - + Ideally people would use readPreference=secondaryPreferred, but that works regardless so isn't a good test and if it was the case that people used that in the first place we'd never need this ticket. - + readPreference=nearest tries to find one that matches the criteria and since the config server doesn't know about tags the following operations would hang unless we remove the tags. You can confirm this manually by