GODRIVER-3540 Support Prefix/Suffix/Substring Indexes.

.evergreen/config.yml

@@ -21,10 +21,6 @@ timeout:
       binary: bash
       args: [ls, -la]
 functions:
-  assume-test-secrets-ec2-role:
-    - command: ec2.assume_role
-      params:
-        role_arn: ${aws_test_secrets_role}
   setup-system:
     # Executes clone and applies the submitted patch, if any
     - command: git.get_project
@@ -502,21 +498,6 @@ functions:
       params:
         binary: bash
         args: ["${DRIVERS_TOOLS}/.evergreen/csfle/await-servers.sh"]
-  run-kms-tls-test:
-    - command: subprocess.exec
-      params:
-        binary: "bash"
-        env:
-          GO_BUILD_TAGS: cse
-        include_expansions_in_env: [AUTH, SSL, MONGODB_URI, TOPOLOGY, MONGO_GO_DRIVER_COMPRESSOR]
-        args: [*task-runner, setup-test]
-    - command: subprocess.exec
-      type: test
-      retry_on_failure: true
-      params:
-        binary: "bash"
-        include_expansions_in_env: [KMS_TLS_TESTCASE]
-        args: [*task-runner, evg-test-kms]
   run-kmip-tests:
     - command: subprocess.exec
       params:
@@ -533,23 +514,25 @@ functions:
         env:
           KMS_MOCK_SERVERS_RUNNING: "true"
         args: [*task-runner, evg-test-kmip]
-  run-retry-kms-requests:
+  run-client-side-encryption-test:
     - command: subprocess.exec
       params:
         binary: "bash"
         env:
           GO_BUILD_TAGS: cse
-        include_expansions_in_env: [AUTH, SSL, MONGODB_URI, TOPOLOGY, MONGO_GO_DRIVER_COMPRESSOR]
+        include_expansions_in_env: [AUTH, SSL, MONGODB_URI, TOPOLOGY, MONGO_GO_DRIVER_COMPRESSOR, CRYPT_SHARED_LIB_PATH]
         args: [*task-runner, setup-test]
     - command: subprocess.exec
       type: test
       retry_on_failure: true
       params:
         binary: "bash"
         env:
+          KMS_MOCK_SERVERS_RUNNING: "true"
           KMS_FAILPOINT_CA_FILE: "${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem"
           KMS_FAILPOINT_SERVER_RUNNING: "true"
-        args: [*task-runner, evg-test-retry-kms-requests]
+        include_expansions_in_env: [KMS_TLS_TESTCASE]
+        args: [*task-runner, evg-test-client-side-encryption]
   run-fuzz-tests:
     - command: subprocess.exec
       type: test
@@ -1408,36 +1391,6 @@ tasks:
           TOPOLOGY: "server"
           AUTH: "noauth"
           SSL: "nossl"
-  - name: "test-kms-tls-invalid-cert"
-    tags: ["kms-test"]
-    commands:
-      - func: bootstrap-mongo-orchestration
-        vars:
-          TOPOLOGY: "server"
-          AUTH: "noauth"
-          SSL: "nossl"
-      - func: start-cse-servers
-      - func: run-kms-tls-test
-        vars:
-          KMS_TLS_TESTCASE: "INVALID_CERT"
-          TOPOLOGY: "server"
-          AUTH: "noauth"
-          SSL: "nossl"
-  - name: "test-kms-tls-invalid-hostname"
-    tags: ["kms-test"]
-    commands:
-      - func: bootstrap-mongo-orchestration
-        vars:
-          TOPOLOGY: "server"
-          AUTH: "noauth"
-          SSL: "nossl"
-      - func: start-cse-servers
-      - func: run-kms-tls-test
-        vars:
-          KMS_TLS_TESTCASE: "INVALID_HOSTNAME"
-          TOPOLOGY: "server"
-          AUTH: "noauth"
-          SSL: "nossl"
   - name: "test-kms-kmip"
     tags: ["kms-kmip"]
     commands:
@@ -1452,16 +1405,20 @@ tasks:
           TOPOLOGY: "server"
           AUTH: "noauth"
           SSL: "nossl"
-  - name: "test-retry-kms-requests"
-    tags: ["kms-test"]
+  - name: "test-client-side-encryption"
+    tags: ["client-side-encryption-test"]
     commands:
       - func: bootstrap-mongo-orchestration
         vars:
-          TOPOLOGY: "server"
+          TOPOLOGY: "replica_set"
           AUTH: "noauth"
           SSL: "nossl"
       - func: start-cse-servers
-      - func: run-retry-kms-requests
+      - func: run-client-side-encryption-test
+        vars:
+          TOPOLOGY: "replica_set"
+          AUTH: "noauth"
+          SSL: "nossl"
   - name: "testgcpkms-task"
     commands:
       - command: subprocess.exec
@@ -2093,6 +2050,11 @@ buildvariants:
     display_name: "KMS TEST ${os-ssl-40}"
     tasks:
       - name: ".kms-test"
+  - matrix_name: "client-side-encryption-test"
+    matrix_spec: {version: ["latest"], os-ssl-40: ["rhel87-64"]}
+    display_name: "Client Side Encryption Tests ${os-ssl-40}"
+    tasks:
+      - name: ".client-side-encryption-test"
   - matrix_name: "load-balancer-test"
     tags: ["pullrequest"]
     matrix_spec: {version: ["5.0", "6.0", "7.0", "8.0"], os-ssl-40: ["rhel87-64"]}

Taskfile.yml

@@ -94,14 +94,8 @@ tasks:
     - go run -race ./internal/cmd/testoidcauth/main.go
   evg-test-kmip:
     - go test -exec "env PKG_CONFIG_PATH=${PKG_CONFIG_PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} DYLD_LIBRARY_PATH=${MACOS_LIBRARY_PATH}" ${BUILD_TAGS} -v -timeout {{.TEST_TIMEOUT}}s ./internal/integration -run TestClientSideEncryptionSpec/kmipKMS >> test.suite
-    - go test -exec "env PKG_CONFIG_PATH=${PKG_CONFIG_PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} DYLD_LIBRARY_PATH=${MACOS_LIBRARY_PATH}" ${BUILD_TAGS} -v -timeout {{.TEST_TIMEOUT}}s ./internal/integration -run TestClientSideEncryptionProse/data_key_and_double_encryption >> test.suite
-    - go test -exec "env PKG_CONFIG_PATH=${PKG_CONFIG_PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} DYLD_LIBRARY_PATH=${MACOS_LIBRARY_PATH}" ${BUILD_TAGS} -v -timeout {{.TEST_TIMEOUT}}s ./internal/integration -run TestClientSideEncryptionProse/corpus >> test.suite
-    - go test -exec "env PKG_CONFIG_PATH=${PKG_CONFIG_PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} DYLD_LIBRARY_PATH=${MACOS_LIBRARY_PATH}" ${BUILD_TAGS} -v -timeout {{.TEST_TIMEOUT}}s ./internal/integration -run TestClientSideEncryptionProse/custom_endpoint >> test.suite
-    - go test -exec "env PKG_CONFIG_PATH=${PKG_CONFIG_PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} DYLD_LIBRARY_PATH=${MACOS_LIBRARY_PATH}" ${BUILD_TAGS} -v -timeout {{.TEST_TIMEOUT}}s ./internal/integration -run TestClientSideEncryptionProse/kms_tls_options_test >> test.suite
-  evg-test-kms:
-    - go test -exec "env PKG_CONFIG_PATH=${PKG_CONFIG_PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" ${BUILD_TAGS} -v -timeout {{.TEST_TIMEOUT}}s ./internal/integration -run TestClientSideEncryptionProse/kms_tls_tests >> test.suite
-  evg-test-retry-kms-requests:
-    - go test -exec "env PKG_CONFIG_PATH=${PKG_CONFIG_PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" ${BUILD_TAGS} -v -timeout {{.TEST_TIMEOUT}}s ./internal/integration -run TestClientSideEncryptionProse/kms_retry_tests >> test.suite
+  evg-test-client-side-encryption:
+    - go test -exec "env PKG_CONFIG_PATH=${PKG_CONFIG_PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} DYLD_LIBRARY_PATH=${MACOS_LIBRARY_PATH}" ${BUILD_TAGS} -v -timeout {{.TEST_TIMEOUT}}s ./internal/integration -run TestClientSideEncryptionProse >> test.suite
   evg-test-load-balancers:
     # Load balancer should be tested with all unified tests as well as tests in the following
     # components: retryable reads, retryable writes, change streams, initial DNS seedlist discovery.