make rawDate internal

Author: qingyang-hu

internal/integration/unified/client_operation_execution.go

@@ -19,6 +19,7 @@ import (
 	"go.mongodb.org/mongo-driver/v2/mongo"
 	"go.mongodb.org/mongo-driver/v2/mongo/options"
 	"go.mongodb.org/mongo-driver/v2/x/bsonx/bsoncore"
+	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/xoptions"
 )
 
 // This file contains helpers to execute client operations.
@@ -236,7 +237,10 @@ func executeClientBulkWrite(ctx context.Context, operation *operation) (*operati
 			}
 			opts.SetWriteConcern(c)
 		case "rawData":
-			opts.SetRawData(val.Boolean())
+			err = xoptions.SetInternalClientBulkWriteOptions(opts, key, val.Boolean())
+			if err != nil {
+				return nil, err
+			}
 		default:
 			return nil, fmt.Errorf("unrecognized bulkWrite option %q", key)
 		}

internal/integration/unified/collection_operation_execution.go

@@ -297,7 +297,10 @@ func executeCreateIndex(ctx context.Context, operation *operation) (*operationRe
 		case "wildcardProjection":
 			indexOpts.SetWildcardProjection(val.Document())
 		case "rawData":
-			opts.SetRawData(val.Boolean())
+			err = xoptions.SetInternalCreateIndexesOptions(opts, key, val.Boolean())
+			if err != nil {
+				return nil, err
+			}
 		default:
 			return nil, fmt.Errorf("unrecognized createIndex option %q", key)
 		}
@@ -629,7 +632,10 @@ func executeDropIndex(ctx context.Context, operation *operation) (*operationResu
 			// this error.
 			return nil, fmt.Errorf("the maxTimeMS collection option is not supported")
 		case "rawData":
-			dropIndexOpts.SetRawData(val.Boolean())
+			err = xoptions.SetInternalDropIndexesOptions(dropIndexOpts, key, val.Boolean())
+			if err != nil {
+				return nil, err
+			}
 		default:
 			return nil, fmt.Errorf("unrecognized dropIndex option %q", key)
 		}
@@ -1224,7 +1230,10 @@ func executeListIndexes(ctx context.Context, operation *operation) (*operationRe
 		case "batchSize":
 			opts.SetBatchSize(val.Int32())
 		case "rawData":
-			opts.SetRawData(val.Boolean())
+			err = xoptions.SetInternalListIndexesOptions(opts, key, val.Boolean())
+			if err != nil {
+				return nil, err
+			}
 		default:
 			return nil, fmt.Errorf("unrecognized listIndexes option: %q", key)
 		}

internal/integration/unified/crud_helpers.go

@@ -174,7 +174,10 @@ func createListCollectionsArguments(args bson.Raw) (*listCollectionsArguments, e
 		case "nameOnly":
 			lca.opts.SetNameOnly(val.Boolean())
 		case "rawData":
-			lca.opts.SetRawData(val.Boolean())
+			err := xoptions.SetInternalListCollectionsOptions(lca.opts, key, val.Boolean())
+			if err != nil {
+				return nil, err
+			}
 		default:
 			return nil, fmt.Errorf("unrecognized listCollections option %q", key)
 		}

mongo/client.go

@@ -18,6 +18,7 @@ import (
 	"go.mongodb.org/mongo-driver/v2/internal/httputil"
 	"go.mongodb.org/mongo-driver/v2/internal/logger"
 	"go.mongodb.org/mongo-driver/v2/internal/mongoutil"
+	"go.mongodb.org/mongo-driver/v2/internal/optionsutil"
 	"go.mongodb.org/mongo-driver/v2/internal/ptrutil"
 	"go.mongodb.org/mongo-driver/v2/internal/serverselector"
 	"go.mongodb.org/mongo-driver/v2/internal/uuid"
@@ -956,7 +957,11 @@ func (c *Client) BulkWrite(ctx context.Context, writes []ClientBulkWrite,
 		client:                   c,
 		selector:                 selector,
 		writeConcern:             wc,
-		rawData:                  bwo.RawData,
+	}
+	if rawDataOpt := optionsutil.Value(bwo.Internal, "rawData"); rawDataOpt != nil {
+		if rawData, ok := rawDataOpt.(bool); ok {
+			op.rawData = &rawData
+		}
 	}
 	if bwo.VerboseResults == nil || !(*bwo.VerboseResults) {
 		op.errorsOnly = true

mongo/database.go

@@ -16,6 +16,7 @@ import (
 	"go.mongodb.org/mongo-driver/v2/internal/csfle"
 	"go.mongodb.org/mongo-driver/v2/internal/csot"
 	"go.mongodb.org/mongo-driver/v2/internal/mongoutil"
+	"go.mongodb.org/mongo-driver/v2/internal/optionsutil"
 	"go.mongodb.org/mongo-driver/v2/internal/serverselector"
 	"go.mongodb.org/mongo-driver/v2/mongo/options"
 	"go.mongodb.org/mongo-driver/v2/mongo/readconcern"
@@ -487,8 +488,10 @@ func (db *Database) ListCollections(
 	if args.AuthorizedCollections != nil {
 		op = op.AuthorizedCollections(*args.AuthorizedCollections)
 	}
-	if args.RawData != nil {
-		op = op.RawData(*args.RawData)
+	if rawDataOpt := optionsutil.Value(args.Internal, "rawData"); rawDataOpt != nil {
+		if rawData, ok := rawDataOpt.(bool); ok {
+			op = op.RawData(rawData)
+		}
 	}
 
 	retry := driver.RetryNone

mongo/index_view.go

@@ -14,6 +14,7 @@ import (
 	"strconv"
 
 	"go.mongodb.org/mongo-driver/v2/internal/mongoutil"
+	"go.mongodb.org/mongo-driver/v2/internal/optionsutil"
 	"go.mongodb.org/mongo-driver/v2/internal/serverselector"
 	"go.mongodb.org/mongo-driver/v2/mongo/options"
 	"go.mongodb.org/mongo-driver/v2/mongo/readpref"
@@ -101,8 +102,10 @@ func (iv IndexView) List(ctx context.Context, opts ...options.Lister[options.Lis
 		op = op.BatchSize(*args.BatchSize)
 		cursorOpts.BatchSize = *args.BatchSize
 	}
-	if args.RawData != nil {
-		op = op.RawData(*args.RawData)
+	if rawDataOpt := optionsutil.Value(args.Internal, "rawData"); rawDataOpt != nil {
+		if rawData, ok := rawDataOpt.(bool); ok {
+			op = op.RawData(rawData)
+		}
 	}
 
 	retry := driver.RetryNone
@@ -282,8 +285,10 @@ func (iv IndexView) CreateMany(
 
 		op.CommitQuorum(commitQuorum)
 	}
-	if args.RawData != nil {
-		op = op.RawData(*args.RawData)
+	if rawDataOpt := optionsutil.Value(args.Internal, "rawData"); rawDataOpt != nil {
+		if rawData, ok := rawDataOpt.(bool); ok {
+			op = op.RawData(rawData)
+		}
 	}
 
 	_, err = processWriteError(op.Execute(ctx))
@@ -419,8 +424,10 @@ func (iv IndexView) drop(ctx context.Context, index any, opts ...options.Lister[
 		Deployment(iv.coll.client.deployment).ServerAPI(iv.coll.client.serverAPI).
 		Timeout(iv.coll.client.timeout).Crypt(iv.coll.client.cryptFLE).Authenticator(iv.coll.client.authenticator)
 
-	if args.RawData != nil {
-		op = op.RawData(*args.RawData)
+	if rawDataOpt := optionsutil.Value(args.Internal, "rawData"); rawDataOpt != nil {
+		if rawData, ok := rawDataOpt.(bool); ok {
+			op = op.RawData(rawData)
+		}
 	}
 
 	err = op.Execute(ctx)

mongo/options/clientbulkwriteoptions.go

@@ -7,6 +7,7 @@
 package options
 
 import (
+	"go.mongodb.org/mongo-driver/v2/internal/optionsutil"
 	"go.mongodb.org/mongo-driver/v2/mongo/writeconcern"
 )
 
@@ -19,8 +20,11 @@ type ClientBulkWriteOptions struct {
 	Ordered                  *bool
 	Let                      interface{}
 	WriteConcern             *writeconcern.WriteConcern
-	RawData                  *bool
 	VerboseResults           *bool
+
+	// Deprecated: This option is for internal use only and should not be set. It may be changed or removed in any
+	// release.
+	Internal optionsutil.Options
 }
 
 // ClientBulkWriteOptionsBuilder contains options to configure client-level bulk
@@ -109,18 +113,6 @@ func (b *ClientBulkWriteOptionsBuilder) SetWriteConcern(wc *writeconcern.WriteCo
 	return b
 }
 
-// SetRawData sets the value for the RawData field. If true, it allows the CRUD operations to access timeseries
-// collections on the bucket-level. This option is only valid for MongoDB versions >= 9.0. The default value is false.
-func (b *ClientBulkWriteOptionsBuilder) SetRawData(rawData bool) *ClientBulkWriteOptionsBuilder {
-	b.Opts = append(b.Opts, func(opts *ClientBulkWriteOptions) error {
-		opts.RawData = &rawData
-
-		return nil
-	})
-
-	return b
-}
-
 // SetVerboseResults sets the value for the VerboseResults field. Specifies whether detailed
 // results for each successful operation should be included in the returned BulkWriteResult.
 // The defaults value is false.

mongo/options/indexoptions.go

@@ -6,13 +6,18 @@
 
 package options
 
+import "go.mongodb.org/mongo-driver/v2/internal/optionsutil"
+
 // CreateIndexesOptions represents arguments that can be used to configure
 // IndexView.CreateOne and IndexView.CreateMany operations.
 //
 // See corresponding setter methods for documentation.
 type CreateIndexesOptions struct {
 	CommitQuorum interface{}
-	RawData      *bool
+
+	// Deprecated: This option is for internal use only and should not be set. It may be changed or removed in any
+	// release.
+	Internal optionsutil.Options
 }
 
 // CreateIndexesOptionsBuilder contains options to create indexes. Each option
@@ -120,22 +125,12 @@ func (c *CreateIndexesOptionsBuilder) SetCommitQuorumVotingMembers() *CreateInde
 	return c
 }
 
-// SetRawData sets the value for the RawData field. If true, it allows the CRUD operations to access timeseries
-// collections on the bucket-level. This option is only valid for MongoDB versions >= 9.0. The default value is false.
-func (c *CreateIndexesOptionsBuilder) SetRawData(rawData bool) *CreateIndexesOptionsBuilder {
-	c.Opts = append(c.Opts, func(opts *CreateIndexesOptions) error {
-		opts.RawData = &rawData
-
-		return nil
-	})
-
-	return c
-}
-
 // DropIndexesOptions represents arguments that can be used to configure
 // IndexView.DropOne and IndexView.DropAll operations.
 type DropIndexesOptions struct {
-	RawData *bool
+	// Deprecated: This option is for internal use only and should not be set. It may be changed or removed in any
+	// release.
+	Internal optionsutil.Options
 }
 
 // DropIndexesOptionsBuilder contains options to configure dropping indexes.
@@ -155,25 +150,16 @@ func (d *DropIndexesOptionsBuilder) List() []func(*DropIndexesOptions) error {
 	return d.Opts
 }
 
-// SetRawData sets the value for the RawData field. If true, it allows the CRUD operations to access timeseries
-// collections on the bucket-level. This option is only valid for MongoDB versions >= 9.0. The default value is false.
-func (d *DropIndexesOptionsBuilder) SetRawData(rawData bool) *DropIndexesOptionsBuilder {
-	d.Opts = append(d.Opts, func(opts *DropIndexesOptions) error {
-		opts.RawData = &rawData
-
-		return nil
-	})
-
-	return d
-}
-
 // ListIndexesOptions represents arguments that can be used to configure an
 // IndexView.List operation.
 //
 // See corresponding setter methods for documentation.
 type ListIndexesOptions struct {
 	BatchSize *int32
-	RawData   *bool
+
+	// Deprecated: This option is for internal use only and should not be set. It may be changed or removed in any
+	// release.
+	Internal optionsutil.Options
 }
 
 // ListIndexesOptionsBuilder contains options to configure count operations. Each
@@ -205,18 +191,6 @@ func (l *ListIndexesOptionsBuilder) SetBatchSize(i int32) *ListIndexesOptionsBui
 	return l
 }
 
-// SetRawData sets the value for the RawData field. If true, it allows the CRUD operations to access timeseries
-// collections on the bucket-level. This option is only valid for MongoDB versions >= 9.0. The default value is false.
-func (l *ListIndexesOptionsBuilder) SetRawData(rawData bool) *ListIndexesOptionsBuilder {
-	l.Opts = append(l.Opts, func(opts *ListIndexesOptions) error {
-		opts.RawData = &rawData
-
-		return nil
-	})
-
-	return l
-}
-
 // IndexOptions represents arguments that can be used to configure a new index
 // created through the IndexView.CreateOne or IndexView.CreateMany operations.
 //

mongo/options/listcollectionsoptions.go

@@ -6,6 +6,8 @@
 
 package options
 
+import "go.mongodb.org/mongo-driver/v2/internal/optionsutil"
+
 // ListCollectionsOptions represents arguments that can be used to configure a
 // ListCollections operation.
 //
@@ -14,7 +16,10 @@ type ListCollectionsOptions struct {
 	NameOnly              *bool
 	BatchSize             *int32
 	AuthorizedCollections *bool
-	RawData               *bool
+
+	// Deprecated: This option is for internal use only and should not be set. It may be changed or removed in any
+	// release.
+	Internal optionsutil.Options
 }
 
 // ListCollectionsOptionsBuilder contains options to configure list collection
@@ -71,15 +76,3 @@ func (lc *ListCollectionsOptionsBuilder) SetAuthorizedCollections(b bool) *ListC
 
 	return lc
 }
-
-// SetRawData sets the value for the RawData field. If true, it allows the CRUD operations to access timeseries
-// collections on the bucket-level. This option is only valid for MongoDB versions >= 9.0. The default value is false.
-func (lc *ListCollectionsOptionsBuilder) SetRawData(rawData bool) *ListCollectionsOptionsBuilder {
-	lc.Opts = append(lc.Opts, func(opts *ListCollectionsOptions) error {
-		opts.RawData = &rawData
-
-		return nil
-	})
-
-	return lc
-}