updates

Author: qingyang-hu

internal/integration/unified/collection_data.go

@@ -29,7 +29,7 @@ type collectionData struct {
 type createOptions struct {
 	Capped          *bool    `bson:"capped"`
 	SizeInBytes     *int64   `bson:"size"`
-	EncryptedFields any      `bson:"encryptedFields"`
+	EncryptedFields bson.Raw `bson:"encryptedFields"`
 	Validator       bson.Raw `bson:"validator"`
 }
 

internal/integration/unified/database_operation_execution.go

@@ -127,6 +127,8 @@ func executeCreateCollection(ctx context.Context, operation *operation) (*operat
 			cco.SetClusteredIndex(val.Document())
 		case "validator":
 			cco.SetValidator(val.Document())
+		case "encryptedFields":
+			cco.SetEncryptedFields(val.Document())
 		default:
 			return nil, fmt.Errorf("unrecognized createCollection option %q", key)
 		}
@@ -158,13 +160,17 @@ func executeDropCollection(ctx context.Context, operation *operation) (*operatio
 		return nil, err
 	}
 
+	dco := options.DropCollection()
+
 	var collName string
 	elems, _ := operation.Arguments.Elements()
 	for _, elem := range elems {
 		key := elem.Key()
 		val := elem.Value()
 
 		switch key {
+		case "encryptedFields":
+			dco.SetEncryptedFields(val.Document())
 		case "collection":
 			collName = val.StringValue()
 		default:
@@ -175,7 +181,7 @@ func executeDropCollection(ctx context.Context, operation *operation) (*operatio
 		return nil, newMissingArgumentError("collection")
 	}
 
-	err = db.Collection(collName).Drop(ctx)
+	err = db.Collection(collName).Drop(ctx, dco)
 	return newErrorResult(err), nil
 }
 

internal/integration/unified/entity.go

@@ -13,6 +13,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"regexp"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -506,6 +507,24 @@ func (em *EntityMap) close(ctx context.Context) []error {
 		}
 	}
 
+	// Clear automatically created collections used for queryable encryption
+	for id, db := range em.dbEntites {
+		colls, err := db.ListCollectionNames(ctx, bson.D{})
+		if err != nil {
+			errs = append(errs, fmt.Errorf("error listing collections in database with ID %q: %w", id, err))
+			continue
+		}
+		for _, coll := range colls {
+			re := regexp.MustCompile("^enxcol_.*.e(sc|coc)$")
+			if re.MatchString(coll) {
+				_, err = db.Collection(coll).DeleteMany(ctx, bson.D{})
+				if err != nil {
+					errs = append(errs, fmt.Errorf("error clearing collection %q: %w", coll, err))
+				}
+			}
+		}
+	}
+
 	for id, client := range em.clientEntities {
 		if ok := em.keyVaultClientIDs[id]; ok {
 			// Client will be closed in clientEncryption.Close()

internal/integration/unified/error.go

@@ -42,7 +42,7 @@ type clientBulkWriteException struct {
 // will perform any other assertions required by the expectedError object. An error is returned if any checks fail.
 func verifyOperationError(ctx context.Context, expected *expectedError, result *operationResult) error {
 	if expected == nil {
-		if result.Err != nil {
+		if result != nil && result.Err != nil {
 			return fmt.Errorf("expected no error, but got %w", result.Err)
 		}
 		return nil

internal/integration/unified/matches.go

@@ -150,6 +150,19 @@ func verifyValuesMatchInner(ctx context.Context, expected, actual bson.RawValue)
 		return nil
 	}
 
+	if expected.Type == bson.TypeDecimal128 {
+		if actual.Type != bson.TypeDecimal128 {
+			return newMatchingError(keyPath, "expected value to be a decimal type but got a %s", actual.Type)
+		}
+		expectedDecimal := expected.Decimal128()
+		actualDecimal := actual.Decimal128()
+		eh, el := expectedDecimal.GetBytes()
+		ah, al := actualDecimal.GetBytes()
+		if eh != ah || el != al {
+			return newMatchingError(keyPath, "expected decimal value %v, got %v", expectedDecimal, actualDecimal)
+		}
+		return nil
+	}
 	// Numeric values must be considered equal even if their types are different (e.g. if expected is an int32 and
 	// actual is an int64).
 	if expected.IsNumber() {

internal/integration/unified/operation.go

@@ -275,6 +275,21 @@ func (op *operation) run(ctx context.Context, loopDone <-chan struct{}) (*operat
 	case "decrypt":
 		return executeDecrypt(ctx, op)
 
+	case "assertIndexNotExists":
+		db := lookupString(op.Arguments, "databaseName")
+		coll := lookupString(op.Arguments, "collectionName")
+		index := lookupString(op.Arguments, "indexName")
+		return newErrorResult(nil), verifyIndexExists(ctx, db, coll, index, false)
+	case "assertIndexExists":
+		db := lookupString(op.Arguments, "databaseName")
+		coll := lookupString(op.Arguments, "collectionName")
+		index := lookupString(op.Arguments, "indexName")
+		return newErrorResult(nil), verifyIndexExists(ctx, db, coll, index, true)
+	case "assertCollectionExists":
+		db := lookupString(op.Arguments, "databaseName")
+		coll := lookupString(op.Arguments, "collectionName")
+		return newErrorResult(nil), verifyCollectionExists(ctx, db, coll, true)
+
 	// Unsupported operations
 	case "count", "listIndexNames", "mapReduce":
 		return nil, newSkipTestError(fmt.Sprintf("the %q operation is not supported", op.Name))

internal/spectest/skip.go

@@ -392,6 +392,12 @@ var skipTests = map[string][]string{
 		"TestClientSideEncryptionSpec/timeoutMS.json/timeoutMS_applied_to_listCollections_to_get_collection_schema",
 	},
 
+	// TODO(GODRIVER-3403): Support QE with Client.bulkWrite
+	"Support QE with Client.bulkWrite (GODRIVER-3403)": {
+		"TestUnifiedSpec/client-side-encryption/tests/unified/client-bulkWrite-qe.json/client_bulkWrite_QE_replaceOne",
+		"TestUnifiedSpec/client-side-encryption/tests/unified/client-bulkWrite-qe.json/client_bulkWrite_QE_with_multiple_replace_fails",
+	},
+
 	// TODO(GODRIVER-3076): CSFLE/QE Support for more than 1 KMS provider per
 	// type.
 	"Support multiple KMS providers per type (GODRIVER-3076)": {