Resolve conflicts in master

* master: (65 commits)
  Replace all uses of 'interface{}' with 'any' in the bson package. (#2138)
  GODRIVER-3473 Short-cicruit cursor.next() on invalid timeouts (#2135)
  GODRIVER-3622 Automatically retry some test tasks. (#2147)
  Replace all uses of 'interface{}' with 'any' in the repo docs. (#2142)
  GODRIVER-3102: Perf comparison (#2134)
  GODRIVER-3587 Use raw bytes in valueReader (#2120)
  Replace all uses of 'interface{}' with 'any' in the internal/ packages. (#2140)
  Replace all uses of 'interface{}' with 'any' in the x/ packages. (#2137)
  GODRIVER-2016 Unskip all Transactions unified spec tests. (#2132)
  GODRIVER-2540 Run govulncheck in CI builds. (#2136)
  GODRIVER-3549 Update Client BulkWrite prose tests. (#2131)
  Add guidelines for contributing features to the Go Driver (#2125)
  Bump alcaeus/automatic-merge-up-action from 1.0.0 to 1.0.1 in the actions group (#2126)
  Add wrappedMsgOnly to mongo.MarshalError and mongo.MongocryptError.
  Bump testdata/specifications from `db69351` to `6689929`
  fix wiremessage oob in case of intmin (#2076)
  GODRIVER-3399: PoolClearedError should have TransientTransactionError label appended to it (#2114)
  PR feedback.
  Prevent integration tests from running when testing with -short
  Skip AWS Test if no URI (#2102)
  ...

Author: alcaeus

.evergreen/config.yml

@@ -195,7 +195,6 @@ functions:
 
   run-tests:
     - command: subprocess.exec
-      type: test
       params:
         binary: bash
         env:
@@ -204,6 +203,7 @@ functions:
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
+      retry_on_failure: true
       params:
         binary: bash
         args: [*task-runner, "${DEFAULT_TASK}" ]
@@ -263,12 +263,21 @@ functions:
           echo "Response Body: $response_body"
           echo "HTTP Status: $http_status"
 
+  send-perf-pr-comment:
+    - command: subprocess.exec
+      type: test
+      params:
+        binary: bash
+        env:
+          VERSION_ID: ${version_id}
+        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]
@@ -277,6 +286,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]
@@ -286,7 +296,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]
@@ -295,6 +304,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]
@@ -304,7 +314,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]
@@ -313,13 +322,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: 
@@ -330,14 +339,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: 
@@ -347,13 +356,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]
@@ -362,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-load-balancers]
 
   run-atlas-data-lake-test:
     - command: subprocess.exec
-      type: test
       params:
         binary: "bash"
         env: 
@@ -379,6 +388,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]
@@ -550,7 +560,6 @@ functions:
 
   run-kms-tls-test:
     - command: subprocess.exec
-      type: test
       params:
         binary: "bash"
         env: 
@@ -560,14 +569,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: 
@@ -577,6 +586,7 @@ functions:
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
+      retry_on_failure: true
       params:
         binary: "bash"
         env:
@@ -585,7 +595,6 @@ functions:
 
   run-retry-kms-requests:
     - command: subprocess.exec
-      type: test
       params:
         binary: "bash"
         env: 
@@ -595,6 +604,7 @@ functions:
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
+      retry_on_failure: true
       params:
         binary: "bash"
         env:
@@ -625,6 +635,14 @@ 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:
@@ -652,6 +670,7 @@ tasks:
           binary: bash
           args: [*task-runner, driver-benchmark]
       - func: send-perf-data
+      - func: send-perf-pr-comment
 
   - name: test-standalone-noauth-nossl
     tags: ["test", "standalone"]

.github/workflows/merge-up.yml

@@ -27,7 +27,7 @@ jobs:
 
       - name: Create pull request
         id: create-pull-request
-        uses: alcaeus/automatic-merge-up-action@1.0.0
+        uses: alcaeus/automatic-merge-up-action@1.0.1
         with:
           ref: ${{ github.ref_name }}
           branchNamePattern: 'release/<major>.<minor>'

.github/workflows/scorecard.yml

@@ -0,0 +1,78 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '24 21 * * 1'
+  push:
+    branches: [ "master" ]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    # `publish_results: true` only works when run from the default branch. conditional can be removed if disabled.
+    if: github.event.repository.default_branch == github.ref_name || github.event_name == 'pull_request'
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      # Uncomment the permissions below if installing in a private repository.
+      # contents: read
+      # actions: read
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecard on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: true
+
+          # (Optional) Uncomment file_mode if you have a .gitattributes with files marked export-ignore
+          # file_mode: git
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard (optional).
+      # Commenting out will disable upload of results to your repo's Code Scanning dashboard
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: results.sarif

.pre-commit-config.yaml

@@ -65,3 +65,9 @@ repos:
     require_serial: true
     pass_filenames: false
     entry: etc/golangci-lint.sh
+
+  - id: check-licenses
+    name: check-licenses
+    language: system
+    types: [go]
+    entry: etc/check_license.sh

README.md

@@ -4,6 +4,9 @@
   <a href="https://pkg.go.dev/go.mongodb.org/mongo-driver/v2/mongo"><img src="etc/assets/godev-mongo-blue.svg" alt="docs"></a>
   <a href="https://pkg.go.dev/go.mongodb.org/mongo-driver/v2/bson"><img src="etc/assets/godev-bson-blue.svg" alt="docs"></a>
   <a href="https://www.mongodb.com/docs/drivers/go/current/"><img src="etc/assets/docs-mongodb-green.svg"></a>
+  <a href="https://securityscorecards.dev/viewer/?uri=github.com/mongodb/mongo-go-driver">
+    <img src="https://api.securityscorecards.dev/projects/github.com/mongodb/mongo-go-driver/badge" alt="OpenSSF Scorecard" />
+  </a>
 </p>
 
 # MongoDB Go Driver
@@ -15,9 +18,11 @@ See the following resources to learn more about upgrading from version 1.x to 2.
 - [v2.0 Migration Guide](docs/migration-2.0.md)
 - [v2.0 What's New](https://www.mongodb.com/docs/drivers/go/upcoming/whats-new/#what-s-new-in-2.0)
 
+The MongoDB Go driver follows [semantic versioning](https://semver.org/) for its releases.
+
 ## Requirements
 
-- Go 1.18 or higher. We aim to support the latest versions of Go.
+- Go 1.19 or higher. We aim to support the latest versions of Go.
 - Go 1.23 or higher is required to run the driver test suite.
 - MongoDB 4.0 and higher.
 

Taskfile.yml

@@ -34,7 +34,7 @@ tasks:
 
   build-compile-check-all: bash etc/run-compile-check-test.sh
 
-  build-aws-ecs-test: go build ${BUILD_TAGS} ./internal/cmd/testaws/main.go
+  build-aws-ecs-test: go test -c ./internal/test/aws -o aws.testbin
 
   cross-compile: 
     - GOOS=linux GOARCH=386 go build ./...
@@ -70,6 +70,8 @@ tasks:
 
   pr-task: bash etc/pr-task.sh
 
+  perf-pr-comment: bash etc/perf-pr-comment.sh
+
   # Lint with various GOOS and GOARCH tasks to catch static analysis failures that may only affect
   # specific operating systems or architectures. For example, staticcheck will only check for 64-bit
   # alignment of atomically accessed variables on 32-bit architectures (see
@@ -83,6 +85,8 @@ tasks:
       - GOOS=linux GOARCH=ppc64le etc/golangci-lint.sh
       - GOOS=linux GOARCH=s390x etc/golangci-lint.sh
 
+  govulncheck: bash etc/govulncheck.sh
+
   update-notices: bash etc/generate_notices.pl > THIRD-PARTY-NOTICES
 
   ### Local testing tasks. ###