REP-6771 Update to Go driver v2 (#152)

The updates here are mostly mechanical. For example, `primitive.Timestamp` becomes `bson.Timestamp`, and `mongo.SessionContext` is now just `context.Context`.

One nontriviality is that, because the v2 driver removed some useful introspection APIs, the guard rails to check read & write concern are temporarily removed. They will be restored in REP-6772, once the driver re-adds those to driver v2.

Author: FGasper

.golangci.yml

@@ -28,7 +28,7 @@ linters:
           failOn: all
     govet:
       disable:
-        # Unkeyed primitive.E and timestamp fields are used extensively in code taken from
+        # Unkeyed bson.E and timestamp fields are used extensively in code taken from
         # mongosync.
         - composites
   exclusions:

dockey/agg.go

@@ -6,7 +6,7 @@ package dockey
 import (
 	"github.com/10gen/migration-verifier/mslices"
 	"github.com/samber/lo"
-	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 // ExtractTrueDocKeyAgg returns an aggregation expression that extracts the

dockey/raw.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/10gen/migration-verifier/mslices"
 	"github.com/pkg/errors"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/x/bsonx/bsoncore"
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/x/bsonx/bsoncore"
 )
 
 // ExtractTrueDocKeyFromDoc extracts the document key from a document
@@ -43,7 +43,7 @@ func ExtractTrueDocKeyFromDoc(
 		docBuilder.AppendValue(
 			field,
 			bsoncore.Value{
-				Type: val.Type,
+				Type: bsoncore.Type(val.Type),
 				Data: val.Value,
 			},
 		)

dockey/raw_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/10gen/migration-verifier/dockey/test"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 func TestExtractTrueDocKeyFromDoc(t *testing.T) {

dockey/test/cases.go

@@ -2,7 +2,7 @@ package test
 
 import (
 	"github.com/10gen/migration-verifier/mslices"
-	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 type TestCase struct {

go.mod

@@ -14,11 +14,12 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/quasilyte/go-ruleguard/dsl v0.3.22
 	github.com/rs/zerolog v1.34.0
-	github.com/samber/lo v1.47.0
+	github.com/samber/lo v1.52.0
 	github.com/samber/mo v1.13.0
 	github.com/stretchr/testify v1.10.0
 	github.com/urfave/cli v1.22.9
 	go.mongodb.org/mongo-driver v1.17.1
+	go.mongodb.org/mongo-driver/v2 v2.4.0
 	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
 	golang.org/x/sync v0.13.0
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
@@ -37,10 +38,10 @@ require (
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.26.0 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
+	github.com/golang/snappy v1.0.0 // indirect
 	github.com/huandu/go-clone v1.6.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.13.6 // indirect
+	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect

go.sum

@@ -8,8 +8,7 @@ import (
 	"math"
 	"math/bits"
 
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 // This is a direct port of the Javascript keystring decoder from
@@ -205,13 +204,13 @@ func readValue(ctype cType, version KeyStringVersion, buf *bufferConsumer) (any,
 	isNegative := false
 	switch ctype {
 	case kMinKey:
-		return primitive.MinKey{}, nil
+		return bson.MinKey{}, nil
 	case kMaxKey:
-		return primitive.MaxKey{}, nil
+		return bson.MaxKey{}, nil
 	case kNullish:
 		return nil, nil
 	case kUndefined:
-		return primitive.Undefined{}, nil
+		return bson.Undefined{}, nil
 	case kBoolTrue:
 		return true, nil
 	case kBoolFalse:
@@ -221,7 +220,7 @@ func readValue(ctype cType, version KeyStringVersion, buf *bufferConsumer) (any,
 		if err != nil {
 			return nil, err
 		}
-		return primitive.DateTime(dateTimeAsInt ^ (uint64(1) << 63)), nil
+		return bson.DateTime(dateTimeAsInt ^ (uint64(1) << 63)), nil
 	case kTimestamp:
 		t, err := buf.readUint32BE()
 		if err != nil {
@@ -231,9 +230,9 @@ func readValue(ctype cType, version KeyStringVersion, buf *bufferConsumer) (any,
 		if err != nil {
 			return nil, err
 		}
-		return primitive.Timestamp{T: t, I: i}, nil
+		return bson.Timestamp{T: t, I: i}, nil
 	case kOID:
-		var oid primitive.ObjectID
+		var oid bson.ObjectID
 		oidSlice, err := buf.readBytes(12)
 		if err != nil {
 			return nil, err
@@ -247,7 +246,7 @@ func readValue(ctype cType, version KeyStringVersion, buf *bufferConsumer) (any,
 		if err != nil {
 			return nil, err
 		}
-		return primitive.JavaScript(str), nil
+		return bson.JavaScript(str), nil
 	case kCodeWithScope:
 		code, err := buf.readCStringWithNuls()
 		if err != nil {
@@ -257,7 +256,7 @@ func readValue(ctype cType, version KeyStringVersion, buf *bufferConsumer) (any,
 		if err != nil {
 			return nil, err
 		}
-		return primitive.CodeWithScope{Code: primitive.JavaScript(code), Scope: scope}, nil
+		return bson.CodeWithScope{Code: bson.JavaScript(code), Scope: scope}, nil
 	case kBinData:
 		size8, err := buf.readUint8()
 		if err != nil {
@@ -279,7 +278,7 @@ func readValue(ctype cType, version KeyStringVersion, buf *bufferConsumer) (any,
 		if err != nil {
 			return nil, err
 		}
-		return primitive.Binary{Data: data, Subtype: subtype}, nil
+		return bson.Binary{Data: data, Subtype: subtype}, nil
 	case kRegEx:
 		pattern, err := buf.readCString()
 		if err != nil {
@@ -289,7 +288,7 @@ func readValue(ctype cType, version KeyStringVersion, buf *bufferConsumer) (any,
 		if err != nil {
 			return nil, err
 		}
-		return primitive.Regex{Pattern: pattern, Options: flags}, nil
+		return bson.Regex{Pattern: pattern, Options: flags}, nil
 	case kDBRef:
 		size, err := buf.readUint32BE()
 		if err != nil {
@@ -304,9 +303,9 @@ func readValue(ctype cType, version KeyStringVersion, buf *bufferConsumer) (any,
 		if err != nil {
 			return nil, err
 		}
-		var oid primitive.ObjectID
+		var oid bson.ObjectID
 		copy(oid[:], oidBytes)
-		return primitive.DBPointer{DB: ns, Pointer: oid}, nil // TODO: What happens to non-OID DBRefs?
+		return bson.DBPointer{DB: ns, Pointer: oid}, nil // TODO: What happens to non-OID DBRefs?
 	case kObject:
 		return keystringToBsonPartial(version, buf, modeNamed)
 	case kArray:

internal/keystring/keystring_decoder.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 type TestCase struct {

internal/keystring/keystring_test.go

@@ -6,8 +6,7 @@ import (
 	"github.com/10gen/migration-verifier/mslices"
 	"github.com/pkg/errors"
 	"github.com/samber/lo"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/bsontype"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 // -------------------------------------------------------------------------
@@ -61,7 +60,7 @@ var bsonTypeSortOrder = lo.Flatten(mslices.Of(
 	),
 ))
 
-var bsonTypeString = map[bsontype.Type]string{
+var bsonTypeString = map[bson.Type]string{
 	bson.TypeMinKey:           "minKey",
 	bson.TypeNull:             "null",
 	bson.TypeBoolean:          "bool",
@@ -91,7 +90,7 @@ var bsonTypeString = map[bsontype.Type]string{
 // This is kind of like strings.Cut() but against the sort-ordered list of BSON
 // types, except that if the given value is a number or string-like, then other
 // “like” types will not be in the returned slices.
-func getTypeBracketExcludedBSONTypes(val any) ([]bsontype.Type, []bsontype.Type, error) {
+func getTypeBracketExcludedBSONTypes(val any) ([]bson.Type, []bson.Type, error) {
 	bsonType, _, err := bson.MarshalValue(val)
 	if err != nil {
 		return nil, nil, errors.Wrapf(err, "marshaling min value (%v)", val)
@@ -123,10 +122,10 @@ func getTypeBracketExcludedBSONTypes(val any) ([]bsontype.Type, []bsontype.Type,
 	return earlier, later, nil
 }
 
-func typesToStrings(in []bsontype.Type) []string {
+func typesToStrings(in []bson.Type) []string {
 	return lo.Map(
 		in,
-		func(t bsontype.Type, _ int) string {
+		func(t bson.Type, _ int) string {
 			return bsonTypeString[t]
 		},
 	)