Merge remote-tracking branch 'origin' into COMPASS-9799-field-type-on-node

Author: mabaasit

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

@@ -429,10 +429,12 @@ tasks:
         vars:
           compass_distribution: <%= distribution %>
       - func: spawn-signing-server
+        retry_on_failure: true
       - func: package
         vars:
           debug: 'hadron*,mongo*,compass*,electron*,sign*'
           compass_distribution: <%= distribution %>
+        retry_on_failure: true
       - func: verify-artifacts
       - func: save-all-artifacts
         vars:

.evergreen/buildvariants-and-tasks.yml

@@ -435,10 +435,12 @@ tasks:
         vars:
           compass_distribution: compass
       - func: spawn-signing-server
+        retry_on_failure: true
       - func: package
         vars:
           debug: hadron*,mongo*,compass*,electron*,sign*
           compass_distribution: compass
+        retry_on_failure: true
       - func: verify-artifacts
       - func: save-all-artifacts
         vars:
@@ -458,10 +460,12 @@ tasks:
         vars:
           compass_distribution: compass-isolated
       - func: spawn-signing-server
+        retry_on_failure: true
       - func: package
         vars:
           debug: hadron*,mongo*,compass*,electron*,sign*
           compass_distribution: compass-isolated
+        retry_on_failure: true
       - func: verify-artifacts
       - func: save-all-artifacts
         vars:
@@ -481,10 +485,12 @@ tasks:
         vars:
           compass_distribution: compass-readonly
       - func: spawn-signing-server
+        retry_on_failure: true
       - func: package
         vars:
           debug: hadron*,mongo*,compass*,electron*,sign*
           compass_distribution: compass-readonly
+        retry_on_failure: true
       - func: verify-artifacts
       - func: save-all-artifacts
         vars:

.evergreen/connectivity-tests/run.sh

@@ -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}" \

.evergreen/functions.yml

@@ -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}

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,34 +9,44 @@
   NOTE: use `feat`, `fix` and `perf` for user facing changes that will be part of
   release notes.
 -->
+
 ## 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
+- [ ] If this change could impact the load on the MongoDB cluster, please describe the expected and worst case impact
 - [ ] I have signed the MongoDB Contributor License Agreement (https://www.mongodb.com/legal/contributor-agreement)
 
 ## Motivation and Context
+
 <!--- Why is this change required? What problem does it solve? -->
-<!--- If it's updating a dependancy, link to the Pull Request that originally introduced the fix -->
+<!--- If it's updating a dependency, link to the Pull Request that originally introduced the fix -->
+
 - [ ] Bugfix
 - [ ] New feature
 - [ ] Dependency update
 - [ ] Misc
 
 ## Open Questions
+
 <!--- Any particular areas you'd like reviewers to pay attention to? -->
 
 ## Dependents
+
 <!--- If applicable, link PRs/commits that this PR is dependent on or is a dependency of. -->
 
 ## Types of changes
+
 <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
-- [ ] *Backport Needed*
+
+- [ ] _Backport Needed_
 - [ ] Patch (non-breaking change which fixes an issue)
 - [ ] Minor (non-breaking change which adds functionality)
 - [ ] Major (fix or feature that would cause existing functionality to change)

.github/workflows/update-dependencies.yaml

@@ -44,6 +44,8 @@ jobs:
     name: Update ${{ matrix.group_name }} to latest
     runs-on: ubuntu-latest
     needs: configure_matrix
+    env:
+      UPDATE_BRANCH_NAME: ci/update-${{ matrix.group_name }}
     strategy:
       matrix:
         group_name: ${{ fromJSON(needs.configure_matrix.outputs.group_name) }}
@@ -77,12 +79,36 @@ jobs:
       - name: Run "update dependencies" script
         run: npx compass-scripts update-dependencies preset-${{ matrix.group_name }}
 
+      # Conditionally performing a sparse checkout of the existing branch to compare changes
+      # and avoid the "create-pull-request" action force-pushing when changes aren't necessary.
+      # This also allows us pushing commits to the update branch to fix any breaking changes
+      # without risking these commits being overwritten by the action.
+      - name: Check existence of an existing branch
+        id: check-branch-exists
+        run: |
+          if git ls-remote --exit-code --heads origin ${{ env.UPDATE_BRANCH_NAME }}; then
+            echo "branch_exists=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "branch_exists=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Checkout existing branch
+        if: steps.check-branch-exists.outputs.branch_exists == 'true'
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.UPDATE_BRANCH_NAME }}
+          path: existing-branch-checkout
+          sparse-checkout: |
+            package-lock.json
+          sparse-checkout-cone-mode: false
+
       - name: Create Pull Request
+        if: steps.check-branch-exists.outputs.branch_exists == 'false' || hashFiles('package-lock.json') != hashFiles('existing-branch-checkout/package-lock.json')
         uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # 7.0.5
         with:
           token: ${{ steps.app-token.outputs.token }}
           commit-message: 'chore(deps): update ${{ matrix.group_name }} to latest'
-          branch: ci/update-${{ matrix.group_name }}
+          branch: ${{ env.UPDATE_BRANCH_NAME }}
           title: 'chore(deps): update ${{ matrix.group_name }} to latest'
           labels: |
             no-title-validation

.gitignore

@@ -35,3 +35,7 @@ config/*/.npmrc
 .sbom
 .logs
 .evergreen/logs
+
+# The update-dependencies workflow does a sparse checkout
+# and we don't want to include these files in the PRs it creates.
+existing-branch-checkout/

AUTHORS

@@ -118,3 +118,4 @@ Nick Larew <nick.larew@10gen.com>
 Shun Miyazawa <34241526+miya@users.noreply.github.com>
 Kyle Lai <122811196+kylelai1@users.noreply.github.com>
 carolynmcca <carolyn.mccawley@mongodb.com>
+Case Kramer <case.kramer@mongodb.com>