Merge branch 'main' into tracking-plan

.evergreen/buildvariants-and-tasks.in.yml

@@ -246,14 +246,6 @@ buildvariants:
     - name: e2e-coverage-<%= group.number %>
     <% } %>
 
-  - name: e2e-multiple-connections
-    display_name: E2E Multiple Connections
-    run_on: ubuntu2004-large
-    tasks:
-    <% for(const group of E2E_TEST_GROUPS) { %>
-    - name: e2e-multiple-connections-<%= group.number %>
-    <% } %>
-
   - name: csfle-tests
     display_name: CSFLE Tests
     run_on: ubuntu2004-large
@@ -340,21 +332,6 @@ tasks:
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
 <% } %>
 
-<% for(const group of E2E_TEST_GROUPS) { %>
-  - name: e2e-multiple-connections-<%= group.number %>
-    tags: ['required-for-publish', 'run-on-pr']
-    commands:
-      - func: prepare
-      - func: install
-      - func: bootstrap
-      - func: test-multiple-connections
-        vars:
-          e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
-          e2e_test_group: <%= group.number %>
-          debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
-          mongodb_version: latest-enterprise
-<% } %>
-
   - name: generate-vulnerability-report
     tags: ['required-for-publish', 'run-on-pr']
     commands:

.evergreen/buildvariants-and-tasks.yml

@@ -220,13 +220,6 @@ buildvariants:
       - name: e2e-coverage-1
       - name: e2e-coverage-2
       - name: e2e-coverage-3
-  - name: e2e-multiple-connections
-    display_name: E2E Multiple Connections
-    run_on: ubuntu2004-large
-    tasks:
-      - name: e2e-multiple-connections-1
-      - name: e2e-multiple-connections-2
-      - name: e2e-multiple-connections-3
   - name: csfle-tests
     display_name: CSFLE Tests
     run_on: ubuntu2004-large
@@ -338,48 +331,6 @@ tasks:
           e2e_test_groups: 3
           e2e_test_group: 3
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
-  - name: e2e-multiple-connections-1
-    tags:
-      - required-for-publish
-      - run-on-pr
-    commands:
-      - func: prepare
-      - func: install
-      - func: bootstrap
-      - func: test-multiple-connections
-        vars:
-          e2e_test_groups: 3
-          e2e_test_group: 1
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-          mongodb_version: latest-enterprise
-  - name: e2e-multiple-connections-2
-    tags:
-      - required-for-publish
-      - run-on-pr
-    commands:
-      - func: prepare
-      - func: install
-      - func: bootstrap
-      - func: test-multiple-connections
-        vars:
-          e2e_test_groups: 3
-          e2e_test_group: 2
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-          mongodb_version: latest-enterprise
-  - name: e2e-multiple-connections-3
-    tags:
-      - required-for-publish
-      - run-on-pr
-    commands:
-      - func: prepare
-      - func: install
-      - func: bootstrap
-      - func: test-multiple-connections
-        vars:
-          e2e_test_groups: 3
-          e2e_test_group: 3
-          debug: compass-e2e-tests*,electron*,hadron*,mongo*
-          mongodb_version: latest-enterprise
   - name: generate-vulnerability-report
     tags:
       - required-for-publish

.evergreen/compass_package.sh

@@ -8,7 +8,7 @@ if [[ "$OSTYPE" == "cygwin" ]]; then
 fi
 
 echo "Creating signed release build..."
-npm run package-compass-nocompile $COMPASS_DISTRIBUTION
+npm run package-compass-nocompile
 npm run generate-first-party-deps-json
 
 ls -la packages/compass/dist

.evergreen/functions.yml

@@ -301,12 +301,13 @@ functions:
         shell: bash
         env:
           <<: *compass-env
+          HADRON_DISTRIBUTION: ${compass_distribution}
         script: |
           set -e
           # Load environment variables
           eval $(.evergreen/print-compass-env.sh)
           # Generates and expansion file with build target metadata in packages/compass/expansions.yml
-          npm run --workspace mongodb-compass build-info -- ${target_platform} ${target_arch} --format=yaml --flatten ${compass_distribution} --out expansions.raw.yml
+          npm run --workspace mongodb-compass build-info -- ${target_platform} ${target_arch} --format=yaml --flatten --out expansions.raw.yml
           # the 'author' key conflicts with evergreen's own expansion
           grep -v '^author:' < packages/compass/expansions.raw.yml > packages/compass/expansions.yml
     - command: expansions.update
@@ -405,7 +406,7 @@ functions:
           <<: *compass-env
           DEBUG: ${debug}
           npm_config_loglevel: ${npm_loglevel}
-          COMPASS_DISTRIBUTION: ${compass_distribution}
+          HADRON_DISTRIBUTION: ${compass_distribution}
         script: |
           set -e
 
@@ -443,7 +444,7 @@ functions:
           <<: *compass-env
           DEBUG: ${debug}
           npm_config_loglevel: ${npm_loglevel}
-          COMPASS_DISTRIBUTION: ${compass_distribution}
+          HADRON_DISTRIBUTION: ${compass_distribution}
           SIGNING_SERVER_HOSTNAME: ${SIGNING_SERVER_HOSTNAME}
           SIGNING_SERVER_PRIVATE_KEY: ${SIGNING_SERVER_PRIVATE_KEY}
           SIGNING_SERVER_PRIVATE_KEY_CYGPATH: ${SIGNING_SERVER_PRIVATE_KEY_CYGPATH}
@@ -586,6 +587,7 @@ functions:
           E2E_TEST_GROUPS: ${e2e_test_groups}
           E2E_TEST_GROUP: ${e2e_test_group}
           ATLAS_LOCAL_VERSION: latest
+          HADRON_DISTRIBUTION: compass
         script: |
           set -e
           # Load environment variables
@@ -600,30 +602,6 @@ functions:
 
           tar czf coverage.tgz packages/compass-e2e-tests/coverage
 
-  test-multiple-connections:
-    - command: shell.exec
-      # Fail the task if it's idle for 10 mins
-      timeout_secs: 600
-      params:
-        working_dir: src
-        shell: bash
-        env:
-          <<: *compass-env
-          DEBUG: ${debug|}
-          MONGODB_VERSION: ${mongodb_version|}
-          MONGODB_RUNNER_VERSION: ${mongodb_version|}
-          E2E_TEST_GROUPS: ${e2e_test_groups}
-          E2E_TEST_GROUP: ${e2e_test_group}
-        script: |
-          set -e
-          # Load environment variables
-          eval $(.evergreen/print-compass-env.sh)
-
-          echo "Running E2E tests for multiple connections"
-
-          npm run --unsafe-perm --workspace compass-e2e-tests test-ci -- -- --test-multiple-connections
-
-
   test-packaged-app:
     - command: shell.exec
       # Fail the task if it's idle for 10 mins
@@ -946,6 +924,7 @@ functions:
           DEBUG: ${debug}
           SNYK_TOKEN: ${snyk_token}
           JIRA_API_TOKEN: ${jira_api_token}
+          HADRON_DISTRIBUTION: compass
         script: |
           set -e
           # Load environment variables
@@ -977,28 +956,3 @@ functions:
             # Fails if the report failed and is not a patch, including release branches:
             exit $return_code
           fi
-
-  generative-ai-accuracy-tests:
-    - command: shell.exec
-      # Fail the task if it's idle for 10 mins
-      timeout_secs: 600
-      params:
-        working_dir: src
-        shell: bash
-        env:
-          <<: *compass-env
-          ATLAS_PUBLIC_KEY: ${atlas_public_key}
-          ATLAS_PRIVATE_KEY: ${atlas_private_key}
-          AI_ACCURACY_RESULTS_MONGODB_CONNECTION_STRING: ${accuracy_results_mdb_connection_string}
-        script: |
-          set -e
-          # Load environment variables
-          eval $(.evergreen/print-compass-env.sh)
-
-          set +e
-          npm run --workspace @mongodb-js/compass-generative-ai ai-accuracy-tests
-          return_code=$?
-          set -e
-
-          # Fail when the accuracy tests fail:
-          exit $return_code

.snyk

@@ -7,7 +7,7 @@ ignore:
         reason: >-
           Not applicable as we do not use a valueFormatter or cellRenderer
           function
-        expires: 2024-08-17T18:27:24.346Z
+        expires: 2024-11-15T18:27:24.346Z
         created: 2024-01-18T18:27:24.353Z
   SNYK-JS-AXIOS-6032459:
     - '*':

CONTRIBUTING.md

@@ -56,10 +56,10 @@ In addition to running lerna commands directly, there are a few convenient npm s
 To build compass you can run `package-compass` script:
 
 ```sh
-npm run package-compass
+HADRON_DISTRIBUTION='compass' npm run package-compass
 ```
 
-You can change the type of distribution you are building with `HADRON_DISTRIBUTION` environmental variable:
+It is required to provide `HADRON_DISTRIBUTION` env variable explicitly. You can change the type of distribution you are building by setting a different `HADRON_DISTRIBUTION` value:
 
 ```sh
 HADRON_DISTRIBUTION='compass-readonly' npm run package-compass

README.md

@@ -62,7 +62,6 @@ Is there anything else you’d like to see in Compass? Let us know by submitting
 - [**@mongodb-js/databases-collections-list**](packages/databases-collections-list): List view for the databases and collections
 - [**@mongodb-js/explain-plan-helper**](packages/explain-plan-helper): Explain plan utility methods for MongoDB Compass
 - [**@mongodb-js/my-queries-storage**](packages/my-queries-storage): Saved aggregations and queries storage
-- [**@mongodb-js/ssh-tunnel**](packages/ssh-tunnel): Yet another ssh tunnel based on ssh2
 - [**bson-transpilers**](packages/bson-transpilers): Source to source compilers using ANTLR
 - [**compass-e2e-tests**](packages/compass-e2e-tests): E2E test suite for Compass app that follows smoke tests / feature testing matrix
 - [**compass-preferences-model**](packages/compass-preferences-model): Compass preferences model