Merge branch 'master' into GODRIVER-3493

Author: prestonvasquez

.evergreen/config.yml

@@ -1720,10 +1720,6 @@ axes:
         display_name: "4.0"
         variables:
           VERSION: "4.0"
-      - id: "3.6"
-        display_name: "3.6"
-        variables:
-          VERSION: "3.6"
       - id: "rapid"
         display_name: "rapid"
         variables:
@@ -2175,19 +2171,6 @@ buildvariants:
     tasks:
       - name: ".goleak"
 
-  - matrix_name: "tests-rhel-36-with-zlib-support"
-    tags: ["pullrequest"]
-    matrix_spec: { version: ["3.6"], os-ssl-32: ["rhel87-64"] }
-    display_name: "${version} ${os-ssl-32}"
-    tasks:
-      - name: ".test !.enterprise-auth !.snappy !.zstd"
-
-  - matrix_name: "tests-windows-36-with-zlib-support"
-    matrix_spec: { version: ["3.6"], os-ssl-32: ["windows-64"] }
-    display_name: "${version} ${os-ssl-32}"
-    tasks:
-      - name: ".test !.enterprise-auth !.snappy !.zstd"
-
   - matrix_name: "tests-rhel-40-with-snappy-support"
     tags: ["pullrequest"]
     matrix_spec: { version: ["4.0"], os-ssl-40: ["rhel87-64"] }

README.md

@@ -19,7 +19,7 @@ See the following resources to learn more about upgrading from version 1.x to 2.
 
 - Go 1.18 or higher. We aim to support the latest versions of Go.
 - Go 1.23 or higher is required to run the driver test suite.
-- MongoDB 3.6 and higher.
+- MongoDB 4.0 and higher.
 
 ## Installation
 

internal/driverutil/description.go

@@ -21,7 +21,7 @@ import (
 )
 
 const (
-	MinWireVersion = 6
+	MinWireVersion = 7
 	MaxWireVersion = 25
 )
 

internal/integration/causal_consistency_test.go

@@ -201,40 +201,6 @@ func TestCausalConsistency_Supported(t *testing.T) {
 	})
 }
 
-func TestCausalConsistency_NotSupported(t *testing.T) {
-	// use RunOnBlock instead of mtest.NewOptions().MaxServerVersion("3.4").Topologies(mtest.Single) because
-	// these tests should be run on servers <= 3.4 OR standalones
-	rob := []mtest.RunOnBlock{
-		{MaxServerVersion: "3.4"},
-		{Topology: []mtest.TopologyKind{mtest.Single}},
-	}
-	mt := mtest.New(t, mtest.NewOptions().RunOn(rob...).CreateClient(false))
-
-	mt.Run("afterClusterTime not included", func(mt *mtest.T) {
-		// a read in a causally consistent session does not include afterClusterTime in a deployment that does not
-		// support cluster times
-
-		sessOpts := options.Session().SetCausalConsistency(true)
-		_ = mt.Client.UseSessionWithOptions(context.Background(), sessOpts, func(ctx context.Context) error {
-			_, _ = mt.Coll.Find(ctx, bson.D{})
-			return nil
-		})
-
-		evt := mt.GetStartedEvent()
-		assert.Equal(mt, "find", evt.CommandName, "expected command 'find', got '%v'", evt.CommandName)
-		checkOperationTime(mt, evt.Command, false)
-	})
-	mt.Run("clusterTime not included", func(mt *mtest.T) {
-		// $clusterTime should not be included in commands if the deployment does not support cluster times
-
-		_ = mt.Coll.FindOne(context.Background(), bson.D{})
-		evt := mt.GetStartedEvent()
-		assert.Equal(mt, "find", evt.CommandName, "expected command 'find', got '%v'", evt.CommandName)
-		_, err := evt.Command.LookupErr("$clusterTime")
-		assert.NotNil(mt, err, "expected $clusterTime to not be sent, but was")
-	})
-}
-
 func checkOperationTime(mt *mtest.T, cmd bson.Raw, shouldInclude bool) {
 	mt.Helper()
 

internal/integration/index_view_test.go

@@ -528,11 +528,6 @@ func TestIndexView(t *testing.T) {
 					Unique:             nil,
 				},
 			}
-			if mtest.CompareServerVersions(mtest.ServerVersion(), "3.4") < 0 {
-				for _, expectedSpec := range expectedSpecs {
-					expectedSpec.Version = 1
-				}
-			}
 
 			specs, err := mt.Coll.Indexes().ListSpecifications(context.Background())
 			assert.Nil(mt, err, "ListSpecifications error: %v", err)

internal/integration/unified_spec_test.go

@@ -164,7 +164,6 @@ var directories = []string{
 	"convenient-transactions",
 	"retryable-reads/legacy",
 	"read-write-concern/operation",
-	"server-discovery-and-monitoring/integration",
 	"atlas-data-lake-testing",
 }
 

internal/spectest/skip.go

@@ -135,6 +135,23 @@ var skipTests = map[string]string{
 	//  (BadValue) cannot set maxTimeMS on getMore command for a non-awaitData cursor
 	//
 	"TestUnifiedSpec/client-side-operations-timeout/runCursorCommand.json/Non-tailable_cursor_lifetime_remaining_timeoutMS_applied_to_getMore_if_timeoutMode_is_unset": "maxTimeMS can't be set on a getMore. See DRIVERS-2953",
+
+	// TODO(GODRIVER-2466): Converting SDAM integration spec tests to unified
+	// test format requires implementing new test operations, such as
+	// "recordTopologyDescription". Un-skip whenever GODRIVER-2466 is completed.
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/rediscover-quickly-after-step-down.json/Rediscover_quickly_after_replSetStepDown": "Implement GODRIVER-2466",
+
+	// TODO(GODRIVER-2967): The Go Driver doesn't currently emit a
+	// TopologyChangedEvent when a topology is closed. Un-skip whenever
+	// GODRIVER-2967 is completed.
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/logging-loadbalanced.json/Topology_lifecycle":                            "Implement GODRIVER-2967",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/logging-sharded.json/Topology_lifecycle":                                 "Implement GODRIVER-2967",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/logging-replicaset.json/Topology_lifecycle":                              "Implement GODRIVER-2967",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/logging-standalone.json/Topology_lifecycle":                              "Implement GODRIVER-2967",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/loadbalanced-emit-topology-changed-before-close.json/Topology_lifecycle": "Implement GODRIVER-2967",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/sharded-emit-topology-changed-before-close.json/Topology_lifecycle":      "Implement GODRIVER-2967",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/replicaset-emit-topology-changed-before-close.json/Topology_lifecycle":   "Implement GODRIVER-2967",
+	"TestUnifiedSpec/server-discovery-and-monitoring/unified/standalone-emit-topology-changed-before-close.json/Topology_lifecycle":   "Implement GODRIVER-2967",
 }
 
 // CheckSkip checks if the fully-qualified test name matches a skipped test

mongo/bulk_write_models.go

@@ -70,12 +70,13 @@ func (dom *DeleteOneModel) SetCollation(collation *options.Collation) *DeleteOne
 	return dom
 }
 
-// SetHint specifies the index to use for the operation. This should either be the index name as a string or the index
-// specification as a document. This option is only valid for MongoDB versions >= 4.4. Server versions >= 3.4 will
-// return an error if this option is specified. For server versions < 3.4, the driver will return a client-side error if
-// this option is specified. The driver will return an error if this option is specified during an unacknowledged write
-// operation. The driver will return an error if the hint parameter is a multi-key map. The default value is nil, which
-// means that no hint will be sent.
+// SetHint specifies the index to use for the operation. This should either be
+// the index name as a string or the index specification as a document. This
+// option is only valid for MongoDB versions >= 4.4. Server versions < 4.4 will
+// return an error if this option is specified. The driver will return an error
+// if this option is specified during an unacknowledged write operation. The
+// driver will return an error if the hint parameter is a multi-key map. The
+// default value is nil, which means that no hint will be sent.
 func (dom *DeleteOneModel) SetHint(hint interface{}) *DeleteOneModel {
 	dom.Hint = hint
 	return dom
@@ -111,12 +112,13 @@ func (dmm *DeleteManyModel) SetCollation(collation *options.Collation) *DeleteMa
 	return dmm
 }
 
-// SetHint specifies the index to use for the operation. This should either be the index name as a string or the index
-// specification as a document. This option is only valid for MongoDB versions >= 4.4. Server versions >= 3.4 will
-// return an error if this option is specified. For server versions < 3.4, the driver will return a client-side error if
-// this option is specified. The driver will return an error if this option is specified during an unacknowledged write
-// operation. The driver will return an error if the hint parameter is a multi-key map. The default value is nil, which
-// means that no hint will be sent.
+// SetHint specifies the index to use for the operation. This should either be
+// the index name as a string or the index specification as a document. This
+// option is only valid for MongoDB versions >= 4.4. Server versions < 4.4 will
+// return an error if this option is specified. The driver will return an error
+// if this option is specified during an unacknowledged write operation. The
+// driver will return an error if the hint parameter is a multi-key map. The
+// default value is nil, which means that no hint will be sent.
 func (dmm *DeleteManyModel) SetHint(hint interface{}) *DeleteManyModel {
 	dmm.Hint = hint
 	return dmm
@@ -141,12 +143,13 @@ func NewReplaceOneModel() *ReplaceOneModel {
 	return &ReplaceOneModel{}
 }
 
-// SetHint specifies the index to use for the operation. This should either be the index name as a string or the index
-// specification as a document. This option is only valid for MongoDB versions >= 4.2. Server versions >= 3.4 will
-// return an error if this option is specified. For server versions < 3.4, the driver will return a client-side error if
-// this option is specified. The driver will return an error if this option is specified during an unacknowledged write
-// operation. The driver will return an error if the hint parameter is a multi-key map. The default value is nil, which
-// means that no hint will be sent.
+// SetHint specifies the index to use for the operation. This should either be
+// the index name as a string or the index specification as a document. This
+// option is only valid for MongoDB versions >= 4.2. Server versions < 4.2 will
+// return an error if this option is specified. The driver will return an error
+// if this option is specified during an unacknowledged write operation. The
+// driver will return an error if the hint parameter is a multi-key map. The
+// default value is nil, which means that no hint will be sent.
 func (rom *ReplaceOneModel) SetHint(hint interface{}) *ReplaceOneModel {
 	rom.Hint = hint
 	return rom
@@ -211,12 +214,13 @@ func NewUpdateOneModel() *UpdateOneModel {
 	return &UpdateOneModel{}
 }
 
-// SetHint specifies the index to use for the operation. This should either be the index name as a string or the index
-// specification as a document. This option is only valid for MongoDB versions >= 4.2. Server versions >= 3.4 will
-// return an error if this option is specified. For server versions < 3.4, the driver will return a client-side error if
-// this option is specified. The driver will return an error if this option is specified during an unacknowledged write
-// operation. The driver will return an error if the hint parameter is a multi-key map. The default value is nil, which
-// means that no hint will be sent.
+// SetHint specifies the index to use for the operation. This should either be
+// the index name as a string or the index specification as a document. This
+// option is only valid for MongoDB versions >= 4.2. Server versions < 4.2 will
+// return an error if this option is specified. The driver will return an error
+// if this option is specified during an unacknowledged write operation. The
+// driver will return an error if the hint parameter is a multi-key map. The
+// default value is nil, which means that no hint will be sent.
 func (uom *UpdateOneModel) SetHint(hint interface{}) *UpdateOneModel {
 	uom.Hint = hint
 	return uom
@@ -287,12 +291,13 @@ func NewUpdateManyModel() *UpdateManyModel {
 	return &UpdateManyModel{}
 }
 
-// SetHint specifies the index to use for the operation. This should either be the index name as a string or the index
-// specification as a document. This option is only valid for MongoDB versions >= 4.2. Server versions >= 3.4 will
-// return an error if this option is specified. For server versions < 3.4, the driver will return a client-side error if
-// this option is specified. The driver will return an error if this option is specified during an unacknowledged write
-// operation. The driver will return an error if the hint parameter is a multi-key map. The default value is nil, which
-// means that no hint will be sent.
+// SetHint specifies the index to use for the operation. This should either be
+// the index name as a string or the index specification as a document. This
+// option is only valid for MongoDB versions >= 4.2. Server versions < 4.2 will
+// return an error if this option is specified. The driver will return an error
+// if this option is specified during an unacknowledged write operation. The
+// driver will return an error if the hint parameter is a multi-key map. The
+// default value is nil, which means that no hint will be sent.
 func (umm *UpdateManyModel) SetHint(hint interface{}) *UpdateManyModel {
 	umm.Hint = hint
 	return umm

mongo/database.go

@@ -118,8 +118,7 @@ func (db *Database) Collection(name string, opts ...options.Lister[options.Colle
 	return newCollection(db, name, opts...)
 }
 
-// Aggregate executes an aggregate command the database. This requires MongoDB version >= 3.6 and driver version >=
-// 1.1.0.
+// Aggregate executes an aggregate command the database.
 //
 // The pipeline parameter must be a slice of documents, each representing an aggregation stage. The pipeline
 // cannot be nil but can be empty. The stage documents must all be non-nil. For a pipeline of bson.D documents, the

mongo/options/aggregateoptions.go

@@ -70,8 +70,7 @@ func (ao *AggregateOptionsBuilder) SetBatchSize(i int32) *AggregateOptionsBuilde
 }
 
 // SetBypassDocumentValidation sets the value for the BypassDocumentValidation field. If true, writes
-// executed as part of the operation will opt out of document-level validation on the server. This
-// option is valid for MongoDB versions >= 3.2 and is ignored for previous server versions. The default value
+// executed as part of the operation will opt out of document-level validation on the server. The default value
 // is false. See https://www.mongodb.com/docs/manual/core/schema-validation/ for more information about
 // document validation.
 func (ao *AggregateOptionsBuilder) SetBypassDocumentValidation(b bool) *AggregateOptionsBuilder {
@@ -84,9 +83,8 @@ func (ao *AggregateOptionsBuilder) SetBypassDocumentValidation(b bool) *Aggregat
 	return ao
 }
 
-// SetCollation sets the value for the Collation field. Specifies a collation to use for string
-// comparisons during the operation. This option is only valid for MongoDB versions >= 3.4. For previous
-// server versions, the driver will return an error if this option is used. The default value is nil,
+// SetCollation sets the value for the Collation field. Specifies a collation to
+// use for string comparisons during the operation. The default value is nil,
 // which means the default collation of the collection will be used.
 func (ao *AggregateOptionsBuilder) SetCollation(c *Collation) *AggregateOptionsBuilder {
 	ao.Opts = append(ao.Opts, func(opts *AggregateOptions) error {
@@ -99,8 +97,7 @@ func (ao *AggregateOptionsBuilder) SetCollation(c *Collation) *AggregateOptionsB
 }
 
 // SetMaxAwaitTime sets the value for the MaxAwaitTime field. Specifies maximum amount of time
-// that the server should wait for new documents to satisfy a tailable cursor query. This option is
-// only valid for MongoDB versions >= 3.2 and is ignored for previous server versions.
+// that the server should wait for new documents to satisfy a tailable cursor query.
 func (ao *AggregateOptionsBuilder) SetMaxAwaitTime(d time.Duration) *AggregateOptionsBuilder {
 	ao.Opts = append(ao.Opts, func(opts *AggregateOptions) error {
 		opts.MaxAwaitTime = &d