Merge branch 'master' of https://github.com/mongodb/mongo-go-driver into GODRIVER-3102-3

Author: zhouselena

.evergreen/config.yml

@@ -657,6 +657,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:

Taskfile.yml

@@ -85,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. ###

etc/govulncheck.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -ex
+
+# Use a specific Go version so that local govulncheck results are consistent
+# with CI results.
+#
+# Note: this needs to be updated if the listed Go version has vulnerabilities
+# discovered because they will show up in the scan results along with Go Driver
+# and dependency vulnerabilities.
+GO_VERSION=1.24.5
+
+go install golang.org/dl/go$GO_VERSION@latest
+go${GO_VERSION} download
+go install golang.org/x/vuln/cmd/govulncheck@latest
+
+# govulncheck uses the Go binary it finds from the PATH, so modify PATH to point
+# to the Go version we just downloaded.
+PATH="$(go${GO_VERSION} env GOROOT)/bin:$PATH" govulncheck -show verbose ./...

internal/spectest/skip.go

@@ -212,21 +212,6 @@ var skipTests = map[string][]string{
 	// TODO(GODRIVER-2016): Convert transactions spec tests to unified test
 	// format.
 	"Convert transactions spec tests to unified test format (GODRIVER-2016)": {
-		"TestUnifiedSpec/transactions/tests/unified/error-labels.json/do_not_add_UnknownTransactionCommitResult_label_to_MaxTimeMSExpired_inside_transaction",
-		"TestUnifiedSpec/transactions/tests/unified/error-labels.json/do_not_add_UnknownTransactionCommitResult_label_to_MaxTimeMSExpired_inside_transactions",
-		"TestUnifiedSpec/transactions/tests/unified/error-labels.json/add_UnknownTransactionCommitResult_label_to_MaxTimeMSExpired",
-		"TestUnifiedSpec/transactions/tests/unified/error-labels.json/add_UnknownTransactionCommitResult_label_to_writeConcernError_MaxTimeMSExpired",
-		"TestUnifiedSpec/transactions/tests/unified/retryable-commit.json/commitTransaction_applies_majority_write_concern_on_retries",
-		"TestUnifiedSpec/transactions/tests/unified/run-command.json/run_command_with_secondary_read_preference_in_client_option_and_primary_read_preference_in_transaction_options",
-		"TestUnifiedSpec/transactions/tests/unified/transaction-options.json/transaction_options_inherited_from_client",
-		"TestUnifiedSpec/transactions/tests/unified/transaction-options.json/transaction_options_inherited_from_defaultTransactionOptions",
-		"TestUnifiedSpec/transactions/tests/unified/transaction-options.json/startTransaction_options_override_defaults",
-		"TestUnifiedSpec/transactions/tests/unified/transaction-options.json/defaultTransactionOptions_override_client_options",
-		"TestUnifiedSpec/transactions/tests/unified/transaction-options.json/readConcern_local_in_defaultTransactionOptions",
-		"TestUnifiedSpec/transactions/tests/unified/transaction-options.json/readPreference_inherited_from_client",
-		"TestUnifiedSpec/transactions/tests/unified/transaction-options.json/readPreference_inherited_from_defaultTransactionOptions",
-		"TestUnifiedSpec/transactions/tests/unified/transaction-options.json/startTransaction_overrides_readPreference",
-		"TestUnifiedSpec/transactions/tests/unified/retryable-commit.json/commitTransaction_fails_after_Interrupted",
 		"TestUnifiedSpec/transactions-convenient-api/tests/unified/callback-retry.json/callback_is_not_retried_after_non-transient_error_(DuplicateKeyError)",
 		"TestUnifiedSpec/transactions-convenient-api/tests/unified/callback-retry.json/callback_succeeds_after_multiple_connection_errors",
 		"TestUnifiedSpec/transactions-convenient-api/tests/unified/commit-retry.json/commitTransaction_retry_only_overwrites_write_concern_w_option",