GODRIVER-3402 Bump testdata/specifications from 5ef7b1b to 49ade88 (#2182)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Preston Vasquez <[email protected]>

Author: dependabot[bot]

internal/integration/mtest/mongotest.go

@@ -816,18 +816,23 @@ func verifyRunOnBlockConstraint(rob RunOnBlock) error {
 		return err
 	}
 
-	if rob.CSFLE != nil {
-		if *rob.CSFLE && !IsCSFLEEnabled() {
-			return fmt.Errorf("runOnBlock requires CSFLE to be enabled. Build with the cse tag to enable")
-		} else if !*rob.CSFLE && IsCSFLEEnabled() {
-			return fmt.Errorf("runOnBlock requires CSFLE to be disabled. Build without the cse tag to disable")
-		}
-		if *rob.CSFLE {
-			if err := verifyVersionConstraints("4.2", ""); err != nil {
-				return err
-			}
+	// TODO(GODRIVER-3486): Once auto encryption is supported by the unified test
+	// format,this check should be removed.
+	if rob.CSFLEEnabled() && rob.CSFLE.Options != nil {
+		return fmt.Errorf("Auto encryption required (GODRIVER-3486)")
+	}
+
+	if rob.CSFLEEnabled() && !IsCSFLEEnabled() {
+		return fmt.Errorf("runOnBlock requires CSFLE to be enabled. Build with the cse tag to enable")
+	} else if !rob.CSFLEEnabled() && IsCSFLEEnabled() {
+		return fmt.Errorf("runOnBlock requires CSFLE to be disabled. Build without the cse tag to disable")
+	}
+	if rob.CSFLEEnabled() {
+		if err := verifyVersionConstraints("4.2", ""); err != nil {
+			return err
 		}
 	}
+
 	return nil
 }
 

internal/integration/mtest/options.go

@@ -49,6 +49,45 @@ var (
 	falseBool = false
 )
 
+// CSFLEOptions holds configuration for Client-Side Field Level Encryption
+// (CSFLE).
+type CSFLEOptions struct{}
+
+// CSFLE models the runOnRequirements.csfle field in Unified Test Format tests.
+//
+// The csfle field accepts either:
+//   - a boolean: true enables CSFLE with no options; false disables CSFLE
+//     (Options is nil).
+//   - an object: Options is populated from the document and Boolean is set to
+//     false.
+type CSFLE struct {
+	Boolean bool
+	Options *CSFLEOptions
+}
+
+// UnmarshalBSON implements custom BSON unmarshalling for CSFLE, accepting
+// either a boolean or an embedded document. If a document is provided, Options
+// is set and Boolean is false. If a boolean is provided, Boolean is set and
+// Options is nil.
+func (csfle *CSFLE) UnmarshalBSON(data []byte) error {
+	embRawValue := bson.RawValue{Type: bson.TypeEmbeddedDocument, Value: data}
+	if err := embRawValue.Unmarshal(&csfle.Options); err == nil {
+		csfle.Boolean = false
+
+		return nil
+	}
+
+	rawValue := bson.RawValue{Type: bson.TypeBoolean, Value: data}
+	if b, ok := rawValue.BooleanOK(); ok {
+		csfle.Boolean = b
+		csfle.Options = nil
+
+		return nil
+	}
+
+	return fmt.Errorf("error unmarshalling CSFLE: %s", data)
+}
+
 // RunOnBlock describes a constraint for a test.
 type RunOnBlock struct {
 	MinServerVersion string                   `bson:"minServerVersion"`
@@ -58,7 +97,11 @@ type RunOnBlock struct {
 	ServerParameters map[string]bson.RawValue `bson:"serverParameters"`
 	Auth             *bool                    `bson:"auth"`
 	AuthEnabled      *bool                    `bson:"authEnabled"`
-	CSFLE            *bool                    `bson:"csfle"`
+	CSFLE            *CSFLE                   `bson:"csfleConfiguration"`
+}
+
+func (r *RunOnBlock) CSFLEEnabled() bool {
+	return r.CSFLE != nil && (r.CSFLE.Boolean || r.CSFLE.Options != nil)
 }
 
 // UnmarshalBSON implements custom BSON unmarshalling behavior for RunOnBlock because some test formats use the
@@ -73,7 +116,7 @@ func (r *RunOnBlock) UnmarshalBSON(data []byte) error {
 		ServerParameters map[string]bson.RawValue `bson:"serverParameters"`
 		Auth             *bool                    `bson:"auth"`
 		AuthEnabled      *bool                    `bson:"authEnabled"`
-		CSFLE            *bool                    `bson:"csfle"`
+		CSFLE            *CSFLE                   `bson:"csfle"`
 		Extra            map[string]any           `bson:",inline"`
 	}
 	if err := bson.Unmarshal(data, &temp); err != nil {