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

@@ -10,6 +10,7 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
+	"encoding/base64"
 	"errors"
 	"fmt"
 	"os"
@@ -685,7 +686,11 @@ func getKmsProvider(key string, opt bson.Raw) (map[string]any, error) {
 			return nil, err
 		}
 		if v != nil {
-			provider["key"] = v
+			b, err := base64.StdEncoding.DecodeString(v.(string))
+			if err != nil {
+				return nil, err
+			}
+			provider["key"] = b
 		}
 	default:
 		return nil, fmt.Errorf("unrecognized KMS provider: %s", key)

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/operation.go

@@ -274,6 +274,11 @@ func (op *operation) run(ctx context.Context, loopDone <-chan struct{}) (*operat
 		return executeAddKeyAltName(ctx, op)
 	case "decrypt":
 		return executeDecrypt(ctx, op)
+	case "assertIndexNotExists":
+		db := lookupString(op.Arguments, "databaseName")
+		coll := lookupString(op.Arguments, "collectionName")
+		index := lookupString(op.Arguments, "indexName")
+		return nil, verifyIndexExists(ctx, db, coll, index, false)
 
 	// Unsupported operations
 	case "count", "listIndexNames", "mapReduce":

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)": {