Merge remote-tracking branch 'origin/main' into beta-releases

mongodb-js · Jun 25, 2024 · ba075c8 · ba075c8
2 parents 891e77d + 5d49e65
commit ba075c8
Show file tree

Hide file tree

Showing 143 changed files with 5,757 additions and 4,235 deletions.
diff --git a/.evergreen/buildvariants-and-tasks.in.yml b/.evergreen/buildvariants-and-tasks.in.yml
@@ -246,6 +246,14 @@ 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
@@ -332,6 +340,20 @@ 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*'
+<% } %>
+
   - name: generate-vulnerability-report
     tags: ['required-for-publish', 'run-on-pr']
     commands:

diff --git a/.evergreen/buildvariants-and-tasks.yml b/.evergreen/buildvariants-and-tasks.yml
@@ -220,6 +220,13 @@ 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
@@ -331,6 +338,45 @@ 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*
+  - 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*
+  - 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*
   - name: generate-vulnerability-report
     tags:
       - required-for-publish

diff --git a/.evergreen/functions.yml b/.evergreen/functions.yml
@@ -581,6 +581,30 @@ 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

diff --git a/.github/workflows/authors-and-third-party-notices.yaml b/.github/workflows/authors-and-third-party-notices.yaml
@@ -68,3 +68,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh pr merge $PULL_REQUEST_NUMBER --squash --delete-branch
+          gh workflow run codeql.yml -r main
diff --git a/THIRD-PARTY-NOTICES.md b/THIRD-PARTY-NOTICES.md
diff --git a/configs/eslint-config-compass/package.json b/configs/eslint-config-compass/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mongodb-js/eslint-config-compass",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Shared Compass eslint configuration",
   "license": "SSPL",
   "main": "index.js",

diff --git a/configs/webpack-config-compass/package.json b/configs/webpack-config-compass/package.json
@@ -13,7 +13,7 @@
     "email": "compass@mongodb.com"
   },
   "homepage": "https://github.com/mongodb-js/compass",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/compass.git"
@@ -45,7 +45,7 @@
     "reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
   },
   "devDependencies": {
-    "@mongodb-js/eslint-config-compass": "^1.1.1",
+    "@mongodb-js/eslint-config-compass": "^1.1.2",
     "@mongodb-js/prettier-config-compass": "^1.0.2",
     "@mongodb-js/tsconfig-compass": "^1.0.4",
     "@types/cli-progress": "^3.9.2",