test setup handles merging url with extra url.Values option

FerretDB · chilagrow · Jun 29, 2023 · Jun 21, 2023 · Jun 21, 2023 · Jun 23, 2023
commit b0e876149305945248ae9116a8c45d33df87d6d7
@@ -415,14 +415,13 @@ func TestCommandsDiagnosticWhatsMyURI(t *testing.T) {
 func TestCommandWhatsMyURIConnection(t *testing.T) {
 	t.Parallel()
 
-	// set 1 to ensure only one pool exists duration of the test,
+	// set minPoolSize and maxPoolSize 1 to ensure only one pool exists duration of the test,
 	// which forces a client to use a single connection pool
-	q1 := url.Values{}
-	q1.Set("maxPoolSize", "1")
-	q1.Set("minPoolSize", "1")
-
 	s := setup.SetupWithOpts(t, &setup.SetupOpts{
-		ExtraOptions: q1,
+		ExtraOptions: url.Values{
+			"minPoolSize": []string{"1"},
+			"maxPoolSize": []string{"1"},
+		},
 	})
 
 	collection1 := s.Collection

@@ -77,24 +77,9 @@ func mongoDBURI(tb testing.TB, opts *mongoDBURIOpts) string {
 	return u.String()
 }
 
-// makeClient returns new client for the given MongoDB URI and extra options.
-// The extraOpts that comes later overwrites value for the query key.
-func makeClient(ctx context.Context, uri string, extraOpts url.Values) (*mongo.Client, error) {
-	u, err := url.Parse(uri)
-	if err != nil {
-		return nil, err
-	}
-
-	q := u.Query()
-
-	for k, vs := range extraOpts {
-		for _, v := range vs {
-			q.Set(k, v)
-		}
-	}
-
-	u.RawQuery = q.Encode()
-	clientOpts := options.Client().ApplyURI(u.String())
+// makeClient returns new client for the given working MongoDB URI.
+func makeClient(ctx context.Context, uri string) (*mongo.Client, error) {
+	clientOpts := options.Client().ApplyURI(uri)
 	clientOpts.SetMonitor(otelmongo.NewMonitor())
 
 	client, err := mongo.Connect(ctx, clientOpts)
@@ -117,15 +102,15 @@ func makeClient(ctx context.Context, uri string, extraOpts url.Values) (*mongo.C
 //
 // If the connection can't be established, it panics,
 // as it doesn't make sense to proceed with other tests if we couldn't connect in one of them.
-func setupClient(tb testing.TB, ctx context.Context, uri string, extraOpts url.Values) *mongo.Client {
+func setupClient(tb testing.TB, ctx context.Context, uri string) *mongo.Client {
 	tb.Helper()
 
 	ctx, span := otel.Tracer("").Start(ctx, "setupClient")
 	defer span.End()
 
 	defer observability.FuncCall(ctx)()
 
-	client, err := makeClient(ctx, uri, extraOpts)
+	client, err := makeClient(ctx, uri)
 	if err != nil {
 		tb.Error(err)
 		panic("setupClient: " + err.Error())

@@ -212,7 +212,7 @@ func setupListener(tb testing.TB, ctx context.Context, logger *zap.Logger) (*mon
 	// those will fail the test if in-process FerretDB is not working;
 	// for example, when backend is down
 	uri := mongoDBURI(tb, &clientOpts)
-	client := setupClient(tb, ctx, uri, nil)
+	client := setupClient(tb, ctx, uri)
 
 	logger.Info("Listener started", zap.String("handler", handler), zap.String("uri", uri))
 

@@ -143,7 +143,18 @@ func SetupWithOpts(tb testing.TB, opts *SetupOpts) *SetupResult {
 	if *targetURLF == "" {
 		client, uri = setupListener(tb, setupCtx, logger)
 	} else {
-		client = setupClient(tb, setupCtx, *targetURLF, opts.ExtraOptions)
+		u, err := url.Parse(*targetURLF)
+		require.NoError(tb, err)
+
+		q := u.Query()
+		for k, vs := range opts.ExtraOptions {
+			for _, v := range vs {
+				q.Set(k, v)
+			}
+		}
+
+		u.RawQuery = q.Encode()
+		client = setupClient(tb, setupCtx, u.String())
 		uri = *targetURLF
 	}
 

@@ -96,15 +96,15 @@ func SetupCompatWithOpts(tb testing.TB, opts *SetupCompatOpts) *SetupCompatResul
 	if *targetURLF == "" {
 		targetClient, _ = setupListener(tb, setupCtx, logger)
 	} else {
-		targetClient = setupClient(tb, setupCtx, *targetURLF, nil)
+		targetClient = setupClient(tb, setupCtx, *targetURLF)
 	}
 
 	// register cleanup function after setupListener registers its own to preserve full logs
 	tb.Cleanup(cancel)
 
 	targetCollections := setupCompatCollections(tb, setupCtx, targetClient, opts, *targetBackendF)
 
-	compatClient := setupClient(tb, setupCtx, *compatURLF, nil)
+	compatClient := setupClient(tb, setupCtx, *compatURLF)
 	compatCollections := setupCompatCollections(tb, setupCtx, compatClient, opts, "mongodb")
 
 	level.SetLevel(*logLevelF)

diff --git a/integration/setup/startup.go b/integration/setup/startup.go
@@ -81,7 +81,7 @@ func Startup() {
 	must.NoError(os.MkdirAll(sqliteDir, 0o777))
 
 	if u := *targetURLF; u != "" {
-		client, err := makeClient(ctx, u, nil)
+		client, err := makeClient(ctx, u)
 		if err != nil {
 			zap.S().Fatalf("Failed to connect to target system %s: %s", u, err)
 		}
@@ -94,7 +94,7 @@ func Startup() {
 	}
 
 	if u := *compatURLF; u != "" {
-		client, err := makeClient(ctx, u, nil)
+		client, err := makeClient(ctx, u)
 		if err != nil {
 			zap.S().Fatalf("Failed to connect to compat system %s: %s", u, err)
 		}