Skip to content

Commit 4c9632f

Browse files
authored
chore: remove serverless connection tests (#7515)
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/
1 parent 9fc7351 commit 4c9632f

File tree

4 files changed

+2
-69
lines changed

4 files changed

+2
-69
lines changed

.evergreen/connectivity-tests/run.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ docker run \
1818
-e E2E_TESTS_ATLAS_HOST="${E2E_TESTS_ATLAS_HOST}" \
1919
-e E2E_TESTS_DATA_LAKE_HOST="${E2E_TESTS_DATA_LAKE_HOST}" \
2020
-e E2E_TESTS_ANALYTICS_NODE_HOST="${E2E_TESTS_ANALYTICS_NODE_HOST}" \
21-
-e E2E_TESTS_SERVERLESS_HOST="${E2E_TESTS_SERVERLESS_HOST}" \
2221
-e E2E_TESTS_FREE_TIER_HOST="${E2E_TESTS_FREE_TIER_HOST}" \
2322
-e E2E_TESTS_ATLAS_USERNAME="${E2E_TESTS_ATLAS_USERNAME}" \
2423
-e E2E_TESTS_ATLAS_PASSWORD="${E2E_TESTS_ATLAS_PASSWORD}" \

.evergreen/functions.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ variables:
5858
E2E_TESTS_METRICS_URI: ${e2e_tests_metrics_string}
5959
E2E_TESTS_ATLAS_HOST: ${e2e_tests_atlas_host}
6060
E2E_TESTS_DATA_LAKE_HOST: ${e2e_tests_data_lake_host}
61-
E2E_TESTS_SERVERLESS_HOST: ${e2e_tests_serverless_host}
6261
E2E_TESTS_ANALYTICS_NODE_HOST: ${e2e_tests_analytics_node_host}
6362
E2E_TESTS_FREE_TIER_HOST: ${e2e_tests_free_tier_host}
6463
E2E_TESTS_ATLAS_USERNAME: ${e2e_tests_atlas_username}

packages/compass-e2e-tests/tests/connection.test.ts

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ function hasAtlasEnvironmentVariables(): boolean {
4040
'E2E_TESTS_ATLAS_HOST',
4141
'E2E_TESTS_DATA_LAKE_HOST',
4242
'E2E_TESTS_ANALYTICS_NODE_HOST',
43-
'E2E_TESTS_SERVERLESS_HOST',
4443
'E2E_TESTS_FREE_TIER_HOST',
4544
'E2E_TESTS_ATLAS_USERNAME',
4645
'E2E_TESTS_ATLAS_PASSWORD',
@@ -388,30 +387,6 @@ describe('Connection string', function () {
388387
}
389388
});
390389

391-
it('can connect to Atlas Serverless', async function () {
392-
if (!hasAtlasEnvironmentVariables()) {
393-
return this.skip();
394-
}
395-
396-
const username = process.env.E2E_TESTS_ATLAS_USERNAME ?? '';
397-
const password = process.env.E2E_TESTS_ATLAS_PASSWORD ?? '';
398-
const host = process.env.E2E_TESTS_SERVERLESS_HOST ?? '';
399-
const connectionString = `mongodb+srv://${username}:${password}@${host}`;
400-
const connectionName = connectionNameFromString(connectionString);
401-
402-
await browser.connectWithConnectionString(connectionString);
403-
404-
if (!TEST_COMPASS_WEB) {
405-
const result = await browser.shellEval(
406-
connectionName,
407-
'db.runCommand({ connectionStatus: 1 })',
408-
true
409-
);
410-
assertNotError(result);
411-
expect(result).to.have.property('ok', 1);
412-
}
413-
});
414-
415390
it('can connect to Atlas Datalake', async function () {
416391
if (!hasAtlasEnvironmentVariables()) {
417392
return this.skip();
@@ -881,28 +856,6 @@ describe('Connection form', function () {
881856
expect(result).to.have.property('ok', 1);
882857
});
883858

884-
it('can connect to Atlas Serverless', async function () {
885-
if (!hasAtlasEnvironmentVariables()) {
886-
return this.skip();
887-
}
888-
889-
const atlasConnectionOptions: ConnectFormState = basicAtlasOptions(
890-
process.env.E2E_TESTS_SERVERLESS_HOST ?? ''
891-
);
892-
const connectionName = this.test?.fullTitle() ?? '';
893-
await browser.connectWithConnectionForm({
894-
...atlasConnectionOptions,
895-
connectionName,
896-
});
897-
const result = await browser.shellEval(
898-
connectionName,
899-
'db.runCommand({ connectionStatus: 1 })',
900-
true
901-
);
902-
assertNotError(result);
903-
expect(result).to.have.property('ok', 1);
904-
});
905-
906859
it('can connect to Atlas Datalake', async function () {
907860
if (!hasAtlasEnvironmentVariables()) {
908861
return this.skip();

packages/data-service/src/connect.spec.ts

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ const {
2727
E2E_TESTS_ATLAS_PASSWORD,
2828
E2E_TESTS_ATLAS_HOST,
2929
E2E_TESTS_DATA_LAKE_HOST,
30-
E2E_TESTS_SERVERLESS_HOST,
3130
E2E_TESTS_FREE_TIER_HOST,
3231
E2E_TESTS_ANALYTICS_NODE_HOST,
3332
E2E_TESTS_ATLAS_X509_PEM_BASE64,
@@ -99,13 +98,6 @@ const COMPASS_TEST_DATA_LAKE_URL = buildConnectionString(
9998
{ tls: 'true' }
10099
);
101100

102-
const COMPASS_TEST_SERVERLESS_URL = buildConnectionString(
103-
'mongodb+srv',
104-
E2E_TESTS_ATLAS_USERNAME,
105-
E2E_TESTS_ATLAS_PASSWORD,
106-
E2E_TESTS_SERVERLESS_HOST
107-
);
108-
109101
const envs = createTestEnvs([
110102
'enterprise',
111103
'ldap',
@@ -250,16 +242,6 @@ describe('connect', function () {
250242
connectionString: COMPASS_TEST_DATA_LAKE_URL,
251243
});
252244
});
253-
254-
it('connects to serverless', async function () {
255-
if (!IS_CI && !COMPASS_TEST_SERVERLESS_URL) {
256-
return this.skip();
257-
}
258-
259-
await connectAndGetAuthInfo({
260-
connectionString: COMPASS_TEST_SERVERLESS_URL,
261-
});
262-
});
263245
});
264246

265247
describe('docker', function () {
@@ -492,11 +474,11 @@ describe('connect', function () {
492474
ANALYTICS. readPreference=secondary would more closely mirror the
493475
original ticket, but this cluster also has no secondaries so that would
494476
fail regardless of readPreferenceTags.
495-
477+
496478
Ideally people would use readPreference=secondaryPreferred, but that works
497479
regardless so isn't a good test and if it was the case that people used
498480
that in the first place we'd never need this ticket.
499-
481+
500482
readPreference=nearest tries to find one that matches the criteria and
501483
since the config server doesn't know about tags the following operations
502484
would hang unless we remove the tags. You can confirm this manually by

0 commit comments

Comments
 (0)