Merge branch 'v1' into godriver3140

Author: qingyang-hu

.evergreen/config.yml

@@ -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} \

.evergreen/run-tests.sh

@@ -1,12 +1,5 @@
 run:
   timeout: 5m
-  skip-dirs-use-default: false
-  skip-dirs:
-    - (^|/)vendor($|/)
-    - (^|/)testdata($|/)
-    - (^|/)etc($|/)
-    # Disable all linters for "golang.org/x/exp/rand" package in internal/rand.
-    - internal/rand
 
 linters:
   disable-all: true
@@ -35,11 +28,7 @@ linters:
 
 linters-settings:
   errcheck:
-    exclude: .errcheck-excludes
-  gocritic:
-    enabled-checks:
-      # Detects suspicious append result assignments. E.g. "b := append(a, 1, 2, 3)"
-      - appendAssign
+    exclude-functions: .errcheck-excludes
   govet:
     disable:
       - cgocall
@@ -55,6 +44,14 @@ linters-settings:
     ]
 
 issues:
+  exclude-dirs-use-default: false
+  exclude-dirs:
+    - (^|/)testdata($|/)
+    - (^|/)etc($|/)
+    # Disable all linters for copied third-party code.
+    - internal/rand
+    - internal/aws
+    - internal/assert
   exclude-use-default: false
   exclude:
     # Add all default excluded issues except issues related to exported types/functions not having

.golangci.yml

@@ -40,7 +40,7 @@ repos:
   rev: "v2.2.6"
   hooks:
   - id: codespell
-    args: ["-L", "te,fo,fle,alo,nin,compres,wil,collone,asess,sav,ot,wll,dne,nulll,hellow"]
+    args: ["-L", "te,fo,fle,alo,nin,compres,wil,collone,asess,sav,ot,wll,dne,nulll,hellow,aks"]
     exclude: ^(vendor/|benchmark/operation_test.go)
     exclude_types: [json,yaml,pem]
 
@@ -51,6 +51,6 @@ repos:
       exclude: ^(vendor)
 
 - repo: https://github.com/golangci/golangci-lint
-  rev: v1.55.1
+  rev: v1.59.1
   hooks:
   - id: golangci-lint

.pre-commit-config.yaml

@@ -60,7 +60,7 @@ check-fmt: install-lll
 check-modules:
 	go mod tidy -v
 	go mod vendor
-	git diff --exit-code go.mod go.sum ./vendor
+	git diff --exit-code go.mod go.sum ./vendor # Compare to the PR / WF Branch.
 
 .PHONY: doc
 doc:
@@ -72,7 +72,7 @@ fmt:
 
 .PHONY: install-golangci-lint
 install-golangci-lint:
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.52.2
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.1
 
 # Lint with various GOOS and GOARCH targets to catch static analysis failures that may only affect
 # specific operating systems or architectures. For example, staticcheck will only check for 64-bit

Makefile

@@ -10,12 +10,18 @@
 
 The MongoDB supported driver for Go.
 
+> \[!NOTE\]
+>
+> Go Driver 1.17.0 is the last planned 1.x version.
+> It will receive critical bug fixes, but future development and features
+> will be in the 2.x version of the driver.
+
 ______________________________________________________________________
 
 ## Requirements
 
 - Go 1.18 or higher. We aim to support the latest versions of Go.
-- Go 1.20 or higher is required to run the driver test suite.
+- Go 1.22 or higher is required to run the driver test suite.
 - MongoDB 3.6 and higher.
 
 ______________________________________________________________________

README.md

@@ -187,13 +187,14 @@ func unescapeUnicode(s, bsonType string) string {
 
 func formatDouble(f float64) string {
 	var s string
-	if math.IsInf(f, 1) {
+	switch {
+	case math.IsInf(f, 1):
 		s = "Infinity"
-	} else if math.IsInf(f, -1) {
+	case math.IsInf(f, -1):
 		s = "-Infinity"
-	} else if math.IsNaN(f) {
+	case math.IsNaN(f):
 		s = "NaN"
-	} else {
+	default:
 		// Print exactly one decimalType place for integers; otherwise, print as many are necessary to
 		// perfectly represent it.
 		s = strconv.FormatFloat(f, 'G', -1, 64)

bson/bson_corpus_spec_test.go

@@ -18,7 +18,7 @@ import (
 )
 
 func ExampleValueEncoder() {
-	var _ ValueEncoderFunc = func(ec EncodeContext, vw bsonrw.ValueWriter, val reflect.Value) error {
+	var _ ValueEncoderFunc = func(_ EncodeContext, vw bsonrw.ValueWriter, val reflect.Value) error {
 		if val.Kind() != reflect.String {
 			return ValueEncoderError{Name: "StringEncodeValue", Kinds: []reflect.Kind{reflect.String}, Received: val}
 		}
@@ -28,7 +28,7 @@ func ExampleValueEncoder() {
 }
 
 func ExampleValueDecoder() {
-	var _ ValueDecoderFunc = func(dc DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error {
+	var _ ValueDecoderFunc = func(_ DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error {
 		if !val.CanSet() || val.Kind() != reflect.String {
 			return ValueDecoderError{Name: "StringDecodeValue", Kinds: []reflect.Kind{reflect.String}, Received: val}
 		}

bson/bsoncodec/bsoncodec_test.go

@@ -1159,7 +1159,7 @@ func TestDefaultValueEncoders(t *testing.T) {
 				},
 				{
 					"WriteArrayElement Error",
-					bsoncore.Array(buildDocumentArray(func(doc []byte) []byte {
+					bsoncore.Array(buildDocumentArray(func([]byte) []byte {
 						return bsoncore.AppendNullElement(nil, "foo")
 					})),
 					nil,
@@ -1169,7 +1169,7 @@ func TestDefaultValueEncoders(t *testing.T) {
 				},
 				{
 					"encodeValue error",
-					bsoncore.Array(buildDocumentArray(func(doc []byte) []byte {
+					bsoncore.Array(buildDocumentArray(func([]byte) []byte {
 						return bsoncore.AppendNullElement(nil, "foo")
 					})),
 					nil,

bson/bsoncodec/default_value_encoders_test.go

@@ -25,7 +25,7 @@ func ExampleRegistry_customEncoder() {
 	negatedIntType := reflect.TypeOf(negatedInt(0))
 
 	negatedIntEncoder := func(
-		ec bsoncodec.EncodeContext,
+		_ bsoncodec.EncodeContext,
 		vw bsonrw.ValueWriter,
 		val reflect.Value,
 	) error {
@@ -83,7 +83,7 @@ func ExampleRegistry_customDecoder() {
 	lenientBoolType := reflect.TypeOf(lenientBool(true))
 
 	lenientBoolDecoder := func(
-		dc bsoncodec.DecodeContext,
+		_ bsoncodec.DecodeContext,
 		vr bsonrw.ValueReader,
 		val reflect.Value,
 	) error {
@@ -160,7 +160,7 @@ func ExampleRegistry_RegisterKindEncoder() {
 	// encoder for kind reflect.Int32. That way, even user-defined types with
 	// underlying type int32 will be encoded as a BSON int64.
 	int32To64Encoder := func(
-		ec bsoncodec.EncodeContext,
+		_ bsoncodec.EncodeContext,
 		vw bsonrw.ValueWriter,
 		val reflect.Value,
 	) error {
@@ -215,7 +215,7 @@ func ExampleRegistry_RegisterKindDecoder() {
 	// "kind" decoder for kind reflect.Int64. That way, we can even decode to
 	// user-defined types with underlying type int64.
 	flexibleInt64KindDecoder := func(
-		dc bsoncodec.DecodeContext,
+		_ bsoncodec.DecodeContext,
 		vr bsonrw.ValueReader,
 		val reflect.Value,
 	) error {