Merge remote-tracking branch 'origin/main' into cloudp-311776

Author: rubydong

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

@@ -248,8 +248,12 @@ buildvariants:
         variant: <%= buildVariant.depends_on %>
     tasks:
     <% for (const group of E2E_TEST_GROUPS) { %>
+    <% if (['test-packaged-app-macos-11-arm', 'test-packaged-app-macos-11-x64'].includes(buildVariant.name)) { %>
+    - name: test-packaged-app-macos13-<%= group.number %>
+    <% } else { %>
     - name: test-packaged-app-<%= group.number %>
     <% } %>
+    <% } %>
 <% } %>
 
   - name: publish
@@ -501,6 +505,32 @@ tasks:
           e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
           e2e_test_group: <%= group.number %>
           debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
+
+  - name: test-packaged-app-macos13-<%= group.number %>
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: 'compass-e2e-tests'
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.5
+          compass_distribution: compass
+          e2e_test_groups: <%= E2E_TEST_GROUPS.length %>
+          e2e_test_group: <%= group.number %>
+          debug: 'compass-e2e-tests*,electron*,hadron*,mongo*'
 <% } %>
 
 <% for (const browser of BROWSERS) { %>

.evergreen/buildvariants-and-tasks.yml

@@ -222,9 +222,9 @@ buildvariants:
       - name: package-compass
         variant: package-macos-arm
     tasks:
-      - name: test-packaged-app-1
-      - name: test-packaged-app-2
-      - name: test-packaged-app-3
+      - name: test-packaged-app-macos13-1
+      - name: test-packaged-app-macos13-2
+      - name: test-packaged-app-macos13-3
   - name: test-packaged-app-macos-11-x64
     display_name: Test Packaged App MacOS x64 11
     run_on: macos-11-gui
@@ -233,9 +233,9 @@ buildvariants:
       - name: package-compass
         variant: package-macos-x64
     tasks:
-      - name: test-packaged-app-1
-      - name: test-packaged-app-2
-      - name: test-packaged-app-3
+      - name: test-packaged-app-macos13-1
+      - name: test-packaged-app-macos13-2
+      - name: test-packaged-app-macos13-3
   - name: test-packaged-app-macos-14-arm
     display_name: Test Packaged App MacOS arm64 14
     run_on: macos-14-arm64-gui
@@ -1577,6 +1577,31 @@ tasks:
           e2e_test_groups: 3
           e2e_test_group: 1
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-macos13-1
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.5
+          compass_distribution: compass
+          e2e_test_groups: 3
+          e2e_test_group: 1
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
   - name: test-packaged-app-2
     tags:
       - required-for-publish
@@ -1602,6 +1627,31 @@ tasks:
           e2e_test_groups: 3
           e2e_test_group: 2
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-macos13-2
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.5
+          compass_distribution: compass
+          e2e_test_groups: 3
+          e2e_test_group: 2
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
   - name: test-packaged-app-3
     tags:
       - required-for-publish
@@ -1627,6 +1677,31 @@ tasks:
           e2e_test_groups: 3
           e2e_test_group: 3
           debug: compass-e2e-tests*,electron*,hadron*,mongo*
+  - name: test-packaged-app-macos13-3
+    tags:
+      - required-for-publish
+      - run-on-pr
+      - assigned_to_jira_team_compass_compass
+      - foliage_check_task_only
+    commands:
+      - func: prepare
+      - func: install
+      - func: bootstrap
+        vars:
+          scope: compass-e2e-tests
+      - func: apply-compass-target-expansion
+        vars:
+          compass_distribution: compass
+      - func: get-packaged-app
+        vars:
+          compass_distribution: compass
+      - func: test-packaged-app
+        vars:
+          mongodb_version: 8.0.5
+          compass_distribution: compass
+          e2e_test_groups: 3
+          e2e_test_group: 3
+          debug: compass-e2e-tests*,electron*,hadron*,mongo*
   - name: test-web-sandbox-chrome-1
     tags:
       - required-for-publish

.evergreen/functions.yml

@@ -504,12 +504,18 @@ functions:
         content_type: application/x-gzip
 
   publish:
+    - command: ec2.assume_role
+      params:
+        role_arn: "arn:aws:iam::119629040606:role/s3-access.cdn-origin-compass"
     - command: shell.exec
       params:
         working_dir: src
         shell: bash
         env:
           <<: *compass-env
+          DOWNLOAD_CENTER_NEW_AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
+          DOWNLOAD_CENTER_NEW_AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
+          DOWNLOAD_CENTER_NEW_AWS_SESSION_TOKEN: ${AWS_SESSION_TOKEN}
         script: |
           set -e
           # Load environment variables

.evergreen/print-compass-env.js

@@ -22,7 +22,7 @@ function printVar(name, value) {
 function printCompassEnv() {
   let {
     // This is an env var set in bash that we exported in print-compass-env.sh
-    OSTYPE
+    OSTYPE,
   } = process.env;
 
   // We have to operate on bash's PATH env var where the c:\ style paths have
@@ -55,6 +55,13 @@ function printCompassEnv() {
 
   const pathsToPrepend = [];
 
+  if (process.env.PLATFORM === 'linux') {
+    // To build node modules on linux post electron 13 we need a newer c++
+    // compiler version and at least python v3.9, this adds it.
+    // https://jira.mongodb.org/browse/COMPASS-5150
+    pathsToPrepend.unshift('/opt/devtools/bin');
+  }
+
   if (OSTYPE === 'cygwin') {
     // NOTE lucas: for git-core addition, See
     // https://jira.mongodb.org/browse/COMPASS-4122
@@ -68,13 +75,6 @@ function printCompassEnv() {
     pathsToPrepend.unshift(`${newPWD}/.deps/bin`);
   }
 
-  if (process.env.PLATFORM === 'linux') {
-    // To build node modules on linux post electron 13 we need a newer c++
-    // compiler version and at least python v3.9, this adds it.
-    // https://jira.mongodb.org/browse/COMPASS-5150
-    pathsToPrepend.unshift('/opt/mongodbtoolchain/v4/bin');
-  }
-
   pathsToPrepend.unshift(`${originalPWD}/.evergreen/docker-config/bin`);
 
   PATH = maybePrependPaths(PATH, pathsToPrepend);

.github/PULL_REQUEST_TEMPLATE.md

@@ -12,10 +12,12 @@
 ## Description
 <!--- Describe your changes in detail -->
 <!--- If applicable, describe (or illustrate) architecture flow -->
+<!--- If the UI changes in a non-trivial way, consider adding screenshots/video illustrating the new flows -->
 
 ### Checklist
 - [ ] New tests and/or benchmarks are included
 - [ ] Documentation is changed or added
+- [ ] If this change updates the UI, screenshots/videos are added and a design review is requested
 - [ ] I have signed the MongoDB Contributor License Agreement (https://www.mongodb.com/legal/contributor-agreement)
 
 ## Motivation and Context

.github/workflows/authors-and-third-party-notices.yaml

@@ -3,7 +3,7 @@ name: Update Authors and Third Party Notices
 on:
   # Once a week or on pushes to main
   schedule:
-    - cron: "0 3 * * 0"
+    - cron: '0 3 * * 0'
   push:
     branches:
       - main
@@ -13,6 +13,9 @@ permissions:
 
 jobs:
   update_generated_files:
+    if: |
+      github.event_name == 'schedule' ||
+      !startsWith(github.event.head_commit.message, 'chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary')
     name: Update automatically generated files
     runs-on: ubuntu-latest
     env:
@@ -32,13 +35,13 @@ jobs:
 
           # this is important so git log can pick up on
           # the whole history to generate the list of AUTHORS
-          fetch-depth: "0"
+          fetch-depth: '0'
           token: ${{ steps.app-token.outputs.token }}
 
       - uses: actions/setup-node@v4
         with:
           node-version: 20.16.0
-          cache: "npm"
+          cache: 'npm'
 
       - name: Install [email protected]
         run: |
@@ -71,5 +74,15 @@ jobs:
 
       - name: Commit and push
         run: |
-          git commit --no-allow-empty -m "chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary" || true
-          git push
+          # We can't rely on git not allowing empty commits by default: the
+          # empty commit check happens before the pre-commit hooks run and if
+          # there is no diff exists after precommit logic was executed, empty
+          # commit will still be generated. Instead of that we will allow empty
+          # commit to happen and will check it directly if it's empty or not
+          git commit --allow-empty -m "chore: update AUTHORS, THIRD-PARTY-NOTICES, Security Test Summary"
+          if [ $(git diff-tree --name-only --no-commit-id HEAD | wc -l) -gt 0 ]; then
+            echo "Files changed, pushing update..."
+            git push
+          else
+            echo "No changes to push"
+          fi

.github/workflows/bump-packages.yaml

@@ -24,12 +24,15 @@ jobs:
         with:
           # don't checkout a detatched HEAD
           ref: ${{ github.head_ref }}
+          # this is important so git log can pick up on the whole history to
+          # find last publish commit
+          fetch-depth: '0'
           token: ${{ steps.app-token.outputs.token }}
 
       - uses: actions/setup-node@v4
         with:
           node-version: 20.16.0
-          cache: "npm"
+          cache: 'npm'
 
       - name: Install [email protected]
         run: |
@@ -42,17 +45,27 @@ jobs:
 
       - name: Bump packages
         env:
-          SKIP_BUMP_PACKAGES: "mongodb-compass"
+          SKIP_BUMP_PACKAGES: 'mongodb-compass'
+          # Do not remove this variable, bump-packages script uses this env var
+          # to find the previous commit
+          LAST_BUMP_COMMIT_MESSAGE: 'chore(release): bump package versions'
         run: npm run bump-packages
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # 7.0.5
         with:
           token: ${{ steps.app-token.outputs.token }}
-          commit-message: "chore(release): bump package versions"
+          commit-message: 'chore(release): bump package versions'
           branch: ci/bump-packages
-          title: "chore(release): bump package versions"
+          title: 'chore(release): bump package versions'
           labels: no-title-validation
-          author: "${{ steps.app-token.outputs.app-slug}}[bot] <${{ steps.app-token.outputs.app-email }}>"
-          body: |
-            - Bump package versions
+          author: '${{ steps.app-token.outputs.app-slug}}[bot] <${{ steps.app-token.outputs.app-email }}>'
+          body: >-
+            <p>This PR is autogenerated and updates the version of every package
+            in the monorepo that was changed since last publish. If you need to
+            publish packages to update the version elsewhere, <strong>you can do
+            this at your own convenience by just merging this PR</strong>.</p>
+
+            <p>After PR is merged, it starts an automatic publish process via
+            GitHub Actions, you can follow the process <a href="https://github.com/mongodb-js/compass/actions/workflows/publish-packages.yaml">
+            on the publish workflow page</a>.</p>

.github/workflows/test-installers.yml

@@ -229,6 +229,10 @@ jobs:
           DISTRO_ID: ${{ matrix.distro-id }}
           # Exposing token to prevent update server from being rate limited
           GITHUB_TOKEN: ${{ github.token }}
+          # mongodb 8.0.6 requires macOS 14+. Just use an older version for now
+          # so it will run on GitHub's mac runners
+          MONGODB_VERSION: "8.0.5"
+          MONGODB_RUNNER_VERSION: "8.0.5"
         working-directory: packages/compass-smoke-tests
         # Using --skipUninstalling --skipCleanup because the runners are ephemeral
         run: npm start -- --package ${{ matrix.package }} --tests ${{ matrix.test }} --skipUninstall --skipCleanup

.husky/pre-commit

@@ -4,4 +4,8 @@
 # listings staged files only
 fileList=$(git diff --diff-filter=AM --cached --name-only)
 
-npm run precommit $fileList
+if [ -n "$fileList" ]; then
+  echo "Prettifying staged files..."
+  npx prettier-compass --write --ignore-unknown $fileList
+  git add $fileList
+fi