Merge branch 'main' into autoupdate-from3

Author: lerouxb

.evergreen.yml

@@ -1,7 +1,11 @@
 stepback: false
 exec_timeout_secs: 5400
 ignore:
+  - docs/**/*.md
   - AUTHORS
+  - CODE_OF_CONDUCT.md
+  - CONTRIBUTING.md
+  - README.md
   - THIRD-PARTY-NOTICES.md
 include:
   - filename: .evergreen/functions.yml

.evergreen/connectivity-tests/run.sh

@@ -22,7 +22,7 @@ docker run \
   -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}" \
-  -e E2E_TESTS_ATLAS_X509_PEM="${E2E_TESTS_ATLAS_X509_PEM}" \
+  -e E2E_TESTS_ATLAS_X509_PEM_BASE64="${E2E_TESTS_ATLAS_X509_PEM_BASE64}" \
   -e MONGODB_VERSION="${MONGODB_VERSION}" \
   --add-host mongodb-kerberos-1.example.com:0.0.0.0 \
   --add-host mongodb-kerberos-2.example.com:0.0.0.0 \

.evergreen/functions.yml

@@ -62,7 +62,7 @@ variables:
     E2E_TESTS_FREE_TIER_HOST: ${e2e_tests_free_tier_host}
     E2E_TESTS_ATLAS_USERNAME: ${e2e_tests_atlas_username}
     E2E_TESTS_ATLAS_PASSWORD: ${e2e_tests_atlas_password}
-    E2E_TESTS_ATLAS_X509_PEM: ${e2e_tests_atlas_x509_pem}
+    E2E_TESTS_ATLAS_X509_PEM_BASE64: ${e2e_tests_atlas_x509_pem_base64}
     E2E_TESTS_ATLAS_IAM_ACCESS_KEY_ID: ${e2e_tests_atlas_iam_aws_access_key_id}
     E2E_TESTS_ATLAS_IAM_SECRET_ACCESS_KEY: ${e2e_tests_atlas_iam_aws_secret_access_key}
     E2E_TESTS_ATLAS_IAM_TEMP_ROLE_ARN: ${e2e_tests_atlas_iam_temp_role_arn}
@@ -443,7 +443,7 @@ functions:
         script: |
           set -e
 
-          .evergreen/create-sbom.sh
+          bash ".evergreen/retry-with-backoff.sh" .evergreen/create-sbom.sh
     - command: shell.exec
       params:
         working_dir: src

THIRD-PARTY-NOTICES.md

@@ -1,5 +1,5 @@
 The following third-party software is used by and included in **Mongodb Compass**.
-This document was automatically generated on Fri Jan 17 2025.
+This document was automatically generated on Mon Jan 20 2025.
 
 ## List of dependencies
 

docs/tracking-plan.md

@@ -1,7 +1,7 @@
 
 # Compass Tracking Plan
 
-Generated on Fri, Jan 17, 2025
+Generated on Mon, Jan 20, 2025
 
 ## Table of Contents
 

packages/compass-e2e-tests/helpers/commands/save-aggregation-pipeline.ts

@@ -47,4 +47,7 @@ export async function saveAggregationPipeline(
   const createButton = browser.$(Selectors.SavePipelineModal).$('button=Save');
 
   await createButton.click();
+
+  // wait for the modal to disappear
+  await savePipelineModal.waitForDisplayed({ reverse: true });
 }

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

@@ -39,7 +39,7 @@ function hasAtlasEnvironmentVariables(): boolean {
     'E2E_TESTS_FREE_TIER_HOST',
     'E2E_TESTS_ATLAS_USERNAME',
     'E2E_TESTS_ATLAS_PASSWORD',
-    'E2E_TESTS_ATLAS_X509_PEM',
+    'E2E_TESTS_ATLAS_X509_PEM_BASE64',
     'E2E_TESTS_ATLAS_IAM_ACCESS_KEY_ID',
     'E2E_TESTS_ATLAS_IAM_SECRET_ACCESS_KEY',
     'E2E_TESTS_ATLAS_IAM_TEMP_ROLE_ARN',
@@ -724,7 +724,11 @@ describe('Connection form', function () {
     try {
       tempdir = await fs.mkdtemp(path.join(os.tmpdir(), 'connect-tests-'));
       const certPath = path.join(tempdir, 'x509.pem');
-      await fs.writeFile(certPath, process.env.E2E_TESTS_ATLAS_X509_PEM ?? '');
+      await fs.writeFile(
+        certPath,
+        process.env.E2E_TESTS_ATLAS_X509_PEM_BASE64 ?? '',
+        'base64'
+      );
 
       const atlasConnectionOptions: ConnectFormState = {
         hosts: [process.env.E2E_TESTS_ATLAS_HOST ?? ''],

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

@@ -30,7 +30,7 @@ const {
   E2E_TESTS_SERVERLESS_HOST,
   E2E_TESTS_FREE_TIER_HOST,
   E2E_TESTS_ANALYTICS_NODE_HOST,
-  E2E_TESTS_ATLAS_X509_PEM,
+  E2E_TESTS_ATLAS_X509_PEM_BASE64,
 } = process.env;
 
 const buildConnectionString = (
@@ -204,15 +204,22 @@ describe('connect', function () {
     });
 
     it('connects to atlas with X509', async function () {
-      if (!IS_CI && !(E2E_TESTS_ATLAS_HOST || E2E_TESTS_ATLAS_X509_PEM)) {
+      if (
+        !IS_CI &&
+        !(E2E_TESTS_ATLAS_HOST || E2E_TESTS_ATLAS_X509_PEM_BASE64)
+      ) {
         return this.skip();
       }
 
       let tempdir;
       try {
         tempdir = await fs.mkdtemp(path.join(os.tmpdir(), 'connect-tests-'));
         const certPath = path.join(tempdir, 'x509.pem');
-        await fs.writeFile(certPath, E2E_TESTS_ATLAS_X509_PEM);
+        await fs.writeFile(
+          certPath,
+          process.env.E2E_TESTS_ATLAS_X509_PEM_BASE64 ?? '',
+          'base64'
+        );
 
         const url = new ConnectionStringUrl(
           `mongodb+srv://${E2E_TESTS_ATLAS_HOST || ''}/admin`