GODRIVER-2057 Fix uri merging on options.ClientOptions (#689)

Author: hoonmin

mongo/options/clientoptions.go

@@ -819,7 +819,12 @@ func MergeClientOptions(opts ...*ClientOptions) *ClientOptions {
 		if opt.err != nil {
 			c.err = opt.err
 		}
-
+		if opt.uri != "" {
+			c.uri = opt.uri
+		}
+		if opt.cs != nil {
+			c.cs = opt.cs
+		}
 	}
 
 	return c

mongo/options/clientoptions_test.go

@@ -174,6 +174,16 @@ func TestClientOptions(t *testing.T) {
 				t.Errorf("Merged client options do not match. got %v; want %v", got.err.Error(), opt1.err.Error())
 			}
 		})
+
+		t.Run("MergeClientOptions/uri", func(t *testing.T) {
+			opt1, opt2 := Client(), Client()
+			opt1.uri = "Test URI"
+
+			got := MergeClientOptions(nil, opt1, opt2)
+			if got.uri != "Test URI" {
+				t.Errorf("Merged client options do not match. got %v; want %v", got.uri, opt1.uri)
+			}
+		})
 	})
 	t.Run("ApplyURI", func(t *testing.T) {
 		baseClient := func() *ClientOptions {