GODRIVER-2696 Use an options pattern that doesn't require merging structs

internal/integration/client_side_encryption_prose_test.go

@@ -2642,7 +2642,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
 						SetAlgorithm("RangePreview").
 						SetKeyID(key1ID).
 						SetContentionFactor(0).
-						SetRangeOptions(*test.rangeOpts)
+						SetRangeOptions(test.rangeOpts)
 					// Insert 0.
 					insertPayloadZero, err := clientEncryption.Encrypt(context.Background(), test.zero, eo)
 					assert.Nil(mt, err, "error in Encrypt: %v", err)
@@ -2689,7 +2689,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
 						SetAlgorithm("RangePreview").
 						SetKeyID(key1ID).
 						SetContentionFactor(0).
-						SetRangeOptions(*test.rangeOpts)
+						SetRangeOptions(test.rangeOpts)
 					insertPayloadSix, err := clientEncryption.Encrypt(context.Background(), test.six, eo)
 					assert.Nil(mt, err, "error in Encrypt: %v", err)
 					got, err := clientEncryption.Decrypt(context.Background(), insertPayloadSix)
@@ -2706,7 +2706,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
 						SetKeyID(key1ID).
 						SetContentionFactor(0).
 						SetQueryType("rangePreview").
-						SetRangeOptions(*test.rangeOpts)
+						SetRangeOptions(test.rangeOpts)
 
 					expr := bson.M{
 						"$and": bson.A{
@@ -2748,7 +2748,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
 						SetKeyID(key1ID).
 						SetContentionFactor(0).
 						SetQueryType("rangePreview").
-						SetRangeOptions(*test.rangeOpts)
+						SetRangeOptions(test.rangeOpts)
 
 					expr := bson.M{
 						"$and": bson.A{
@@ -2790,7 +2790,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
 						SetKeyID(key1ID).
 						SetContentionFactor(0).
 						SetQueryType("rangePreview").
-						SetRangeOptions(*test.rangeOpts)
+						SetRangeOptions(test.rangeOpts)
 
 					expr := bson.M{
 						"$and": bson.A{
@@ -2827,7 +2827,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
 						SetKeyID(key1ID).
 						SetContentionFactor(0).
 						SetQueryType("rangePreview").
-						SetRangeOptions(*test.rangeOpts)
+						SetRangeOptions(test.rangeOpts)
 
 					expr := bson.M{
 						"$and": bson.A{
@@ -2865,7 +2865,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
 							SetAlgorithm("RangePreview").
 							SetKeyID(key1ID).
 							SetContentionFactor(0).
-							SetRangeOptions(*test.rangeOpts)
+							SetRangeOptions(test.rangeOpts)
 
 						_, err := clientEncryption.Encrypt(context.Background(), test.twoHundredOne, eo)
 						assert.NotNil(mt, err, "expected error, but got none")
@@ -2879,7 +2879,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
 							SetAlgorithm("RangePreview").
 							SetKeyID(key1ID).
 							SetContentionFactor(0).
-							SetRangeOptions(*test.rangeOpts)
+							SetRangeOptions(test.rangeOpts)
 
 						var val bson.RawValue
 						if test.field == "encryptedInt" {
@@ -2906,7 +2906,7 @@ func TestClientSideEncryptionProse(t *testing.T) {
 							SetAlgorithm("RangePreview").
 							SetKeyID(key1ID).
 							SetContentionFactor(0).
-							SetRangeOptions(*ro)
+							SetRangeOptions(ro)
 
 						_, err := clientEncryption.Encrypt(context.Background(), test.six, eo)
 						assert.NotNil(mt, err, "expected error, but got none")

internal/integration/mtest/mongotest.go

@@ -709,7 +709,7 @@ func (t *T) createTestClient() {
 		t.mockDeployment = newMockDeployment()
 		args.Deployment = t.mockDeployment
 
-		opts := &mongoutil.Options[options.ClientArgs]{Args: args}
+		opts := &mongoutil.ArgOptions[options.ClientArgs]{Args: args}
 		t.Client, err = mongo.Connect(opts)
 	case Proxy:
 		t.proxyDialer = newProxyDialer()

internal/integration/unified/collection_operation_execution.go

@@ -1126,7 +1126,7 @@ func executeListSearchIndexes(ctx context.Context, operation *operation) (*opera
 	}
 
 	searchIdxOpts := options.SearchIndexes()
-	var opts []*mongoutil.Options[options.ListSearchIndexesArgs]
+	var opts []*mongoutil.ArgOptions[options.ListSearchIndexesArgs]
 
 	elems, err := operation.Arguments.Elements()
 	if err != nil {
@@ -1141,9 +1141,9 @@ func executeListSearchIndexes(ctx context.Context, operation *operation) (*opera
 			searchIdxOpts.SetName(val.StringValue())
 		case "aggregationOptions":
 			// Unmarshal the document into the AggregateArgs embedded object.
-			opt := &mongoutil.Options[options.ListSearchIndexesArgs]{
+			opt := &mongoutil.ArgOptions[options.ListSearchIndexesArgs]{
 				Args: &options.ListSearchIndexesArgs{},
-				Clbk: func(args *options.ListSearchIndexesArgs) error {
+				Callback: func(args *options.ListSearchIndexesArgs) error {
 					args.AggregateArgs = &options.AggregateArgs{}
 
 					return bson.Unmarshal(val.Document(), args.AggregateArgs)

internal/mongoutil/mongoutil.go

@@ -71,25 +71,25 @@ func NewArgsFromOptions[T Args](opts ...MongoOptions[T]) (*T, error) {
 	return args, nil
 }
 
-// Options implements a mongo.Options object for an arbitrary arguments type.
+// ArgOptions implements a mongo.ArgOptions object for an arbitrary arguments type.
 // The intended use case is to create options from arguments.
-type Options[T Args] struct {
-	Args *T             // Arguments to set on the option type
-	Clbk func(*T) error // A callback for further modification
+type ArgOptions[T Args] struct {
+	Args     *T             // Arguments to set on the option type
+	Callback func(*T) error // A callback for further modification
 }
 
 // ArgsSetters will re-assign the entire argument option to the Args field
 // defined on opts. If a callback exists, that function will be executed to
 // further modify the arguments.
-func (opts *Options[T]) ArgsSetters() []func(*T) error {
+func (opts *ArgOptions[T]) ArgsSetters() []func(*T) error {
 	return []func(*T) error{
 		func(args *T) error {
 			if opts.Args != nil {
 				*args = *opts.Args
 			}
 
-			if opts.Clbk != nil {
-				return opts.Clbk(args)
+			if opts.Callback != nil {
+				return opts.Callback(args)
 			}
 
 			return nil
@@ -99,8 +99,8 @@ func (opts *Options[T]) ArgsSetters() []func(*T) error {
 
 // NewOptionsFromArgs will construct an Options object from the provided
 // arguments object.
-func NewOptionsFromArgs[T Args](args *T, clbk func(*T) error) *Options[T] {
-	return &Options[T]{Args: args, Clbk: clbk}
+func NewOptionsFromArgs[T Args](args *T) *ArgOptions[T] {
+	return &ArgOptions[T]{Args: args}
 }
 
 // AuthFromURI will create a Credentials object given the provided URI.

internal/mongoutil/mongoutil_test.go

@@ -141,19 +141,8 @@ func TestNewOptionsFromArgs(t *testing.T) {
 		{
 			name: "no callback",
 			args: &options.ClientArgs{AppName: ptrutil.Ptr[string]("testApp")},
-			clbk: nil,
 			want: options.ClientArgs{AppName: ptrutil.Ptr[string]("testApp")},
 		},
-		{
-			name: "mutating callback",
-			args: &options.ClientArgs{AppName: ptrutil.Ptr[string]("testApp1")},
-			clbk: func(args *options.ClientArgs) error {
-				*args.AppName = "testApp2"
-
-				return nil
-			},
-			want: options.ClientArgs{AppName: ptrutil.Ptr[string]("testApp2")},
-		},
 	}
 
 	for _, test := range clientTests {
@@ -162,7 +151,7 @@ func TestNewOptionsFromArgs(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
 
-			opts := NewOptionsFromArgs[options.ClientArgs](test.args, test.clbk)
+			opts := NewOptionsFromArgs[options.ClientArgs](test.args)
 
 			got, err := NewArgsFromOptions[options.ClientArgs](opts)
 			assert.NoError(t, err)

mongo/client.go

@@ -211,10 +211,6 @@ func newClient(opts ...Options[options.ClientArgs]) (*Client, error) {
 		args.MaxPoolSize = &defaultMaxPoolSize
 	}
 
-	if err != nil {
-		return nil, err
-	}
-
 	cfg, err := topology.NewConfigFromArgs(args, client.clock)
 	if err != nil {
 		return nil, err
@@ -501,7 +497,7 @@ func (c *Client) getOrCreateInternalClient(args *options.ClientArgs) (*Client, e
 	argsCopy.AutoEncryptionOptions = nil
 	argsCopy.MinPoolSize = ptrutil.Ptr[uint64](0)
 
-	opts := &mongoutil.Options[options.ClientArgs]{Args: &argsCopy}
+	opts := &mongoutil.ArgOptions[options.ClientArgs]{Args: &argsCopy}
 
 	var err error
 	c.internalClientFLE, err = newClient(opts)

mongo/client_encryption.go

@@ -128,7 +128,7 @@ func (ce *ClientEncryption) CreateEncryptedCollection(ctx context.Context,
 		}
 	}
 
-	updatedCreateOpts := mongoutil.NewOptionsFromArgs[options.CreateCollectionArgs](createArgs, nil)
+	updatedCreateOpts := mongoutil.NewOptionsFromArgs[options.CreateCollectionArgs](createArgs)
 	err = db.CreateCollection(ctx, coll, updatedCreateOpts)
 	if err != nil {
 		return nil, m, err

mongo/collection.go

@@ -826,7 +826,7 @@ func (coll *Collection) ReplaceOne(
 		Comment:                  args.Comment,
 	}
 
-	updateOptions := mongoutil.NewOptionsFromArgs[options.UpdateArgs](updateArgs, nil)
+	updateOptions := mongoutil.NewOptionsFromArgs[options.UpdateArgs](updateArgs)
 
 	return coll.updateOrReplace(ctx, f, r, false, rrOne, false, updateOptions)
 }

mongo/options/clientoptions.go

@@ -280,68 +280,6 @@ func (c *ClientOptions) ArgsSetters() []func(*ClientArgs) error {
 	return c.Opts
 }
 
-// ValidateClientArgs checks if the client arguments will create a valid
-// connection.
-func ValidateClientArgs(args *ClientArgs) error {
-	// Direct connections cannot be made if multiple hosts are specified or an SRV
-	// URI is used.
-	if args.Direct != nil && *args.Direct {
-		if len(args.Hosts) > 1 {
-			return errors.New("a direct connection cannot be made if multiple hosts are specified")
-		}
-		if args.connString != nil && args.connString.Scheme == connstring.SchemeMongoDBSRV {
-			return errors.New("a direct connection cannot be made if an SRV URI is used")
-		}
-	}
-
-	if args.MaxPoolSize != nil && args.MinPoolSize != nil && *args.MaxPoolSize != 0 &&
-		*args.MinPoolSize > *args.MaxPoolSize {
-		return fmt.Errorf("minPoolSize must be less than or equal to maxPoolSize, got minPoolSize=%d maxPoolSize=%d",
-			*args.MinPoolSize, *args.MaxPoolSize)
-	}
-
-	// verify server API version if ServerAPIOptions are passed in.
-	if args.ServerAPIOptions != nil {
-		serverAPIArgs, err := getArgs[ServerAPIArgs](args.ServerAPIOptions)
-		if err != nil {
-			return fmt.Errorf("failed to construct arguments from options: %w", err)
-		}
-
-		if err := serverAPIArgs.ServerAPIVersion.Validate(); err != nil {
-			return err
-		}
-	}
-
-	// Validation for load-balanced mode.
-	if args.LoadBalanced != nil && *args.LoadBalanced {
-		if len(args.Hosts) > 1 {
-			return connstring.ErrLoadBalancedWithMultipleHosts
-		}
-		if args.ReplicaSet != nil {
-			return connstring.ErrLoadBalancedWithReplicaSet
-		}
-		if args.Direct != nil && *args.Direct {
-			return connstring.ErrLoadBalancedWithDirectConnection
-		}
-	}
-
-	// Validation for srvMaxHosts.
-	if args.SRVMaxHosts != nil && *args.SRVMaxHosts > 0 {
-		if args.ReplicaSet != nil {
-			return connstring.ErrSRVMaxHostsWithReplicaSet
-		}
-		if args.LoadBalanced != nil && *args.LoadBalanced {
-			return connstring.ErrSRVMaxHostsWithLoadBalanced
-		}
-	}
-
-	if mode := args.ServerMonitoringMode; mode != nil && !connstring.IsValidServerMonitoringMode(*mode) {
-		return fmt.Errorf("invalid server monitoring mode: %q", *mode)
-	}
-
-	return nil
-}
-
 // GetURI returns the original URI used to configure the ClientOptions instance.
 // If ApplyURI was not called during construction, this returns "".
 func (args *ClientArgs) GetURI() string {
@@ -579,11 +517,69 @@ func (c *ClientOptions) GetURI() string {
 // error found.
 func (c *ClientOptions) Validate() error {
 	args, err := getArgs[ClientArgs](c)
+	//return err
+
 	if err != nil {
 		return err
 	}
 
-	return ValidateClientArgs(args)
+	// Direct connections cannot be made if multiple hosts are specified or an SRV
+	// URI is used.
+	if args.Direct != nil && *args.Direct {
+		if len(args.Hosts) > 1 {
+			return errors.New("a direct connection cannot be made if multiple hosts are specified")
+		}
+		if args.connString != nil && args.connString.Scheme == connstring.SchemeMongoDBSRV {
+			return errors.New("a direct connection cannot be made if an SRV URI is used")
+		}
+	}
+
+	if args.MaxPoolSize != nil && args.MinPoolSize != nil && *args.MaxPoolSize != 0 &&
+		*args.MinPoolSize > *args.MaxPoolSize {
+		return fmt.Errorf("minPoolSize must be less than or equal to maxPoolSize, got minPoolSize=%d maxPoolSize=%d",
+			*args.MinPoolSize, *args.MaxPoolSize)
+	}
+
+	// verify server API version if ServerAPIOptions are passed in.
+	if args.ServerAPIOptions != nil {
+		serverAPIArgs, err := getArgs[ServerAPIArgs](args.ServerAPIOptions)
+		if err != nil {
+			return fmt.Errorf("failed to construct arguments from options: %w", err)
+		}
+
+		if err := serverAPIArgs.ServerAPIVersion.Validate(); err != nil {
+			return err
+		}
+	}
+
+	// Validation for load-balanced mode.
+	if args.LoadBalanced != nil && *args.LoadBalanced {
+		if len(args.Hosts) > 1 {
+			return connstring.ErrLoadBalancedWithMultipleHosts
+		}
+		if args.ReplicaSet != nil {
+			return connstring.ErrLoadBalancedWithReplicaSet
+		}
+		if args.Direct != nil && *args.Direct {
+			return connstring.ErrLoadBalancedWithDirectConnection
+		}
+	}
+
+	// Validation for srvMaxHosts.
+	if args.SRVMaxHosts != nil && *args.SRVMaxHosts > 0 {
+		if args.ReplicaSet != nil {
+			return connstring.ErrSRVMaxHostsWithReplicaSet
+		}
+		if args.LoadBalanced != nil && *args.LoadBalanced {
+			return connstring.ErrSRVMaxHostsWithLoadBalanced
+		}
+	}
+
+	if mode := args.ServerMonitoringMode; mode != nil && !connstring.IsValidServerMonitoringMode(*mode) {
+		return fmt.Errorf("invalid server monitoring mode: %q", *mode)
+	}
+
+	return nil
 }
 
 // ApplyURI parses the given URI and sets options accordingly. The URI can contain host names, IPv4/IPv6 literals, or

mongo/options/encryptoptions.go

@@ -136,9 +136,9 @@ func (e *EncryptOptions) SetContentionFactor(contentionFactor int64) *EncryptOpt
 
 // SetRangeOptions specifies the options to use for explicit encryption with range. It is only valid to set if algorithm is "rangePreview".
 // Beta: The Range algorithm is experimental only. It is not intended for public use. It is subject to breaking changes.
-func (e *EncryptOptions) SetRangeOptions(ro RangeOptions) *EncryptOptions {
+func (e *EncryptOptions) SetRangeOptions(ro *RangeOptions) *EncryptOptions {
 	e.Opts = append(e.Opts, func(args *EncryptArgs) error {
-		args.RangeOptions = &ro
+		args.RangeOptions = ro
 
 		return nil
 	})

mongo/search_index_view.go

@@ -66,7 +66,7 @@ func (siv SearchIndexView) List(
 		return nil, err
 	}
 
-	aggregateOpts := &mongoutil.Options[options.AggregateArgs]{Args: args.AggregateArgs}
+	aggregateOpts := &mongoutil.ArgOptions[options.AggregateArgs]{Args: args.AggregateArgs}
 
 	return siv.coll.Aggregate(ctx, Pipeline{{{"$listSearchIndexes", index}}}, aggregateOpts)
 }