Add mongo/clientopt

GODRIVER-272
GODRIVER-450

Change-Id: I90ca993fc7605b71a4b32283694af68a68a9279d

Author: rfblue2

mongo/client.go

@@ -20,6 +20,7 @@ import (
 	"github.com/mongodb/mongo-go-driver/core/tag"
 	"github.com/mongodb/mongo-go-driver/core/topology"
 	"github.com/mongodb/mongo-go-driver/core/writeconcern"
+	"github.com/mongodb/mongo-go-driver/mongo/clientopt"
 )
 
 const defaultLocalThreshold = 15 * time.Millisecond
@@ -36,8 +37,8 @@ type Client struct {
 }
 
 // Connect creates a new Client and then initializes it using the Connect method.
-func Connect(ctx context.Context, uri string, opts *ClientOptions) (*Client, error) {
-	c, err := NewClientWithOptions(uri, opts)
+func Connect(ctx context.Context, uri string, opts ...clientopt.Option) (*Client, error) {
+	c, err := NewClientWithOptions(uri, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -61,13 +62,13 @@ func NewClient(uri string) (*Client, error) {
 // NewClientWithOptions creates a new client to connect to to a cluster specified by the connection
 // string and the options manually passed in. If the same option is configured in both the
 // connection string and the manual options, the manual option will be ignored.
-func NewClientWithOptions(uri string, opts *ClientOptions) (*Client, error) {
+func NewClientWithOptions(uri string, opts ...clientopt.Option) (*Client, error) {
 	cs, err := connstring.Parse(uri)
 	if err != nil {
 		return nil, err
 	}
 
-	return newClient(cs, opts)
+	return newClient(cs, opts...)
 }
 
 // NewClientFromConnString creates a new client to connect to a cluster, with configuration
@@ -94,20 +95,16 @@ func (c *Client) Disconnect(ctx context.Context) error {
 	return c.topology.Disconnect(ctx)
 }
 
-func newClient(cs connstring.ConnString, opts *ClientOptions) (*Client, error) {
-	client := &Client{
-		connString:     cs,
-		localThreshold: defaultLocalThreshold,
+func newClient(cs connstring.ConnString, opts ...clientopt.Option) (*Client, error) {
+	clientOpt, err := clientopt.BundleClient(opts...).Unbundle(cs)
+	if err != nil {
+		return nil, err
 	}
 
-	if opts != nil {
-		for opts.opt != nil {
-			err := opts.opt(client)
-			if err != nil {
-				return nil, err
-			}
-			opts = opts.next
-		}
+	client := &Client{
+		topologyOptions: clientOpt.TopologyOptions,
+		connString:      clientOpt.ConnString,
+		localThreshold:  defaultLocalThreshold,
 	}
 
 	topts := append(
@@ -120,19 +117,23 @@ func newClient(cs connstring.ConnString, opts *ClientOptions) (*Client, error) {
 	}
 	client.topology = topo
 
-	client.readConcern = readConcernFromConnString(&client.connString)
-	client.writeConcern = writeConcernFromConnString(&client.connString)
-
-	rp, err := readPreferenceFromConnString(&client.connString)
-	if err != nil {
-		return nil, err
+	if client.readConcern == nil {
+		client.readConcern = readConcernFromConnString(&client.connString)
 	}
-	if rp != nil {
-		client.readPreference = rp
-	} else {
-		client.readPreference = readpref.Primary()
+	if client.writeConcern == nil {
+		client.writeConcern = writeConcernFromConnString(&client.connString)
+	}
+	if client.readPreference == nil {
+		rp, err := readPreferenceFromConnString(&client.connString)
+		if err != nil {
+			return nil, err
+		}
+		if rp != nil {
+			client.readPreference = rp
+		} else {
+			client.readPreference = readpref.Primary()
+		}
 	}
-
 	return client, nil
 }
 

mongo/client_internal_test.go

@@ -21,6 +21,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"time"
+
+	"github.com/mongodb/mongo-go-driver/mongo/clientopt"
 )
 
 func createTestClient(t *testing.T) *Client {
@@ -49,6 +51,22 @@ func TestClient_Database(t *testing.T) {
 	require.Exactly(t, c, db.Client())
 }
 
+func TestClientOptions(t *testing.T) {
+	t.Parallel()
+
+	c, err := NewClientWithOptions("mongodb://localhost",
+		clientopt.MaxConnIdleTime(200),
+		clientopt.ReplicaSet("test"),
+		clientopt.LocalThreshold(10),
+		clientopt.MaxConnIdleTime(100),
+		clientopt.LocalThreshold(20))
+	require.NoError(t, err)
+
+	require.Equal(t, time.Duration(20), c.connString.LocalThreshold)
+	require.Equal(t, time.Duration(100), c.connString.MaxConnIdleTime)
+	require.Equal(t, "test", c.connString.ReplicaSet)
+}
+
 func TestClient_TLSConnection(t *testing.T) {
 	t.Parallel()
 

mongo/client_options_test.go

@@ -9,7 +9,12 @@ import (
 	"time"
 
 	"github.com/mongodb/mongo-go-driver/core/connstring"
+	"github.com/mongodb/mongo-go-driver/core/readconcern"
+	"github.com/mongodb/mongo-go-driver/core/readpref"
+	"github.com/mongodb/mongo-go-driver/core/tag"
+	"github.com/mongodb/mongo-go-driver/core/writeconcern"
 	"github.com/mongodb/mongo-go-driver/internal/testutil"
+	"github.com/mongodb/mongo-go-driver/mongo/clientopt"
 	"github.com/stretchr/testify/require"
 )
 
@@ -21,7 +26,7 @@ func TestClientOptions_simple(t *testing.T) {
 	}
 
 	cs := testutil.ConnString(t)
-	client, err := NewClientWithOptions(cs.String(), ClientOpt.AppName("foo"))
+	client, err := NewClientWithOptions(cs.String(), clientopt.AppName("foo"))
 	require.NoError(t, err)
 
 	require.Equal(t, "foo", client.connString.AppName)
@@ -37,7 +42,7 @@ func TestClientOptions_deferToConnString(t *testing.T) {
 	cs := testutil.ConnString(t)
 	uri := testutil.AddOptionsToURI(cs.String(), "appname=bar")
 
-	client, err := NewClientWithOptions(uri, ClientOpt.AppName("foo"))
+	client, err := NewClientWithOptions(uri, clientopt.AppName("foo"))
 	require.NoError(t, err)
 
 	require.Equal(t, "bar", client.connString.AppName)
@@ -47,7 +52,7 @@ func TestClientOptions_doesNotAlterConnectionString(t *testing.T) {
 	t.Parallel()
 
 	cs := connstring.ConnString{}
-	client, err := newClient(cs, ClientOpt.AppName("foobar"))
+	client, err := newClient(cs, clientopt.AppName("foobar"))
 	require.NoError(t, err)
 	if cs.AppName != "" {
 		t.Errorf("Creating a new Client should not alter the original connection string, but it did. got %s; want <empty>", cs.AppName)
@@ -59,53 +64,60 @@ func TestClientOptions_doesNotAlterConnectionString(t *testing.T) {
 
 func TestClientOptions_chainAll(t *testing.T) {
 	t.Parallel()
-
-	opts := ClientOpt.
+	readPrefMode, err := readpref.ModeFromString("secondary")
+	require.NoError(t, err)
+	rp, err := readpref.New(
+		readPrefMode,
+		readpref.WithTagSets(tag.NewTagSetsFromMaps([]map[string]string{{"nyc": "1"}})...),
+		readpref.WithMaxStaleness(2*time.Second),
+	)
+	require.NoError(t, err)
+	opts := clientopt.BundleClient().
 		AppName("foo").
-		AuthMechanism("MONGODB-X509").
-		AuthMechanismProperties(map[string]string{"foo": "bar"}).
-		AuthSource("$external").
+		Auth(clientopt.Credential{
+			AuthMechanism:           "MONGODB-X509",
+			AuthMechanismProperties: map[string]string{"foo": "bar"},
+			AuthSource:              "$external",
+			Password:                "supersecurepassword",
+			Username:                "admin",
+		}).
 		ConnectTimeout(500 * time.Millisecond).
 		HeartbeatInterval(15 * time.Second).
 		Hosts([]string{
 			"mongodb://localhost:27018",
 			"mongodb://localhost:27019"}).
-		Journal(true).
 		LocalThreshold(time.Second).
 		MaxConnIdleTime(30 * time.Second).
 		MaxConnsPerHost(150).
 		MaxIdleConnsPerHost(20).
-		Password("supersecurepassword").
-		ReadConcernLevel("majority").
-		ReadPreference("secondary").
-		ReadPreferenceTagSets([]map[string]string{
-			{"nyc": "1"}}).
-		MaxStaleness(2 * time.Second).
+		ReadConcern(readconcern.New(readconcern.Level("majority"))).
+		ReadPreference(rp).
 		ReplicaSet("foo").
 		ServerSelectionTimeout(time.Second).
 		Single(false).
 		SocketTimeout(2 * time.Second).
-		SSL(true).
-		SSLClientCertificateKeyFile("client.pem").
-		SSLClientCertificateKeyPassword(func() string { return "password" }).
-		SSLInsecure(false).
-		SSLCaFile("ca.pem").
-		WString("majority").
-		WNumber(3).
-		Username("admin").
-		WTimeout(2 * time.Second)
-
-	client := new(Client)
-	for opts.opt != nil {
-		err := opts.opt(client)
-		require.NoError(t, err)
-		opts = opts.next
-	}
+		SSL(&clientopt.SSLOpt{
+			Enabled:                      true,
+			ClientCertificateKeyFile:     "client.pem",
+			ClientCertificateKeyPassword: func() string { return "password" },
+			Insecure:                     false,
+			CaFile:                       "ca.pem",
+		}).
+		WriteConcern(writeconcern.New(
+			writeconcern.J(true),
+			writeconcern.WTagSet("majority"),
+			writeconcern.W(3),
+			writeconcern.WTimeout(2*time.Second),
+		))
+
+	client, err := opts.Unbundle(connstring.ConnString{})
+	require.NoError(t, err)
+	require.NotNil(t, client)
 }
 
 func TestClientOptions_CustomDialer(t *testing.T) {
 	td := &testDialer{d: &net.Dialer{}}
-	opts := ClientOpt.Dialer(td)
+	opts := clientopt.Dialer(td)
 	client, err := newClient(testutil.ConnString(t), opts)
 	require.NoError(t, err)
 	err = client.Connect(context.Background())