Resolve merge conflicts

Author: prestonvasquez

.evergreen/config.yml

@@ -195,7 +195,6 @@ functions:
 
   run-tests:
     - command: subprocess.exec
-      type: test
       params:
         binary: bash
         env:
@@ -216,6 +215,7 @@ functions:
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
+      retry_on_failure: true
       params:
         binary: bash
         args: [*task-runner, "${DEFAULT_TASK}" ]
@@ -231,28 +231,6 @@ functions:
           HEAD_SHA: "${github_commit}"
         args: [*task-runner, api-report]
 
-  "add PR labels":
-    - command: subprocess.exec
-      type: test
-      params:
-        binary: bash
-        add_expansions_to_env: true
-        env:
-          COMMIT: "${github_commit}"
-          PR_TASK: apply-labels
-        args: [*task-runner, pr-task]
-
-  "add PR reviewer":
-    - command: subprocess.exec
-      type: test
-      params:
-        binary: bash
-        add_expansions_to_env: true
-        env:
-          COMMIT: "${github_commit}"
-          PR_TASK: assign-reviewer
-        args: [*task-runner, pr-task]
-
   "backport pr":
     - command: subprocess.exec
       type: test
@@ -297,12 +275,24 @@ functions:
           echo "Response Body: $response_body"
           echo "HTTP Status: $http_status"
 
+  send-perf-pr-comment:
+    - command: subprocess.exec
+      type: test
+      params:
+        binary: bash
+        add_expansions_to_env: true
+        env:
+          VERSION_ID: ${version_id}
+          BASE_SHA: "${revision}"
+          HEAD_SHA: "${github_commit}"
+        include_expansions_in_env: [PERF_URI_PRIVATE_ENDPOINT]
+        args: [*task-runner, perf-pr-comment]
+
   run-enterprise-auth-tests:
     - command: ec2.assume_role
       params:
         role_arn: "${aws_test_secrets_role}"
     - command: subprocess.exec
-      type: test
       params:
         binary: bash
         include_expansions_in_env: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
@@ -311,6 +301,7 @@ functions:
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
+      retry_on_failure: true
       params:
         binary: bash
         args: [*task-runner, --silent, evg-test-enterprise-auth]
@@ -320,7 +311,6 @@ functions:
       params:
         role_arn: "${aws_test_secrets_role}"
     - command: subprocess.exec
-      type: test
       params:
         binary: bash
         include_expansions_in_env: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
@@ -329,6 +319,7 @@ functions:
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
+      retry_on_failure: true
       params:
         binary: bash
         args: [*task-runner, --silent, evg-test-enterprise-auth]
@@ -338,7 +329,6 @@ functions:
       params:
         role_arn: "${aws_test_secrets_role}"
     - command: subprocess.exec
-      type: test
       params:
         binary: bash
         include_expansions_in_env: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
@@ -347,13 +337,13 @@ functions:
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
+      retry_on_failure: true
       params:
         binary: bash
         args: [*task-runner, test-atlas-connect]
 
   run-ocsp-test:
     - command: subprocess.exec
-      type: test
       params:
         binary: bash
         env:
@@ -364,14 +354,14 @@ functions:
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
+      retry_on_failure: true
       params:
         binary: bash
         include_expansions_in_env: [OCSP_TLS_SHOULD_SUCCEED]
         args: [*task-runner, evg-test-ocsp]
 
   run-versioned-api-test:
     - command: subprocess.exec
-      type: test
       params:
         binary: bash
         env:
@@ -381,13 +371,13 @@ functions:
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
+      retry_on_failure: true
       params:
         binary: bash
         args: [*task-runner, evg-test-versioned-api]
 
   run-load-balancer-tests:
     - command: subprocess.exec
-      type: test
       params:
         binary: bash
         include_expansions_in_env: [SINGLE_MONGOS_LB_URI, MULTI_MONGOS_LB_URI, AUTH, SSL, MONGO_GO_DRIVER_COMPRESSOR]
@@ -396,13 +386,13 @@ functions:
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
+      retry_on_failure: true
       params:
         binary: bash
         args: [*task-runner, evg-test-load-balancers]
 
   run-atlas-data-lake-test:
     - command: subprocess.exec
-      type: test
       params:
         binary: "bash"
         env:
@@ -413,6 +403,7 @@ functions:
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
+      retry_on_failure: true
       params:
         binary: "bash"
         args: [*task-runner, evg-test-atlas-data-lake]
@@ -595,7 +586,6 @@ functions:
 
   run-kms-tls-test:
     - command: subprocess.exec
-      type: test
       params:
         binary: "bash"
         env:
@@ -605,14 +595,14 @@ functions:
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
+      retry_on_failure: true
       params:
         binary: "bash"
         include_expansions_in_env: [KMS_TLS_TESTCASE]
         args: [*task-runner, evg-test-kms]
 
   run-kmip-tests:
     - command: subprocess.exec
-      type: test
       params:
         binary: "bash"
         env:
@@ -622,6 +612,7 @@ functions:
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
+      retry_on_failure: true
       params:
         binary: "bash"
         env:
@@ -630,7 +621,6 @@ functions:
 
   run-retry-kms-requests:
     - command: subprocess.exec
-      type: test
       params:
         binary: "bash"
         env:
@@ -640,6 +630,7 @@ functions:
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
+      retry_on_failure: true
       params:
         binary: "bash"
         env:
@@ -670,12 +661,18 @@ tasks:
           binary: bash
           args: [*task-runner, check-fmt, check-license, check-modules, lint]
 
+  - name: govulncheck
+    tags: ["static-analysis"]
+    commands:
+      - command: subprocess.exec
+        params:
+          binary: bash
+          args: [*task-runner, govulncheck]
+
   - name: pull-request-helpers
     allowed_requesters: ["patch", "github_pr"]
     commands:
       - func: assume-test-secrets-ec2-role
-      - func: "add PR reviewer"
-      - func: "add PR labels"
       - func: "create-api-report"
 
   - name: backport-pr
@@ -698,7 +695,9 @@ tasks:
         params:
           binary: bash
           args: [*task-runner, driver-benchmark]
+      - func: assume-test-secrets-ec2-role
       - func: send-perf-data
+      - func: send-perf-pr-comment
 
   - name: test-standalone-noauth-nossl
     tags: ["test", "standalone"]
@@ -2111,8 +2110,9 @@ task_groups:
         params:
           working_dir: src/go.mongodb.org/mongo-driver
           binary: bash
-          add_expansions_to_env: true
+          include_expansions_in_env: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
           env:
+            MONGODB_VERSION: ${VERSION}
             LAMBDA_STACK_NAME: dbx-go-lambda
           args:
             - ${DRIVERS_TOOLS}/.evergreen/atlas/setup.sh
@@ -2137,12 +2137,14 @@ task_groups:
   - name: test-search-index-task-group
     setup_group:
       - func: setup-system
+      - func: assume-test-secrets-ec2-role
       - command: subprocess.exec
         params:
           working_dir: src/go.mongodb.org/mongo-driver
           binary: bash
+          include_expansions_in_env: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
           env:
-            MONGODB_VERSION: "7.0"
+            MONGODB_VERSION: ${VERSION}
             LAMBDA_STACK_NAME: dbx-go-lambda
           args:
             - ${DRIVERS_TOOLS}/.evergreen/atlas/setup.sh

.github/labeler.yml

@@ -1,15 +1,14 @@
-
-priority-3-low:
+review-priority-normal:
 - changed-files:
   - any-glob-to-any-file: '*'
 
 documentation:
 - changed-files:
-  - any-glob-to-any-file: 
+  - any-glob-to-any-file:
     - docs/**
     - examples/**
 
 dependencies:
 - changed-files:
-  - any-glob-to-any-file: 
+  - any-glob-to-any-file:
     - go.mod

.github/release.yml

@@ -2,20 +2,24 @@ changelog:
   exclude:
     labels:
       - ignore-for-release
+      - github_actions
       - submodules
     authors:
       - mongodb-drivers-pr-bot
   categories:
-    - title: Breaking Changes 🛠
+    - title: ⚠️ Breaking Changes
       labels:
-        - breaking-change
-    - title: New Features
+        - breaking
+    - title: ✨ New Features
       labels:
         - enhancement
-    - title: Fixed
+        - feature
+    - title: 🐛 Fixed
       labels:
         - bug
-        - fixed
-    - title: Other Changes
+    - title: 📦 Dependency Updates
+      labels:
+        - dependencies
+    - title: 📝 Other Changes
       labels:
         - "*"

.github/reviewers.txt

@@ -0,0 +1,19 @@
+name: Label Checker
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - labeled
+      - unlabeled
+
+jobs:
+  check_labels:
+    name: Check labels
+    runs-on: ubuntu-latest
+    steps:
+      - uses: docker://agilepathway/pull-request-label-checker:latest
+        with:
+          one_of: bug,feature,enhancement,documentation,dependencies
+          repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/check-labels.yml

@@ -2,9 +2,19 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "v1", "cloud-*", "master", "release/*" ]
+    branches:
+      - "v1"
+      - "cloud-*"
+      - "master"
+      - "release/*"
+      - "feature/*"
   pull_request:
-    branches: [ "v1", "cloud-*", "master", "release/*" ]
+    branches:
+      - "v1"
+      - "cloud-*"
+      - "master"
+      - "release/*"
+      - "feature/*"
   schedule:
     - cron: '36 17 * * 0'
   workflow_call:
@@ -24,7 +34,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/codeql.yml

@@ -0,0 +1,12 @@
+name: "Pull Request Labeler"
+on:
+  - pull_request_target
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/labeler@v5