Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .evergreen/connectivity-tests/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}" \
Expand Down
1 change: 0 additions & 1 deletion .evergreen/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
47 changes: 0 additions & 47 deletions packages/compass-e2e-tests/tests/connection.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
22 changes: 2 additions & 20 deletions packages/data-service/src/connect.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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 () {
Expand Down Expand Up @@ -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
Expand Down
Loading