Merge remote-tracking branch 'origin/master' into GODRIVER-3241

Author: joyjwang

.evergreen/config.yml

@@ -299,7 +299,7 @@ functions:
       params:
         shell: "bash"
         working_dir: src/go.mongodb.org/mongo-driver
-        include_expansions_in_env: ["TOPOLOGY", "AUTH", "SSL", "MONGODB_URI", "CRYPT_SHARED_LIB_PATH", "SKIP_CRYPT_SHARED_LIB", "RACE", "MONGO_GO_DRIVER_COMPRESSOR", "REQUIRE_API_VERSION", "LOAD_BALANCER"]
+        include_expansions_in_env: ["TOPOLOGY", "AUTH", "SSL", "SKIP_CSOT_TESTS", "MONGODB_URI", "CRYPT_SHARED_LIB_PATH", "SKIP_CRYPT_SHARED_LIB", "RACE", "MONGO_GO_DRIVER_COMPRESSOR", "REQUIRE_API_VERSION", "LOAD_BALANCER"]
         script: |
           ${PREPARE_SHELL}
           bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
@@ -2005,6 +2005,8 @@ axes:
           GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
           GO_DIST: "C:\\golang\\go1.22"
           VENV_BIN_DIR: "Scripts"
+          # CSOT tests are unreliable on our slow Windows hosts.
+          SKIP_CSOT_TESTS: true
       - id: "rhel87-64"
         display_name: "RHEL 8.7"
         run_on: rhel8.7-large
@@ -2016,6 +2018,8 @@ axes:
         batchtime: 1440 # Run at most once per 24 hours.
         variables:
           GO_DIST: "/opt/golang/go1.22"
+          # CSOT tests are unreliable on our slow macOS hosts.
+          SKIP_CSOT_TESTS: true
 
   # OSes that require >= 4.0 for SSL
   - id: os-ssl-40
@@ -2029,6 +2033,8 @@ axes:
           GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
           GO_DIST: "C:\\golang\\go1.22"
           VENV_BIN_DIR: "Scripts"
+          # CSOT tests are unreliable on our slow Windows hosts.
+          SKIP_CSOT_TESTS: true
       - id: "rhel87-64"
         display_name: "RHEL 8.7"
         run_on: rhel8.7-large
@@ -2040,6 +2046,8 @@ axes:
         batchtime: 1440 # Run at most once per 24 hours.
         variables:
           GO_DIST: "/opt/golang/go1.22"
+          # CSOT tests are unreliable on our slow macOS hosts.
+          SKIP_CSOT_TESTS: true
 
   - id: ocsp-rhel-87
     display_name: OS
@@ -2061,6 +2069,8 @@ axes:
           GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
           GO_DIST: "C:\\golang\\go1.22"
           SKIP_ECS_AUTH_TEST: true
+          # CSOT tests are unreliable on our slow Windows hosts.
+          SKIP_CSOT_TESTS: true
       - id: "ubuntu2004-64"
         display_name: "Ubuntu 20.04"
         run_on: ubuntu2004-test
@@ -2075,6 +2085,8 @@ axes:
           SKIP_ECS_AUTH_TEST: true
           SKIP_EC2_AUTH_TEST: true
           SKIP_WEB_IDENTITY_AUTH_TEST: true
+          # CSOT tests are unreliable on our slow macOS hosts.
+          SKIP_CSOT_TESTS: true
 
   - id: os-faas-80
     display_name: OS
@@ -2348,6 +2360,7 @@ buildvariants:
     run_on:
       - rhel8.7-small
     expansions:
+      # Keep this in sync with go version used in etc/golangci-lint.sh
       GO_DIST: "/opt/golang/go1.22"
     tasks:
       - name: ".static-analysis"
@@ -2386,7 +2399,7 @@ buildvariants:
     run_on:
       - rhel8.7-small
     expansions:
-      GO_DIST: "/opt/golang/go1.20"
+      GO_DIST: "/opt/golang/go1.22"
     tasks: 
       - name: "backport-pr"
 

.evergreen/run-tests.sh

@@ -87,6 +87,7 @@ fi
 
 AUTH=${AUTH} \
 SSL=${SSL} \
+SKIP_CSOT_TESTS=${SKIP_CSOT_TESTS} \
 MONGO_GO_DRIVER_CA_FILE=${MONGO_GO_DRIVER_CA_FILE} \
 MONGO_GO_DRIVER_KEY_FILE=${MONGO_GO_DRIVER_KEY_FILE} \
 MONGO_GO_DRIVER_PKCS8_ENCRYPTED_KEY_FILE=${MONGO_GO_DRIVER_PKCS8_ENCRYPTED_KEY_FILE} \

.github/workflows/test.yml

@@ -18,4 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
+      - uses: actions/setup-go@v5
+        with:
+          go-version: 'stable'
       - uses: pre-commit/[email protected]

.pre-commit-config.yaml

@@ -50,15 +50,18 @@ repos:
     - id: markdown-link-check
       exclude: ^(vendor)
 
-- repo: https://github.com/golangci/golangci-lint
-  rev: v1.60.1
-  hooks:
-  - id: golangci-lint
-
 - repo: local
   hooks:
   - id: executable-shell
     name: executable-shell
     entry: chmod +x
     language: system
     types: [shell]
+
+  - id: golangci-lint
+    name: golangci-lint
+    language: system
+    types: [go]
+    require_serial: true
+    pass_filenames: false
+    entry: etc/golangci-lint.sh

Taskfile.yml

@@ -57,14 +57,13 @@ tasks:
   # alignment of atomically accessed variables on 32-bit architectures (see
   # https://staticcheck.io/docs/checks#SA1027)
   lint: 
-    deps: [install-golangci-lint]
     cmds:
-      - GOOS=linux GOARCH=386 golangci-lint run --config .golangci.yml ./...
-      - GOOS=linux GOARCH=arm golangci-lint run --config .golangci.yml ./...
-      - GOOS=linux GOARCH=arm64 golangci-lint run --config .golangci.yml ./...
-      - GOOS=linux GOARCH=amd64 golangci-lint run --config .golangci.yml ./...
-      - GOOS=linux GOARCH=ppc64le golangci-lint run --config .golangci.yml ./...
-      - GOOS=linux GOARCH=s390x golangci-lint run --config .golangci.yml ./...
+      - GOOS=linux GOARCH=386 etc/golangci-lint.sh
+      - GOOS=linux GOARCH=arm etc/golangci-lint.sh
+      - GOOS=linux GOARCH=arm64 etc/golangci-lint.sh
+      - GOOS=linux GOARCH=amd64 etc/golangci-lint.sh
+      - GOOS=linux GOARCH=ppc64le etc/golangci-lint.sh
+      - GOOS=linux GOARCH=s390x etc/golangci-lint.sh
 
   update-notices: bash etc/generate_notices.pl > THIRD-PARTY-NOTICES
 
@@ -188,10 +187,3 @@ tasks:
     internal: true
     cmds:
       - go install github.com/walle/lll/...@latest
-
-  # NOTE: A golangci-lint version is also pinned in .pre-commit-config.yaml. Make
-  # sure to change it there to keep it in-sync with what's used here!
-  install-golangci-lint:
-    internal: true
-    cmds:
-      - go install github.com/golangci/golangci-lint/cmd/[email protected]

docs/migration-2.0.md

@@ -627,6 +627,10 @@ for _, set := range options.Client().ApplyURI(uri).Opts {
 return clientOptionAdder{option: &opts}
 ```
 
+### DeleteManyOptions / DeleteOneOptions
+
+The `DeleteOptions` has been separated into `DeleteManyOptions` and `DeleteOneOptions` to configure the corresponding `DeleteMany` and `DeleteOne` operations.
+
 ### FindOneOptions
 
 The following types are not valid for a `findOne` operation and have been removed:
@@ -636,6 +640,10 @@ The following types are not valid for a `findOne` operation and have been remove
 - `MaxAwaitTime`
 - `NoCursorTimeout`
 
+### UpdateManyOptions / UpdateOneOptions
+
+The `UpdateOptions` has been separated into `UpdateManyOptions` and `UpdateOneOptions` to configure the corresponding `UpdateMany` and `UpdateOne` operations.
+
 ### Merge\*Options
 
 All functions that merge options have been removed in favor of a generic solution. See [GODRIVER-2696](https://jira.mongodb.org/browse/GODRIVER-2696) for more information.

etc/golangci-lint.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -ex
+
+# Unset the cross-compiler overrides while downloading binaries.
+GOOS_ORIG=${GOOS:-}
+export GOOS=
+GOARCH_ORIG=${GOARCH:-}
+export GOARCH=
+
+# Keep this in sync with go version used in static-analysis Evergreen build variant.
+go install golang.org/dl/go1.22.7@latest
+go1.22.7 download
+export PATH="$(go1.22.7 env GOROOT)/bin:$PATH"
+go install github.com/golangci/golangci-lint/cmd/[email protected]
+
+export GOOS=$GOOS_ORIG
+export GOARCH=$GOARCH_ORIG
+golangci-lint run --config .golangci.yml ./...

internal/failpoint/failpoint.go

@@ -0,0 +1,63 @@
+// Copyright (C) MongoDB, Inc. 2024-present.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+package failpoint
+
+import (
+	"go.mongodb.org/mongo-driver/v2/bson"
+)
+
+const (
+	// ModeAlwaysOn is the fail point mode that enables the fail point for an
+	// indefinite number of matching commands.
+	ModeAlwaysOn = "alwaysOn"
+
+	// ModeOff is the fail point mode that disables the fail point.
+	ModeOff = "off"
+)
+
+// FailPoint is used to configure a server fail point. It is intended to be
+// passed as the command argument to RunCommand.
+//
+// For more information about fail points, see
+// https://github.com/mongodb/specifications/tree/HEAD/source/transactions/tests#server-fail-point
+type FailPoint struct {
+	ConfigureFailPoint string `bson:"configureFailPoint"`
+	// Mode should be a string, FailPointMode, or map[string]interface{}
+	Mode interface{} `bson:"mode"`
+	Data Data        `bson:"data"`
+}
+
+// Mode configures when a fail point will be enabled. It is used to set the
+// FailPoint.Mode field.
+type Mode struct {
+	Times int32 `bson:"times"`
+	Skip  int32 `bson:"skip"`
+}
+
+// Data configures how a fail point will behave. It is used to set the
+// FailPoint.Data field.
+type Data struct {
+	FailCommands                  []string           `bson:"failCommands,omitempty"`
+	CloseConnection               bool               `bson:"closeConnection,omitempty"`
+	ErrorCode                     int32              `bson:"errorCode,omitempty"`
+	FailBeforeCommitExceptionCode int32              `bson:"failBeforeCommitExceptionCode,omitempty"`
+	ErrorLabels                   *[]string          `bson:"errorLabels,omitempty"`
+	WriteConcernError             *WriteConcernError `bson:"writeConcernError,omitempty"`
+	BlockConnection               bool               `bson:"blockConnection,omitempty"`
+	BlockTimeMS                   int32              `bson:"blockTimeMS,omitempty"`
+	AppName                       string             `bson:"appName,omitempty"`
+}
+
+// WriteConcernError is the write concern error to return when the fail point is
+// triggered. It is used to set the FailPoint.Data.WriteConcernError field.
+type WriteConcernError struct {
+	Code        int32     `bson:"code"`
+	Name        string    `bson:"codeName"`
+	Errmsg      string    `bson:"errmsg"`
+	ErrorLabels *[]string `bson:"errorLabels,omitempty"`
+	ErrInfo     bson.Raw  `bson:"errInfo,omitempty"`
+}

internal/integration/change_stream_test.go

@@ -17,6 +17,7 @@ import (
 	"go.mongodb.org/mongo-driver/v2/event"
 	"go.mongodb.org/mongo-driver/v2/internal/assert"
 	"go.mongodb.org/mongo-driver/v2/internal/eventtest"
+	"go.mongodb.org/mongo-driver/v2/internal/failpoint"
 	"go.mongodb.org/mongo-driver/v2/internal/integration/mtest"
 	"go.mongodb.org/mongo-driver/v2/internal/require"
 	"go.mongodb.org/mongo-driver/v2/mongo"
@@ -523,12 +524,12 @@ func TestChangeStream_ReplicaSet(t *testing.T) {
 				SetReadConcern(mtest.MajorityRc).
 				SetRetryReads(false))
 
-			mt.SetFailPoint(mtest.FailPoint{
+			mt.SetFailPoint(failpoint.FailPoint{
 				ConfigureFailPoint: "failCommand",
-				Mode: mtest.FailPointMode{
+				Mode: failpoint.Mode{
 					Times: 1,
 				},
-				Data: mtest.FailPointData{
+				Data: failpoint.Data{
 					FailCommands:    []string{"aggregate"},
 					CloseConnection: true,
 				},
@@ -546,12 +547,12 @@ func TestChangeStream_ReplicaSet(t *testing.T) {
 				SetReadConcern(mtest.MajorityRc).
 				SetRetryReads(false))
 
-			mt.SetFailPoint(mtest.FailPoint{
+			mt.SetFailPoint(failpoint.FailPoint{
 				ConfigureFailPoint: "failCommand",
-				Mode: mtest.FailPointMode{
+				Mode: failpoint.Mode{
 					Times: 1,
 				},
-				Data: mtest.FailPointData{
+				Data: failpoint.Data{
 					FailCommands:    []string{"getMore"},
 					CloseConnection: true,
 				},
@@ -574,12 +575,12 @@ func TestChangeStream_ReplicaSet(t *testing.T) {
 				SetPoolMonitor(tpm.PoolMonitor).
 				SetRetryReads(true))
 
-			mt.SetFailPoint(mtest.FailPoint{
+			mt.SetFailPoint(failpoint.FailPoint{
 				ConfigureFailPoint: "failCommand",
-				Mode: mtest.FailPointMode{
+				Mode: failpoint.Mode{
 					Times: 2,
 				},
-				Data: mtest.FailPointData{
+				Data: failpoint.Data{
 					FailCommands:    []string{"aggregate"},
 					CloseConnection: true,
 				},

internal/integration/client_test.go

@@ -20,6 +20,7 @@ import (
 	"go.mongodb.org/mongo-driver/v2/event"
 	"go.mongodb.org/mongo-driver/v2/internal/assert"
 	"go.mongodb.org/mongo-driver/v2/internal/eventtest"
+	"go.mongodb.org/mongo-driver/v2/internal/failpoint"
 	"go.mongodb.org/mongo-driver/v2/internal/handshake"
 	"go.mongodb.org/mongo-driver/v2/internal/integration/mtest"
 	"go.mongodb.org/mongo-driver/v2/internal/integtest"
@@ -678,10 +679,10 @@ func TestClient(t *testing.T) {
 				_, err := mt.Coll.InsertOne(context.Background(), bson.D{})
 				require.NoError(mt, err)
 
-				mt.SetFailPoint(mtest.FailPoint{
+				mt.SetFailPoint(failpoint.FailPoint{
 					ConfigureFailPoint: "failCommand",
-					Mode:               "alwaysOn",
-					Data: mtest.FailPointData{
+					Mode:               failpoint.ModeAlwaysOn,
+					Data: failpoint.Data{
 						FailCommands:    []string{"find", "insert"},
 						BlockConnection: true,
 						BlockTimeMS:     500,