improve interface

Author: qingyang-hu

internal/options/options.go

@@ -0,0 +1,45 @@
+// Copyright (C) MongoDB, Inc. 2025-present.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+package options
+
+// Options stores internal options.
+type Options struct {
+	values map[string]any
+}
+
+// WithValue sets an option value with the associated key.
+func WithValue(opts Options, key string, option any) Options {
+	if opts.values == nil {
+		opts.values = make(map[string]any)
+	}
+	opts.values[key] = option
+	return opts
+}
+
+// Value returns the value associated with the options for key.
+func Value(opts Options, key string) any {
+	if opts.values == nil {
+		return nil
+	}
+	if val, ok := opts.values[key]; ok {
+		return val
+	}
+	return nil
+}
+
+// Equal compares two Options instances for equality.
+func Equal(opts1, opts2 Options) bool {
+	if len(opts1.values) != len(opts2.values) {
+		return false
+	}
+	for key, val1 := range opts1.values {
+		if val2, ok := opts2.values[key]; !ok || val1 != val2 {
+			return false
+		}
+	}
+	return true
+}

mongo/options/clientoptions.go

@@ -26,6 +26,7 @@ import (
 	"go.mongodb.org/mongo-driver/v2/bson"
 	"go.mongodb.org/mongo-driver/v2/event"
 	"go.mongodb.org/mongo-driver/v2/internal/httputil"
+	"go.mongodb.org/mongo-driver/v2/internal/options"
 	"go.mongodb.org/mongo-driver/v2/mongo/readconcern"
 	"go.mongodb.org/mongo-driver/v2/mongo/readpref"
 	"go.mongodb.org/mongo-driver/v2/mongo/writeconcern"
@@ -295,6 +296,12 @@ type ClientOptions struct {
 	// release.
 	Deployment driver.Deployment
 
+	// Custom specifies internal options for the new Client.
+	//
+	// Deprecated: This option is for internal use only and should not be set. It may be changed or removed in any
+	// release.
+	Custom options.Options
+
 	connString *connstring.ConnString
 	err        error
 }

mongo/options/clientoptions_test.go

@@ -27,6 +27,7 @@ import (
 	"go.mongodb.org/mongo-driver/v2/event"
 	"go.mongodb.org/mongo-driver/v2/internal/assert"
 	"go.mongodb.org/mongo-driver/v2/internal/httputil"
+	"go.mongodb.org/mongo-driver/v2/internal/options"
 	"go.mongodb.org/mongo-driver/v2/internal/ptrutil"
 	"go.mongodb.org/mongo-driver/v2/mongo/readconcern"
 	"go.mongodb.org/mongo-driver/v2/mongo/readpref"
@@ -156,6 +157,7 @@ func TestClientOptions(t *testing.T) {
 				cmp.Comparer(func(r1, r2 *bson.Registry) bool { return r1 == r2 }),
 				cmp.Comparer(func(cfg1, cfg2 *tls.Config) bool { return cfg1 == cfg2 }),
 				cmp.Comparer(func(fp1, fp2 *event.PoolMonitor) bool { return fp1 == fp2 }),
+				cmp.Comparer(options.Equal),
 				cmp.AllowUnexported(ClientOptions{}),
 				cmpopts.IgnoreFields(http.Client{}, "Transport"),
 			); diff != "" {
@@ -1253,6 +1255,7 @@ func TestApplyURI(t *testing.T) {
 				cmp.Comparer(func(r1, r2 *bson.Registry) bool { return r1 == r2 }),
 				cmp.Comparer(compareTLSConfig),
 				cmp.Comparer(compareErrors),
+				cmp.Comparer(options.Equal),
 				cmpopts.SortSlices(stringLess),
 				cmpopts.IgnoreFields(connstring.ConnString{}, "SSLClientCertificateKeyPassword"),
 				cmpopts.IgnoreFields(http.Client{}, "Transport"),

mongo/options/internaloptions.go renamed to x/mongo/driver/options/options.go

@@ -9,31 +9,30 @@ package options
 import (
 	"fmt"
 
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver"
 )
 
 // SetInternalClientOptions sets internal options for ClientOptions.
 //
 // Deprecated: This function is for internal use only. It may be changed or removed in any release.
-func SetInternalClientOptions(opts *ClientOptions, custom map[string]any) (*ClientOptions, error) {
+func SetInternalClientOptions(opts *options.ClientOptions, key string, option any) error {
 	const typeErr = "unexpected type for %s"
-	for k, v := range custom {
-		switch k {
-		case "crypt":
-			c, ok := v.(driver.Crypt)
-			if !ok {
-				return nil, fmt.Errorf(typeErr, k)
-			}
-			opts.Crypt = c
-		case "deployment":
-			d, ok := v.(driver.Deployment)
-			if !ok {
-				return nil, fmt.Errorf(typeErr, k)
-			}
-			opts.Deployment = d
-		default:
-			return nil, fmt.Errorf("unsupported option: %s", k)
+	switch key {
+	case "crypt":
+		c, ok := option.(driver.Crypt)
+		if !ok {
+			return fmt.Errorf(typeErr, key)
 		}
+		opts.Crypt = c
+	case "deployment":
+		d, ok := option.(driver.Deployment)
+		if !ok {
+			return fmt.Errorf(typeErr, key)
+		}
+		opts.Deployment = d
+	default:
+		return fmt.Errorf("unsupported option: %s", key)
 	}
-	return opts, nil
+	return nil
 }

mongo/options/internaloptions_test.go renamed to x/mongo/driver/options/options_test.go

@@ -10,64 +10,55 @@ import (
 	"testing"
 
 	"go.mongodb.org/mongo-driver/v2/internal/require"
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver"
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/drivertest"
 )
 
-func TestSetClientOptions(t *testing.T) {
+func TestSetInternalClientOptions(t *testing.T) {
 	t.Parallel()
 
-	t.Run("set Crypt with driver.Crypt", func(t *testing.T) {
+	t.Run("crypt with driver.Crypt", func(t *testing.T) {
 		t.Parallel()
 
-		opts := &ClientOptions{}
 		c := driver.NewCrypt(&driver.CryptOptions{})
-		opts, err := SetInternalClientOptions(opts, map[string]any{
-			"crypt": c,
-		})
-		require.NoError(t, err)
-		require.Equal(t, c, opts.Crypt)
+		opts := options.Client()
+		err := SetInternalClientOptions(opts, "crypt", c)
+		require.NoError(t, err, "error setting crypt: %v", err)
+		require.Equal(t, c, opts.Crypt, "expected %v, got %v", c, opts.Crypt)
 	})
 
 	t.Run("set Crypt with driver.Deployment", func(t *testing.T) {
 		t.Parallel()
 
-		opts := &ClientOptions{}
-		_, err := SetInternalClientOptions(opts, map[string]any{
-			"crypt": &drivertest.MockDeployment{},
-		})
+		opts := options.Client()
+		err := SetInternalClientOptions(opts, "crypt", &drivertest.MockDeployment{})
 		require.EqualError(t, err, "unexpected type for crypt")
 	})
 
 	t.Run("set Deployment with driver.Deployment", func(t *testing.T) {
 		t.Parallel()
 
-		opts := &ClientOptions{}
 		d := &drivertest.MockDeployment{}
-		opts, err := SetInternalClientOptions(opts, map[string]any{
-			"deployment": d,
-		})
+		opts := options.Client()
+		err := SetInternalClientOptions(opts, "deployment", d)
 		require.NoError(t, err)
 		require.Equal(t, d, opts.Deployment)
 	})
 
 	t.Run("set Deployment with driver.Crypt", func(t *testing.T) {
 		t.Parallel()
 
-		opts := &ClientOptions{}
-		_, err := SetInternalClientOptions(opts, map[string]any{
-			"deployment": driver.NewCrypt(&driver.CryptOptions{}),
-		})
+		opts := options.Client()
+		err := SetInternalClientOptions(opts, "deployment", driver.NewCrypt(&driver.CryptOptions{}))
 		require.EqualError(t, err, "unexpected type for deployment")
 	})
 
 	t.Run("set unsupported option", func(t *testing.T) {
 		t.Parallel()
 
-		opts := &ClientOptions{}
-		_, err := SetInternalClientOptions(opts, map[string]any{
-			"unsupported": "unsupported",
-		})
+		opts := options.Client()
+		err := SetInternalClientOptions(opts, "unsupported", "unsupported")
 		require.EqualError(t, err, "unsupported option: unsupported")
 	})
 }