GODRIVER-2690 Set minimum supported Go version to 1.18 in Go Driver v2.0

.evergreen/config.yml

@@ -511,7 +511,6 @@ functions:
             echo "crypt_shared library will be loaded from path: $CRYPT_SHARED_LIB_PATH"
           fi
 
-          export GOFLAGS=-mod=vendor
           AUTH="${AUTH}" \
           SSL="${SSL}" \
           MONGODB_URI="${MONGODB_URI}" \
@@ -571,7 +570,6 @@ functions:
           # Per the LB testing spec, the URI of an LB fronting a single mongos should be used to configure internal
           # testing Client instances, so we set MONGODB_URI to SINGLE_MONGOS_LB_URI.
 
-          export GOFLAGS=-mod=vendor
           AUTH="${AUTH}" \
           SSL="${SSL}" \
           MONGODB_URI="${SINGLE_MONGOS_LB_URI}" \
@@ -1108,7 +1106,6 @@ functions:
           ${PREPARE_SHELL}
           export KMS_TLS_TESTCASE="${KMS_TLS_TESTCASE}"
 
-          export GOFLAGS=-mod=vendor
           AUTH="${AUTH}" \
           SSL="${SSL}" \
           MONGODB_URI="${MONGODB_URI}" \
@@ -1136,7 +1133,6 @@ functions:
           ${PREPARE_SHELL}
           export KMS_MOCK_SERVERS_RUNNING="true"
 
-          export GOFLAGS=-mod=vendor
           AUTH="${AUTH}" \
           SSL="${SSL}" \
           MONGODB_URI="${MONGODB_URI}" \
@@ -1923,15 +1919,13 @@ tasks:
           MONGO_GO_DRIVER_COMPRESSOR: "snappy"
 
   # Build with the oldest supported version of Go.
-  - name: go1.13-build
+  - name: go1.18-build
     tags: ["compile-check"]
     commands:
       - func: run-make
         vars:
-          # We only test building the compilecheck submodule with Go 1.13 because the root module's
-          # go.mod file contains retract directives, which are not supported until Go 1.16.
           targets: "build-compile-check"
-          BUILD_ENV: "PATH=/opt/golang/go1.13/bin:$PATH GOROOT=/opt/golang/go1.13"
+          BUILD_ENV: "PATH=/opt/golang/go1.18/bin:$PATH GOROOT=/opt/golang/go1.18"
 
   # Build with the same Go version that we're using for tests.
   - name: build

.evergreen/run-tests.sh

@@ -17,7 +17,6 @@ export PATH="${GOROOT}/bin:${GCC_PATH}:$GOPATH/bin:$PATH"
 export PROJECT="${project}"
 export PKG_CONFIG_PATH=$(pwd)/install/libmongocrypt/lib64/pkgconfig:$(pwd)/install/mongo-c-driver/lib/pkgconfig
 export LD_LIBRARY_PATH=$(pwd)/install/libmongocrypt/lib64
-export GOFLAGS=-mod=vendor
 
 SSL=${SSL:-nossl}
 if [ "$SSL" != "nossl" -a -z "${SERVERLESS+x}" ]; then

Makefile

@@ -52,19 +52,15 @@ install-lll:
 check-fmt: install-lll
 	etc/check_fmt.sh
 
-# check-modules runs "go mod tidy" then "go mod vendor" and exits with a non-zero exit code if there
-# are any module or vendored modules changes. The intent is to confirm two properties:
-#
-# 1. Exactly the required modules are declared as dependencies. We should always be able to run
-# "go mod tidy" and expect that no unrelated changes are made to the "go.mod" file.
-#
-# 2. All required modules are copied into the vendor/ directory and are an exact copy of the
-# original module source code (i.e. the vendored modules are not modified from their original code).
+# check-modules runs "go mod tidy"  and exits with a non-zero exit code if there
+# are any module changes. The intent is to confirm that exactly the required 
+# modules are declared as dependencies. We should always be able to run "go mod 
+# tidy" and expect that no unrelated changes are made to the "go.mod" file.
 .PHONY: check-modules
 check-modules:
 	go mod tidy -v
-	go mod vendor
-	git diff --exit-code go.mod go.sum ./vendor
+	go mod verify
+	git diff --exit-code go.mod go.sum 
 
 .PHONY: doc
 doc:

README.md

@@ -1,8 +1,8 @@
 <p align="center"><img src="etc/assets/mongo-gopher.png" width="250"></p>
 <p align="center">
-  <a href="https://goreportcard.com/report/go.mongodb.org/mongo-driver"><img src="https://goreportcard.com/badge/go.mongodb.org/mongo-driver"></a>
-  <a href="https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo"><img src="etc/assets/godev-mongo-blue.svg" alt="docs"></a>
-  <a href="https://pkg.go.dev/go.mongodb.org/mongo-driver/bson"><img src="etc/assets/godev-bson-blue.svg" alt="docs"></a>
+  <a href="https://goreportcard.com/report/go.mongodb.org/mongo-driver/v2"><img src="https://goreportcard.com/badge/go.mongodb.org/mongo-driver/v2"></a>
+  <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>
 </p>
 
@@ -22,17 +22,17 @@ The MongoDB supported driver for Go.
 ## Installation
 
 The recommended way to get started using the MongoDB Go driver is by using Go modules to install the dependency in
-your project. This can be done either by importing packages from `go.mongodb.org/mongo-driver` and having the build
+your project. This can be done either by importing packages from `go.mongodb.org/mongo-driver/v2` and having the build
 step install the dependency or by explicitly running
 
 ```bash
-go get go.mongodb.org/mongo-driver/mongo
+go get go.mongodb.org/mongo-driver/v2/mongo
 ```
 
 When using a version of Go that does not support modules, the driver can be installed using `dep` by running
 
 ```bash
-dep ensure -add "go.mongodb.org/mongo-driver/mongo"
+dep ensure -add "go.mongodb.org/mongo-driver/v2/mongo"
 ```
 
 -------------------------
@@ -45,9 +45,9 @@ import (
     "context"
     "time"
 
-    "go.mongodb.org/mongo-driver/mongo"
-    "go.mongodb.org/mongo-driver/mongo/options"
-    "go.mongodb.org/mongo-driver/mongo/readpref"
+    "go.mongodb.org/mongo-driver/v2/mongo"
+    "go.mongodb.org/mongo-driver/v2/mongo/options"
+    "go.mongodb.org/mongo-driver/v2/mongo/readpref"
 )
 
 ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
@@ -65,7 +65,7 @@ defer func() {
 }()
 ```
 
-For more advanced configuration and authentication, see the [documentation for mongo.Connect](https://pkg.go.dev/go.mongodb.org/mongo-driver/mongo#Connect).
+For more advanced configuration and authentication, see the [documentation for mongo.Connect](https://pkg.go.dev/go.mongodb.org/mongo-driver/v2/mongo#Connect).
 
 Calling `Connect` does not block for server discovery. If you wish to know if a MongoDB server has been found and connected to,
 use the `Ping` method:
@@ -91,7 +91,7 @@ res, err := collection.InsertOne(ctx, bson.D{{"name", "pi"}, {"value", 3.14159}}
 id := res.InsertedID
 ```
 
-To use `bson.D`, you will need to add `"go.mongodb.org/mongo-driver/bson"` to your imports.
+To use `bson.D`, you will need to add `"go.mongodb.org/mongo-driver/v2/bson"` to your imports.
 
 Your import statement should now look like this:
 
@@ -101,10 +101,10 @@ import (
     "log"
     "time"
 
-    "go.mongodb.org/mongo-driver/bson"
-    "go.mongodb.org/mongo-driver/mongo"
-    "go.mongodb.org/mongo-driver/mongo/options"
-    "go.mongodb.org/mongo-driver/mongo/readpref"
+    "go.mongodb.org/mongo-driver/v2/bson"
+    "go.mongodb.org/mongo-driver/v2/mongo"
+    "go.mongodb.org/mongo-driver/v2/mongo/options"
+    "go.mongodb.org/mongo-driver/v2/mongo/readpref"
 )
 ```
 

benchmark/bson.go

@@ -11,7 +11,7 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 const (

benchmark/bson_document.go

@@ -10,7 +10,7 @@ import (
 	"context"
 	"errors"
 
-	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 func bsonDocumentEncoding(tm TimerManager, iters int, source string) error {

benchmark/bson_map.go

@@ -11,7 +11,7 @@ import (
 	"errors"
 	"fmt"
 
-	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 func bsonMapDecoding(tm TimerManager, iters int, dataSet string) error {

benchmark/bson_struct.go

@@ -10,7 +10,7 @@ import (
 	"context"
 	"errors"
 
-	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 func BSONFlatStructDecoding(_ context.Context, tm TimerManager, iters int) error {

benchmark/bson_types.go

@@ -6,7 +6,7 @@
 
 package benchmark
 
-import "go.mongodb.org/mongo-driver/bson/primitive"
+import "go.mongodb.org/mongo-driver/v2/bson/primitive"
 
 type flatBSONTags struct {
 	ID primitive.ObjectID `bson:"_id"`

benchmark/harness.go

@@ -4,14 +4,14 @@
 // 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 benchmark // import "go.mongodb.org/mongo-driver/benchmark"
+package benchmark // import "go.mongodb.org/mongo-driver/v2/benchmark"
 
 import (
 	"context"
 	"testing"
 	"time"
 
-	"go.mongodb.org/mongo-driver/internal/require"
+	"go.mongodb.org/mongo-driver/v2/internal/require"
 )
 
 const (

benchmark/multi.go

@@ -10,7 +10,7 @@ import (
 	"context"
 	"errors"
 
-	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/v2/bson"
 )
 
 func MultiFindMany(ctx context.Context, tm TimerManager, iters int) error {
@@ -21,7 +21,7 @@ func MultiFindMany(ctx context.Context, tm TimerManager, iters int) error {
 	if err != nil {
 		return err
 	}
-	defer db.Client().Disconnect(ctx)
+	defer func() { _ = db.Client().Disconnect(ctx) }()
 
 	db = db.Client().Database("perftest")
 	if err = db.Drop(ctx); err != nil {
@@ -87,7 +87,7 @@ func multiInsertCase(ctx context.Context, tm TimerManager, iters int, data strin
 	if err != nil {
 		return err
 	}
-	defer db.Client().Disconnect(ctx)
+	defer func() { _ = db.Client().Disconnect(ctx) }()
 
 	db = db.Client().Database("perftest")
 	if err = db.Drop(ctx); err != nil {

benchmark/operation_test.go

@@ -10,9 +10,9 @@ import (
 	"context"
 	"testing"
 
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
 )
 
 var teststrings = []string{
@@ -41,7 +41,7 @@ func BenchmarkClientWrite(b *testing.B) {
 			if err != nil {
 				b.Fatalf("error connecting: %v", err)
 			}
-			defer client.Disconnect(context.Background())
+			defer func() { _ = client.Disconnect(context.Background()) }()
 			coll := client.Database("test").Collection("test")
 			_, err = coll.DeleteMany(context.Background(), bson.D{})
 			if err != nil {
@@ -85,7 +85,7 @@ func BenchmarkClientBulkWrite(b *testing.B) {
 			if err != nil {
 				b.Fatalf("error connecting: %v", err)
 			}
-			defer client.Disconnect(context.Background())
+			defer func() { _ = client.Disconnect(context.Background()) }()
 			coll := client.Database("test").Collection("test")
 			_, err = coll.DeleteMany(context.Background(), bson.D{})
 			if err != nil {
@@ -134,7 +134,7 @@ func BenchmarkClientRead(b *testing.B) {
 			if err != nil {
 				b.Fatalf("error connecting: %v", err)
 			}
-			defer client.Disconnect(context.Background())
+			defer func() { _ = client.Disconnect(context.Background()) }()
 			coll := client.Database("test").Collection("test")
 			_, err = coll.DeleteMany(context.Background(), bson.D{})
 			if err != nil {

benchmark/single.go

@@ -10,11 +10,11 @@ import (
 	"context"
 	"errors"
 
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/internal/handshake"
-	"go.mongodb.org/mongo-driver/internal/integtest"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/internal/handshake"
+	"go.mongodb.org/mongo-driver/v2/internal/integtest"
+	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
 )
 
 const (
@@ -49,7 +49,7 @@ func SingleRunCommand(ctx context.Context, tm TimerManager, iters int) error {
 	if err != nil {
 		return err
 	}
-	defer db.Client().Disconnect(ctx)
+	defer func() { _ = db.Client().Disconnect(ctx) }()
 
 	cmd := bson.D{{handshake.LegacyHelloLowercase, true}}
 
@@ -130,7 +130,7 @@ func singleInsertCase(ctx context.Context, tm TimerManager, iters int, data stri
 	if err != nil {
 		return err
 	}
-	defer db.Client().Disconnect(ctx)
+	defer func() { _ = db.Client().Disconnect(ctx) }()
 
 	db = db.Client().Database("perftest")
 	if err = db.Drop(ctx); err != nil {

bson/bson.go

@@ -7,10 +7,10 @@
 // Based on gopkg.in/mgo.v2/bson by Gustavo Niemeyer
 // See THIRD-PARTY-NOTICES for original license terms.
 
-package bson // import "go.mongodb.org/mongo-driver/bson"
+package bson // import "go.mongodb.org/mongo-driver/v2/bson"
 
 import (
-	"go.mongodb.org/mongo-driver/bson/primitive"
+	"go.mongodb.org/mongo-driver/v2/bson/primitive"
 )
 
 // Zeroer allows custom struct types to implement a report of zero

bson/bson_corpus_spec_test.go

@@ -22,9 +22,9 @@ import (
 	"unicode/utf8"
 
 	"github.com/google/go-cmp/cmp"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.mongodb.org/mongo-driver/internal/assert"
-	"go.mongodb.org/mongo-driver/internal/require"
+	"go.mongodb.org/mongo-driver/v2/bson/primitive"
+	"go.mongodb.org/mongo-driver/v2/internal/assert"
+	"go.mongodb.org/mongo-driver/v2/internal/require"
 )
 
 type testCase struct {

bson/bson_test.go

@@ -16,11 +16,11 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"go.mongodb.org/mongo-driver/bson/bsoncodec"
-	"go.mongodb.org/mongo-driver/bson/bsonoptions"
-	"go.mongodb.org/mongo-driver/bson/bsontype"
-	"go.mongodb.org/mongo-driver/internal/assert"
-	"go.mongodb.org/mongo-driver/x/bsonx/bsoncore"
+	"go.mongodb.org/mongo-driver/v2/bson/bsoncodec"
+	"go.mongodb.org/mongo-driver/v2/bson/bsonoptions"
+	"go.mongodb.org/mongo-driver/v2/bson/bsontype"
+	"go.mongodb.org/mongo-driver/v2/internal/assert"
+	"go.mongodb.org/mongo-driver/v2/x/bsonx/bsoncore"
 )
 
 func noerr(t *testing.T, err error) {

bson/bsoncodec/array_codec.go

@@ -9,8 +9,8 @@ package bsoncodec
 import (
 	"reflect"
 
-	"go.mongodb.org/mongo-driver/bson/bsonrw"
-	"go.mongodb.org/mongo-driver/x/bsonx/bsoncore"
+	"go.mongodb.org/mongo-driver/v2/bson/bsonrw"
+	"go.mongodb.org/mongo-driver/v2/x/bsonx/bsoncore"
 )
 
 // ArrayCodec is the Codec used for bsoncore.Array values.