GODRIVER-3445 Cont. w/ CSFLE

Author: prestonvasquez

.evergreen/config.yml

@@ -32,6 +32,11 @@ functions:
       type: system
       params:
         directory: src/go.mongodb.org/mongo-driver
+    - command: shell.exec
+      params:
+        working_dir: "src/go.mongodb.org/mongo-driver"
+        script: |
+          git submodule update --init
     # Make an env.sh and evergreen expansion file with dynamic values
     - command: subprocess.exec
       params:

bson/benchmark_test.go

@@ -130,7 +130,7 @@ var nestedInstance = nestedtest1{
 	},
 }
 
-const extendedBSONDir = "../testdata/extended_bson"
+const extendedBSONDir = "../testdata/extended-bson"
 
 var (
 	extJSONFiles   map[string]map[string]interface{}

bson/bson_binary_vector_spec_test.go

@@ -15,9 +15,10 @@ import (
 	"testing"
 
 	"go.mongodb.org/mongo-driver/v2/internal/require"
+	"go.mongodb.org/mongo-driver/v2/internal/spectest"
 )
 
-const bsonBinaryVectorDir = "../testdata/bson-binary-vector/"
+var bsonBinaryVectorDir = spectest.TestPath(1, "bson-binary-vector")
 
 type bsonBinaryVectorTests struct {
 	Description string                     `json:"description"`
@@ -128,18 +129,7 @@ func runBsonBinaryVectorTest(t *testing.T, testKey string, test bsonBinaryVector
 	require.NoError(t, err, "decoding canonical BSON")
 
 	t.Run("Unmarshaling", func(t *testing.T) {
-		skipCases := map[string]string{
-			"Overflow Vector INT8":                "compile-time restriction",
-			"Underflow Vector INT8":               "compile-time restriction",
-			"INT8 with float inputs":              "compile-time restriction",
-			"Overflow Vector PACKED_BIT":          "compile-time restriction",
-			"Underflow Vector PACKED_BIT":         "compile-time restriction",
-			"Vector with float values PACKED_BIT": "compile-time restriction",
-			"Negative padding PACKED_BIT":         "compile-time restriction",
-		}
-		if reason, ok := skipCases[test.Description]; ok {
-			t.Skipf("skip test case %s: %s", test.Description, reason)
-		}
+		spectest.CheckSkip(t)
 
 		errMap := map[string]string{
 			"FLOAT32 with padding":                             "padding must be 0",
@@ -163,24 +153,7 @@ func runBsonBinaryVectorTest(t *testing.T, testKey string, test bsonBinaryVector
 	})
 
 	t.Run("Marshaling", func(t *testing.T) {
-		skipCases := map[string]string{
-			"FLOAT32 with padding":                             "private padding field",
-			"Insufficient vector data with 3 bytes FLOAT32":    "invalid case",
-			"Insufficient vector data with 5 bytes FLOAT32":    "invalid case",
-			"Overflow Vector INT8":                             "compile-time restriction",
-			"Underflow Vector INT8":                            "compile-time restriction",
-			"INT8 with padding":                                "private padding field",
-			"INT8 with float inputs":                           "compile-time restriction",
-			"Overflow Vector PACKED_BIT":                       "compile-time restriction",
-			"Underflow Vector PACKED_BIT":                      "compile-time restriction",
-			"Vector with float values PACKED_BIT":              "compile-time restriction",
-			"Padding specified with no vector data PACKED_BIT": "run in alternative case",
-			"Exceeding maximum padding PACKED_BIT":             "run in alternative case",
-			"Negative padding PACKED_BIT":                      "compile-time restriction",
-		}
-		if reason, ok := skipCases[test.Description]; ok {
-			t.Skipf("skip test case %s: %s", test.Description, reason)
-		}
+		spectest.CheckSkip(t)
 
 		t.Parallel()
 

bson/bson_corpus_spec_test.go

@@ -23,6 +23,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"go.mongodb.org/mongo-driver/v2/internal/assert"
 	"go.mongodb.org/mongo-driver/v2/internal/require"
+	"go.mongodb.org/mongo-driver/v2/internal/spectest"
 )
 
 type testCase struct {
@@ -57,7 +58,7 @@ type parseErrorTestCase struct {
 	String      string `json:"string"`
 }
 
-const dataDir = "../testdata/bson-corpus/"
+var dataDir = spectest.TestPath(1, "bson-corpus")
 
 func findJSONFilesInDir(dir string) ([]string, error) {
 	files := make([]string, 0)

internal/integration/client_side_encryption_spec_test.go

@@ -11,15 +11,14 @@ package integration
 
 import (
 	"os"
-	"path"
 	"regexp"
 	"testing"
-)
 
-const (
-	encryptionSpecName = "client-side-encryption/legacy"
+	"go.mongodb.org/mongo-driver/v2/internal/spectest"
 )
 
+var encryptionSpecDir = spectest.TestPath(2, "client-side-encryption", "legacy")
+
 func verifyClientSideEncryptionVarsSet(t *testing.T) {
 	t.Helper()
 
@@ -53,7 +52,7 @@ func verifyClientSideEncryptionVarsSet(t *testing.T) {
 func TestClientSideEncryptionSpec(t *testing.T) {
 	verifyClientSideEncryptionVarsSet(t)
 
-	for _, fileName := range jsonFilesInDir(t, path.Join(dataPath, encryptionSpecName)) {
+	for _, fileName := range jsonFilesInDir(t, encryptionSpecDir) {
 		t.Run(fileName, func(t *testing.T) {
 			re := regexp.MustCompile(`fle2\-Range\-.*\-Correctness`)
 			if re.Match([]byte(fileName)) {
@@ -62,7 +61,7 @@ func TestClientSideEncryptionSpec(t *testing.T) {
 			if fileName == "kmipKMS.json" && "" == os.Getenv("KMS_MOCK_SERVERS_RUNNING") {
 				t.Skipf("Skipping test as KMS_MOCK_SERVERS_RUNNING is not set")
 			}
-			runSpecTestFile(t, encryptionSpecName, fileName)
+			runSpecTestFile(t, encryptionSpecDir, fileName)
 		})
 	}
 }

internal/integration/cmd_monitoring_helpers_test.go

@@ -83,7 +83,30 @@ func compareValues(mt *mtest.T, key string, expected, actual bson.RawValue) erro
 		if typeVal, err := e.LookupErr("$$type"); err == nil {
 			// $$type represents a type assertion
 			// for example {field: {$$type: "binData"}} should assert that "field" is an element with a binary value
-			return checkValueType(mt, key, actual.Type, typeVal.StringValue())
+			types := []string{}
+			switch typeVal.Type {
+			case bson.TypeArray:
+				elems, err := typeVal.Array().Values()
+				if err != nil {
+					return fmt.Errorf("error getting expected types: %v", err)
+				}
+
+				for _, elem := range elems {
+					types = append(types, elem.StringValue())
+				}
+			case bson.TypeString:
+				types = append(types, typeVal.StringValue())
+			}
+
+			// If at least one of the types does not return an error, then the test
+			// has passed.
+			for _, t := range types {
+				if err := checkValueType(mt, key, actual.Type, t); err == nil {
+					return nil
+				}
+			}
+
+			return fmt.Errorf("BSON type mismatch for key %s; expected one of %v, got %s", key, types, actual.Type)
 		}
 
 		a := actual.Document()

internal/integration/unified/unified_spec_test.go

@@ -19,8 +19,8 @@ var (
 		//
 		//"load-balancers",
 		//
-		//spectest.TestPath(3, "unified-test-format", "valid-pass"),
-		//spectest.TestPath(3, "versioned-api"),
+		spectest.TestPath(3, "unified-test-format", "valid-pass"),
+		spectest.TestPath(3, "versioned-api"),
 		//spectest.TestPath(3, "crud", "unified"),
 		//spectest.TestPath(3, "change-streams", "unified"),
 		//spectest.TestPath(3, "transactions", "unified"),
@@ -31,8 +31,7 @@ var (
 		//spectest.TestPath(3, "connection-monitoring-and-pooling", "logging"),
 		//spectest.TestPath(3, "sessions"),
 		//spectest.TestPath(3, "retryable-reads", "unified"),
-		spectest.TestPath(3, "retryable-writes", "unified"),
-		//"retryable-writes/unified",
+		//spectest.TestPath(3, "retryable-writes", "unified"),
 		//"client-side-encryption/unified",
 		//"client-side-operations-timeout",
 		//"gridfs",

internal/integration/unified_spec_test.go

@@ -15,6 +15,7 @@ import (
 	"os"
 	"path"
 	"reflect"
+	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -157,14 +158,12 @@ type operationError struct {
 	ErrorLabelsOmit    []string `bson:"errorLabelsOmit"`
 }
 
-const dataPath string = "../../testdata/"
-
 var directories = []string{
-	"transactions/legacy",
-	"convenient-transactions",
-	"retryable-reads/legacy",
-	"read-write-concern/operation",
-	"atlas-data-lake-testing",
+	"../../testdata/transactions/legacy",
+	"../../testdata/convenient-transactions",
+	"../../testdata/retryable-reads/legacy",
+	"../../testdata/read-write-concern/operation",
+	"../../testdata/atlas-data-lake-testing",
 }
 
 var checkOutcomeOpts = options.Collection().SetReadPreference(readpref.Primary()).SetReadConcern(readconcern.Local())
@@ -177,8 +176,10 @@ var specTestRegistry = func() *bson.Registry {
 
 func TestUnifiedSpecs(t *testing.T) {
 	for _, specDir := range directories {
-		t.Run(specDir, func(t *testing.T) {
-			for _, fileName := range jsonFilesInDir(t, path.Join(dataPath, specDir)) {
+		index := strings.Index(specDir, "testdata/")
+		dirTestName := specDir[index+len("testdata/"):]
+		t.Run(dirTestName, func(t *testing.T) {
+			for _, fileName := range jsonFilesInDir(t, specDir) {
 				t.Run(fileName, func(t *testing.T) {
 					runSpecTestFile(t, specDir, fileName)
 				})
@@ -190,7 +191,8 @@ func TestUnifiedSpecs(t *testing.T) {
 // specDir: name of directory for a spec in the data/ folder
 // fileName: name of test file in specDir
 func runSpecTestFile(t *testing.T, specDir, fileName string) {
-	filePath := path.Join(dataPath, specDir, fileName)
+	filePath := path.Join(specDir, fileName)
+
 	content, err := ioutil.ReadFile(filePath)
 	assert.Nil(t, err, "unable to read spec test file %v: %v", filePath, err)
 
@@ -206,7 +208,7 @@ func runSpecTestFile(t *testing.T, specDir, fileName string) {
 	mtOpts := mtest.NewOptions().
 		RunOn(testFile.RunOn...).
 		CreateClient(false)
-	if specDir == "atlas-data-lake-testing" {
+	if strings.Contains(specDir, "atlas-data-lake-testing") {
 		mtOpts.AtlasDataLake(true)
 	}
 	mt := mtest.New(t, mtOpts)

internal/spectest/skip.go

@@ -6,7 +6,9 @@
 
 package spectest
 
-import "testing"
+import (
+	"testing"
+)
 
 // skipTests is a map of "fully-qualified test name" to "the reason for skipping
 // the test".
@@ -343,6 +345,31 @@ var skipTests = map[string]string{
 	"TestUnifiedSpec/server-discovery-and-monitoring/unified/sharded-emit-topology-changed-before-close.json/Topology_lifecycle":      "Implement GODRIVER-2967",
 	"TestUnifiedSpec/server-discovery-and-monitoring/unified/replicaset-emit-topology-changed-before-close.json/Topology_lifecycle":   "Implement GODRIVER-2967",
 	"TestUnifiedSpec/server-discovery-and-monitoring/unified/standalone-emit-topology-changed-before-close.json/Topology_lifecycle":   "Implement GODRIVER-2967",
+
+	// Unknown BSON
+	"TestBsonBinaryVectorSpec/Tests_of_Binary_subtype_9,_Vectors,_with_dtype_FLOAT32/Infinity_Vector_FLOAT32/Marshaling":   "Unsupported format",
+	"TestBsonBinaryVectorSpec/Tests_of_Binary_subtype_9,_Vectors,_with_dtype_FLOAT32/Infinity_Vector_FLOAT32/Unmarshaling": "Unsupported format",
+
+	// Unsuported BSON binary vector tests.
+	"TestBsonBinaryVectorSpec/Tests_of_Binary_subtype_9,_Vectors,_with_dtype_PACKED_BIT/Overflow_Vector_PACKED_BIT/Marshaling":                 "compile-time restriction",
+	"TestBsonBinaryVectorSpec/Tests_of_Binary_subtype_9,_Vectors,_with_dtype_INT8/Underflow_Vector_INT8/Marshaling":                            "compile-time restriction",
+	"TestBsonBinaryVectorSpec/Tests_of_Binary_subtype_9,_Vectors,_with_dtype_INT8/Overflow_Vector_INT8/Marshaling":                             "compile-time restriction",
+	"TestBsonBinaryVectorSpec/Tests_of_Binary_subtype_9,_Vectors,_with_dtype_PACKED_BIT/Negative_padding_PACKED_BIT/Marshaling":                "compile-time restriction",
+	"TestBsonBinaryVectorSpec/Tests_of_Binary_subtype_9,_Vectors,_with_dtype_INT8/INT8_with_padding/Marshaling":                                "private padding field",
+	"TestBsonBinaryVectorSpec/Tests_of_Binary_subtype_9,_Vectors,_with_dtype_FLOAT32/Insufficient_vector_data_with_3_bytes_FLOAT32/Marshaling": "invalid case",
+	"TestBsonBinaryVectorSpec/Tests_of_Binary_subtype_9,_Vectors,_with_dtype_FLOAT32/FLOAT32_with_padding/Marshaling":                          "private padding field",
+	"TestBsonBinaryVectorSpec/Tests_of_Binary_subtype_9,_Vectors,_with_dtype_FLOAT32/Insufficient_vector_data_with_5_bytes_FLOAT32/Marshaling": "invalid case",
+	"TestBsonBinaryVectorSpec/Tests_of_Binary_subtype_9,_Vectors,_with_dtype_PACKED_BIT/Vector_with_float_values_PACKED_BIT/Marshaling":        "compile-time restriction",
+	"TestBsonBinaryVectorSpec/Tests_of_Binary_subtype_9,_Vectors,_with_dtype_PACKED_BIT/Underflow_Vector_PACKED_BIT/Marshaling":                "compile-time restriction",
+	"TestBsonBinaryVectorSpec/Tests_of_Binary_subtype_9,_Vectors,_with_dtype_INT8/INT8_with_float_inputs/Marshaling":                           "compile-time restriction",
+
+	// TODO(GODRIVER-3521): Extend Legacy Unified Spec Runner to include
+	// client-side-encryption timeoutMS
+	"TestClientSideEncryptionSpec/timeoutMS.json/remaining_timeoutMS_applied_to_find_to_get_keyvault_data":      "Implement GODRIVER-3521",
+	"TestClientSideEncryptionSpec/timeoutMS.json/timeoutMS_applied_to_listCollections_to_get_collection_schema": "Implement GODRIVER-3521",
+
+	// TODO(GODRIVER-3076): CSFLE/QE Support for more than 1 KMS provider per type
+	"TestClientSideEncryptionSpec/namedKMS.json/Automatically_encrypt_and_decrypt_with_a_named_KMS_provider": "Implement GODRIVER-3076",
 }
 
 // CheckSkip checks if the fully-qualified test name matches a skipped test