GODRIVER-3339 Separate Many and One for UpdateOptions and DeleteOptions.

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.

internal/integration/collection_test.go

@@ -296,7 +296,7 @@ func TestCollection(t *testing.T) {
 		})
 		mt.RunOpts("not found with options", mtest.NewOptions().MinServerVersion("3.4"), func(mt *mtest.T) {
 			initCollection(mt, mt.Coll)
-			opts := options.Delete().SetCollation(&options.Collation{Locale: "en_US"})
+			opts := options.DeleteOne().SetCollation(&options.Collation{Locale: "en_US"})
 			res, err := mt.Coll.DeleteOne(context.Background(), bson.D{{"x", 0}}, opts)
 			assert.Nil(mt, err, "DeleteOne error: %v", err)
 			assert.Equal(mt, int64(0), res.DeletedCount, "expected DeletedCount 0, got %v", res.DeletedCount)
@@ -339,13 +339,13 @@ func TestCollection(t *testing.T) {
 			})
 			assert.Nil(mt, err, "CreateOne error: %v", err)
 
-			opts := options.Delete().SetHint(bson.M{"x": 1})
+			opts := options.DeleteOne().SetHint(bson.M{"x": 1})
 			res, err := mt.Coll.DeleteOne(context.Background(), bson.D{{"x", 1}}, opts)
 			assert.Nil(mt, err, "DeleteOne error: %v", err)
 			assert.Equal(mt, int64(1), res.DeletedCount, "expected DeletedCount 1, got %v", res.DeletedCount)
 		})
 		mt.RunOpts("multikey map index", mtest.NewOptions().MinServerVersion("4.4"), func(mt *mtest.T) {
-			opts := options.Delete().SetHint(bson.M{"x": 1, "y": 1})
+			opts := options.DeleteOne().SetHint(bson.M{"x": 1, "y": 1})
 			_, err := mt.Coll.DeleteOne(context.Background(), bson.D{{"x", 0}}, opts)
 			assert.Equal(mt, mongo.ErrMapForOrderedArgument{"hint"}, err, "expected error %v, got %v", mongo.ErrMapForOrderedArgument{"hint"}, err)
 		})
@@ -365,7 +365,7 @@ func TestCollection(t *testing.T) {
 		})
 		mt.RunOpts("not found with options", mtest.NewOptions().MinServerVersion("3.4"), func(mt *mtest.T) {
 			initCollection(mt, mt.Coll)
-			opts := options.Delete().SetCollation(&options.Collation{Locale: "en_US"})
+			opts := options.DeleteMany().SetCollation(&options.Collation{Locale: "en_US"})
 			res, err := mt.Coll.DeleteMany(context.Background(), bson.D{{"x", bson.D{{"$lt", 1}}}}, opts)
 			assert.Nil(mt, err, "DeleteMany error: %v", err)
 			assert.Equal(mt, int64(0), res.DeletedCount, "expected DeletedCount 0, got %v", res.DeletedCount)
@@ -408,13 +408,13 @@ func TestCollection(t *testing.T) {
 			})
 			assert.Nil(mt, err, "index CreateOne error: %v", err)
 
-			opts := options.Delete().SetHint(bson.M{"x": 1})
+			opts := options.DeleteOne().SetHint(bson.M{"x": 1})
 			res, err := mt.Coll.DeleteOne(context.Background(), bson.D{{"x", 1}}, opts)
 			assert.Nil(mt, err, "DeleteOne error: %v", err)
 			assert.Equal(mt, int64(1), res.DeletedCount, "expected DeletedCount 1, got %v", res.DeletedCount)
 		})
 		mt.RunOpts("multikey map index", mtest.NewOptions().MinServerVersion("4.4"), func(mt *mtest.T) {
-			opts := options.Delete().SetHint(bson.M{"x": 1, "y": 1})
+			opts := options.DeleteMany().SetHint(bson.M{"x": 1, "y": 1})
 			_, err := mt.Coll.DeleteMany(context.Background(), bson.D{{"x", 0}}, opts)
 			assert.Equal(mt, mongo.ErrMapForOrderedArgument{"hint"}, err, "expected error %v, got %v", mongo.ErrMapForOrderedArgument{"hint"}, err)
 		})
@@ -451,7 +451,7 @@ func TestCollection(t *testing.T) {
 			filter := bson.D{{"x", 0}}
 			update := bson.D{{"$inc", bson.D{{"x", 1}}}}
 
-			res, err := mt.Coll.UpdateOne(context.Background(), filter, update, options.Update().SetUpsert(true))
+			res, err := mt.Coll.UpdateOne(context.Background(), filter, update, options.UpdateOne().SetUpsert(true))
 			assert.Nil(mt, err, "UpdateOne error: %v", err)
 			assert.Equal(mt, int64(0), res.MatchedCount, "expected matched count 0, got %v", res.MatchedCount)
 			assert.Equal(mt, int64(0), res.ModifiedCount, "expected matched count 0, got %v", res.ModifiedCount)
@@ -570,7 +570,7 @@ func TestCollection(t *testing.T) {
 			update := bson.D{{"$inc", bson.D{{"x", 1}}}}
 
 			id := "blah"
-			res, err := mt.Coll.UpdateByID(context.Background(), id, update, options.Update().SetUpsert(true))
+			res, err := mt.Coll.UpdateByID(context.Background(), id, update, options.UpdateOne().SetUpsert(true))
 			assert.Nil(mt, err, "UpdateByID error: %v", err)
 			assert.Equal(mt, int64(0), res.MatchedCount, "expected matched count 0, got %v", res.MatchedCount)
 			assert.Equal(mt, int64(0), res.ModifiedCount, "expected modified count 0, got %v", res.ModifiedCount)
@@ -633,7 +633,7 @@ func TestCollection(t *testing.T) {
 			filter := bson.D{{"x", bson.D{{"$lt", 1}}}}
 			update := bson.D{{"$inc", bson.D{{"x", 1}}}}
 
-			res, err := mt.Coll.UpdateMany(context.Background(), filter, update, options.Update().SetUpsert(true))
+			res, err := mt.Coll.UpdateMany(context.Background(), filter, update, options.UpdateMany().SetUpsert(true))
 			assert.Nil(mt, err, "UpdateMany error: %v", err)
 			assert.Equal(mt, int64(0), res.MatchedCount, "expected matched count 0, got %v", res.MatchedCount)
 			assert.Equal(mt, int64(0), res.ModifiedCount, "expected modified count 0, got %v", res.ModifiedCount)

internal/integration/crud_helpers_test.go

@@ -801,7 +801,7 @@ func executeDeleteOne(mt *mtest.T, sess *mongo.Session, args bson.Raw) (*mongo.D
 	mt.Helper()
 
 	filter := emptyDoc
-	opts := options.Delete()
+	opts := options.DeleteOne()
 
 	elems, _ := args.Elements()
 	for _, elem := range elems {
@@ -837,7 +837,7 @@ func executeDeleteMany(mt *mtest.T, sess *mongo.Session, args bson.Raw) (*mongo.
 	mt.Helper()
 
 	filter := emptyDoc
-	opts := options.Delete()
+	opts := options.DeleteMany()
 
 	elems, _ := args.Elements()
 	for _, elem := range elems {
@@ -874,7 +874,7 @@ func executeUpdateOne(mt *mtest.T, sess *mongo.Session, args bson.Raw) (*mongo.U
 
 	filter := emptyDoc
 	var update interface{} = emptyDoc
-	opts := options.Update()
+	opts := options.UpdateOne()
 
 	elems, _ := args.Elements()
 	for _, elem := range elems {
@@ -902,7 +902,7 @@ func executeUpdateOne(mt *mtest.T, sess *mongo.Session, args bson.Raw) (*mongo.U
 		}
 	}
 
-	updateArgs, err := mongoutil.NewOptions[options.UpdateOptions](opts)
+	updateArgs, err := mongoutil.NewOptions[options.UpdateOneOptions](opts)
 	require.NoError(mt, err, "failed to construct options from builder")
 
 	if updateArgs.Upsert == nil {
@@ -926,7 +926,7 @@ func executeUpdateMany(mt *mtest.T, sess *mongo.Session, args bson.Raw) (*mongo.
 
 	filter := emptyDoc
 	var update interface{} = emptyDoc
-	opts := options.Update()
+	opts := options.UpdateMany()
 
 	elems, _ := args.Elements()
 	for _, elem := range elems {
@@ -954,7 +954,7 @@ func executeUpdateMany(mt *mtest.T, sess *mongo.Session, args bson.Raw) (*mongo.
 		}
 	}
 
-	updateArgs, err := mongoutil.NewOptions[options.UpdateOptions](opts)
+	updateArgs, err := mongoutil.NewOptions[options.UpdateManyOptions](opts)
 	require.NoError(mt, err, "failed to construct options from builder")
 
 	if updateArgs.Upsert == nil {

internal/integration/crud_prose_test.go

@@ -296,7 +296,7 @@ func TestHintErrors(t *testing.T) {
 	mt.Run("UpdateMany", func(mt *mtest.T) {
 
 		_, got := mt.Coll.UpdateMany(context.Background(), bson.D{{"a", 1}}, bson.D{{"$inc", bson.D{{"a", 1}}}},
-			options.Update().SetHint("_id_"))
+			options.UpdateMany().SetHint("_id_"))
 		assert.NotNil(mt, got, "expected non-nil error, got nil")
 		assert.Equal(mt, got, expected, "expected: %v got: %v", expected, got)
 	})

internal/integration/unified/collection_operation_execution.go

@@ -403,7 +403,7 @@ func executeDeleteOne(ctx context.Context, operation *operation) (*operationResu
 	}
 
 	var filter bson.Raw
-	opts := options.Delete()
+	opts := options.DeleteOne()
 
 	elems, err := operation.Arguments.Elements()
 	if err != nil {
@@ -457,7 +457,7 @@ func executeDeleteMany(ctx context.Context, operation *operation) (*operationRes
 	}
 
 	var filter bson.Raw
-	opts := options.Delete()
+	opts := options.DeleteMany()
 
 	elems, err := operation.Arguments.Elements()
 	if err != nil {
@@ -1316,12 +1316,12 @@ func executeUpdateOne(ctx context.Context, operation *operation) (*operationResu
 		return nil, err
 	}
 
-	updateArgs, err := createUpdateArguments(operation.Arguments)
+	updateArgs, updateOpts, err := createUpdateOneArguments(operation.Arguments)
 	if err != nil {
 		return nil, err
 	}
 
-	res, err := coll.UpdateOne(ctx, updateArgs.filter, updateArgs.update, updateArgs.opts)
+	res, err := coll.UpdateOne(ctx, updateArgs.filter, updateArgs.update, updateOpts)
 	raw, buildErr := buildUpdateResultDocument(res)
 	if buildErr != nil {
 		return nil, buildErr
@@ -1335,12 +1335,12 @@ func executeUpdateMany(ctx context.Context, operation *operation) (*operationRes
 		return nil, err
 	}
 
-	updateArgs, err := createUpdateArguments(operation.Arguments)
+	updateArgs, updateOpts, err := createUpdateManyArguments(operation.Arguments)
 	if err != nil {
 		return nil, err
 	}
 
-	res, err := coll.UpdateMany(ctx, updateArgs.filter, updateArgs.update, updateArgs.opts)
+	res, err := coll.UpdateMany(ctx, updateArgs.filter, updateArgs.update, updateOpts)
 	raw, buildErr := buildUpdateResultDocument(res)
 	if buildErr != nil {
 		return nil, buildErr

internal/integration/unified/crud_helpers.go

@@ -23,14 +23,67 @@ func newMissingArgumentError(arg string) error {
 type updateArguments struct {
 	filter bson.Raw
 	update interface{}
-	opts   *options.UpdateOptionsBuilder
 }
 
-func createUpdateArguments(args bson.Raw) (*updateArguments, error) {
-	ua := &updateArguments{
-		opts: options.Update(),
+func createUpdateManyArguments(args bson.Raw) (*updateArguments, *options.UpdateManyOptionsBuilder, error) {
+	ua := &updateArguments{}
+	opts := options.UpdateMany()
+
+	elems, _ := args.Elements()
+	for _, elem := range elems {
+		key := elem.Key()
+		val := elem.Value()
+
+		switch key {
+		case "arrayFilters":
+			opts.SetArrayFilters(
+				bsonutil.RawToInterfaces(bsonutil.RawArrayToDocuments(val.Array())...),
+			)
+		case "bypassDocumentValidation":
+			opts.SetBypassDocumentValidation(val.Boolean())
+		case "collation":
+			collation, err := createCollation(val.Document())
+			if err != nil {
+				return nil, nil, fmt.Errorf("error creating collation: %w", err)
+			}
+			opts.SetCollation(collation)
+		case "comment":
+			opts.SetComment(val)
+		case "filter":
+			ua.filter = val.Document()
+		case "hint":
+			hint, err := createHint(val)
+			if err != nil {
+				return nil, nil, fmt.Errorf("error creating hint: %w", err)
+			}
+			opts.SetHint(hint)
+		case "let":
+			opts.SetLet(val.Document())
+		case "update":
+			var err error
+			ua.update, err = createUpdateValue(val)
+			if err != nil {
+				return nil, nil, fmt.Errorf("error processing update value: %w", err)
+			}
+		case "upsert":
+			opts.SetUpsert(val.Boolean())
+		default:
+			return nil, nil, fmt.Errorf("unrecognized update option %q", key)
+		}
 	}
-	var err error
+	if ua.filter == nil {
+		return nil, nil, newMissingArgumentError("filter")
+	}
+	if ua.update == nil {
+		return nil, nil, newMissingArgumentError("update")
+	}
+
+	return ua, opts, nil
+}
+
+func createUpdateOneArguments(args bson.Raw) (*updateArguments, *options.UpdateOneOptionsBuilder, error) {
+	ua := &updateArguments{}
+	opts := options.UpdateOne()
 
 	elems, _ := args.Elements()
 	for _, elem := range elems {
@@ -39,48 +92,49 @@ func createUpdateArguments(args bson.Raw) (*updateArguments, error) {
 
 		switch key {
 		case "arrayFilters":
-			ua.opts.SetArrayFilters(
+			opts.SetArrayFilters(
 				bsonutil.RawToInterfaces(bsonutil.RawArrayToDocuments(val.Array())...),
 			)
 		case "bypassDocumentValidation":
-			ua.opts.SetBypassDocumentValidation(val.Boolean())
+			opts.SetBypassDocumentValidation(val.Boolean())
 		case "collation":
 			collation, err := createCollation(val.Document())
 			if err != nil {
-				return nil, fmt.Errorf("error creating collation: %w", err)
+				return nil, nil, fmt.Errorf("error creating collation: %w", err)
 			}
-			ua.opts.SetCollation(collation)
+			opts.SetCollation(collation)
 		case "comment":
-			ua.opts.SetComment(val)
+			opts.SetComment(val)
 		case "filter":
 			ua.filter = val.Document()
 		case "hint":
 			hint, err := createHint(val)
 			if err != nil {
-				return nil, fmt.Errorf("error creating hint: %w", err)
+				return nil, nil, fmt.Errorf("error creating hint: %w", err)
 			}
-			ua.opts.SetHint(hint)
+			opts.SetHint(hint)
 		case "let":
-			ua.opts.SetLet(val.Document())
+			opts.SetLet(val.Document())
 		case "update":
+			var err error
 			ua.update, err = createUpdateValue(val)
 			if err != nil {
-				return nil, fmt.Errorf("error processing update value: %w", err)
+				return nil, nil, fmt.Errorf("error processing update value: %w", err)
 			}
 		case "upsert":
-			ua.opts.SetUpsert(val.Boolean())
+			opts.SetUpsert(val.Boolean())
 		default:
-			return nil, fmt.Errorf("unrecognized update option %q", key)
+			return nil, nil, fmt.Errorf("unrecognized update option %q", key)
 		}
 	}
 	if ua.filter == nil {
-		return nil, newMissingArgumentError("filter")
+		return nil, nil, newMissingArgumentError("filter")
 	}
 	if ua.update == nil {
-		return nil, newMissingArgumentError("update")
+		return nil, nil, newMissingArgumentError("update")
 	}
 
-	return ua, nil
+	return ua, opts, nil
 }
 
 type listCollectionsArguments struct {