GODRIVER-1793 Use merge helper and test nil opts for InsertOne (#538)

Author: kevinAlbs

mongo/collection.go

@@ -326,15 +326,13 @@ func (coll *Collection) insert(ctx context.Context, documents []interface{},
 func (coll *Collection) InsertOne(ctx context.Context, document interface{},
 	opts ...*options.InsertOneOptions) (*InsertOneResult, error) {
 
-	imOpts := make([]*options.InsertManyOptions, len(opts))
-	for i, opt := range opts {
-		imo := options.InsertMany()
-		if opt != nil && opt.BypassDocumentValidation != nil && *opt.BypassDocumentValidation {
-			imo = imo.SetBypassDocumentValidation(*opt.BypassDocumentValidation)
-		}
-		imOpts[i] = imo
+	ioOpts := options.MergeInsertOneOptions(opts...)
+	imOpts := options.InsertMany()
+
+	if ioOpts.BypassDocumentValidation != nil && *ioOpts.BypassDocumentValidation {
+		imOpts.SetBypassDocumentValidation(*ioOpts.BypassDocumentValidation)
 	}
-	res, err := coll.insert(ctx, []interface{}{document}, imOpts...)
+	res, err := coll.insert(ctx, []interface{}{document}, imOpts)
 
 	rr, err := processWriteError(err)
 	if rr&rrOne == 0 {

mongo/integration/collection_test.go

@@ -74,6 +74,50 @@ func TestCollection(t *testing.T) {
 			assert.True(mt, ok, "expected error type %v, got %v", mongo.WriteException{}, err)
 			assert.NotNil(mt, we.WriteConcernError, "expected write concern error, got %+v", we)
 		})
+
+		// Require 3.2 servers for bypassDocumentValidation support.
+		convertedOptsOpts := mtest.NewOptions().MinServerVersion("3.2")
+		mt.RunOpts("options are converted", convertedOptsOpts, func(mt *mtest.T) {
+			nilOptsTestCases := []struct {
+				name            string
+				opts            []*options.InsertOneOptions
+				expectOptionSet bool
+			}{
+				{
+					"only nil is passed",
+					[]*options.InsertOneOptions{nil},
+					false,
+				},
+				{
+					"non-nil options is passed before nil",
+					[]*options.InsertOneOptions{options.InsertOne().SetBypassDocumentValidation(true), nil},
+					true,
+				},
+				{
+					"non-nil options is passed after nil",
+					[]*options.InsertOneOptions{nil, options.InsertOne().SetBypassDocumentValidation(true)},
+					true,
+				},
+			}
+
+			for _, testCase := range nilOptsTestCases {
+				mt.Run(testCase.name, func(mt *mtest.T) {
+					doc := bson.D{{"x", 1}}
+					_, err := mt.Coll.InsertOne(mtest.Background, doc, testCase.opts...)
+					assert.Nil(mt, err, "InsertOne error: %v", err)
+					optName := "bypassDocumentValidation"
+					evt := mt.GetStartedEvent()
+
+					val, err := evt.Command.LookupErr(optName)
+					if testCase.expectOptionSet {
+						assert.Nil(mt, err, "expected %v to be set but got: %v", optName, err)
+						assert.True(mt, val.Boolean(), "expected %v to be true but got: %v", optName, val.Boolean())
+						return
+					}
+					assert.NotNil(mt, err, "expected %v to be unset but got nil", optName)
+				})
+			}
+		})
 	})
 	mt.RunOpts("insert many", noClientOpts, func(mt *mtest.T) {
 		mt.Run("success", func(mt *mtest.T) {

mongo/options/insertoptions.go

@@ -73,7 +73,7 @@ func (imo *InsertManyOptions) SetOrdered(b bool) *InsertManyOptions {
 	return imo
 }
 
-// MergeInsertManyOptions combines the givent InsertManyOptions instances into a single InsertManyOptions in a last one
+// MergeInsertManyOptions combines the given InsertManyOptions instances into a single InsertManyOptions in a last one
 // wins fashion.
 func MergeInsertManyOptions(opts ...*InsertManyOptions) *InsertManyOptions {
 	imOpts := InsertMany()