Update options and remove exposed x in mongo

GODRIVER-793 GODRIVER-747 GODRIVER-727 Change-Id: I5e057598d5e425f6b9837af2a1d08a122b7f00fc
mongodb · Feb 19, 2019 · 32946b1 · 32946b1
1 parent 4934d52
commit 32946b1
Show file tree

Hide file tree

Showing 46 changed files with 1,774 additions and 859 deletions.
diff --git a/benchmark/single.go b/benchmark/single.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/mongodb/mongo-go-driver/internal/testutil"
 	"github.com/mongodb/mongo-go-driver/mongo"
+	"github.com/mongodb/mongo-go-driver/mongo/options"
 	"github.com/mongodb/mongo-go-driver/x/bsonx"
 )
 
@@ -27,7 +28,7 @@ func getClientDB(ctx context.Context) (*mongo.Database, error) {
 	if err != nil {
 		return nil, err
 	}
-	client, err := mongo.NewClient(cs.String())
+	client, err := mongo.NewClient(options.Client().ApplyURI(cs.String()))
 	if err != nil {
 		return nil, err
 	}

diff --git a/examples/documentation_examples/examples_test.go b/examples/documentation_examples/examples_test.go
@@ -16,12 +16,13 @@ import (
 	"github.com/mongodb/mongo-go-driver/examples/documentation_examples"
 	"github.com/mongodb/mongo-go-driver/internal/testutil"
 	"github.com/mongodb/mongo-go-driver/mongo"
+	"github.com/mongodb/mongo-go-driver/mongo/options"
 	"github.com/stretchr/testify/require"
 )
 
 func TestDocumentationExamples(t *testing.T) {
 	cs := testutil.ConnString(t)
-	client, err := mongo.Connect(context.Background(), cs.String(), nil)
+	client, err := mongo.Connect(context.Background(), options.Client().ApplyURI(cs.String()))
 	require.NoError(t, err)
 
 	db := client.Database("documentation_examples")

diff --git a/mongo/change_stream.go b/mongo/change_stream.go
@@ -104,7 +104,11 @@ func createCmdDocs(csType StreamType, opts *options.ChangeStreamOptions, registr
 		cursorDoc = cursorDoc.Append("batchSize", bsonx.Int32(*opts.BatchSize))
 	}
 	if opts.Collation != nil {
-		optsDoc = optsDoc.Append("collation", bsonx.Document(opts.Collation.ToDocument()))
+		collDoc, err := bsonx.ReadDoc(opts.Collation.ToDocument())
+		if err != nil {
+			return nil, nil, nil, nil, err
+		}
+		optsDoc = optsDoc.Append("collation", bsonx.Document(collDoc))
 	}
 	if opts.FullDocument != nil {
 		pipelineDoc = pipelineDoc.Append("fullDocument", bsonx.String(string(*opts.FullDocument)))
@@ -131,7 +135,7 @@ func createCmdDocs(csType StreamType, opts *options.ChangeStreamOptions, registr
 
 func getSession(ctx context.Context, client *Client) (Session, error) {
 	sess := sessionFromContext(ctx)
-	if err := client.ValidSession(sess); err != nil {
+	if err := client.validSession(sess); err != nil {
 		return nil, err
 	}