Skip to content

Commit 3483773

Browse files
authored
GODRIVER-3540 Support Prefix/Suffix/Substring Indexes. (#2267)
1 parent 44896b6 commit 3483773

9 files changed

Lines changed: 3547 additions & 2868 deletions

File tree

.evergreen/config.yml

Lines changed: 16 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ timeout:
2121
binary: bash
2222
args: [ls, -la]
2323
functions:
24-
assume-test-secrets-ec2-role:
25-
- command: ec2.assume_role
26-
params:
27-
role_arn: ${aws_test_secrets_role}
2824
setup-system:
2925
# Executes clone and applies the submitted patch, if any
3026
- command: git.get_project
@@ -502,21 +498,6 @@ functions:
502498
params:
503499
binary: bash
504500
args: ["${DRIVERS_TOOLS}/.evergreen/csfle/await-servers.sh"]
505-
run-kms-tls-test:
506-
- command: subprocess.exec
507-
params:
508-
binary: "bash"
509-
env:
510-
GO_BUILD_TAGS: cse
511-
include_expansions_in_env: [AUTH, SSL, MONGODB_URI, TOPOLOGY, MONGO_GO_DRIVER_COMPRESSOR]
512-
args: [*task-runner, setup-test]
513-
- command: subprocess.exec
514-
type: test
515-
retry_on_failure: true
516-
params:
517-
binary: "bash"
518-
include_expansions_in_env: [KMS_TLS_TESTCASE]
519-
args: [*task-runner, evg-test-kms]
520501
run-kmip-tests:
521502
- command: subprocess.exec
522503
params:
@@ -533,23 +514,24 @@ functions:
533514
env:
534515
KMS_MOCK_SERVERS_RUNNING: "true"
535516
args: [*task-runner, evg-test-kmip]
536-
run-retry-kms-requests:
517+
run-client-side-encryption-test:
537518
- command: subprocess.exec
538519
params:
539520
binary: "bash"
540521
env:
541522
GO_BUILD_TAGS: cse
542-
include_expansions_in_env: [AUTH, SSL, MONGODB_URI, TOPOLOGY, MONGO_GO_DRIVER_COMPRESSOR]
523+
include_expansions_in_env: [AUTH, SSL, MONGODB_URI, TOPOLOGY, MONGO_GO_DRIVER_COMPRESSOR, CRYPT_SHARED_LIB_PATH]
543524
args: [*task-runner, setup-test]
544525
- command: subprocess.exec
545526
type: test
546527
retry_on_failure: true
547528
params:
548529
binary: "bash"
549530
env:
531+
KMS_MOCK_SERVERS_RUNNING: "true"
550532
KMS_FAILPOINT_CA_FILE: "${DRIVERS_TOOLS}/.evergreen/x509gen/ca.pem"
551533
KMS_FAILPOINT_SERVER_RUNNING: "true"
552-
args: [*task-runner, evg-test-retry-kms-requests]
534+
args: [*task-runner, evg-test-client-side-encryption]
553535
run-fuzz-tests:
554536
- command: subprocess.exec
555537
type: test
@@ -1408,36 +1390,6 @@ tasks:
14081390
TOPOLOGY: "server"
14091391
AUTH: "noauth"
14101392
SSL: "nossl"
1411-
- name: "test-kms-tls-invalid-cert"
1412-
tags: ["kms-test"]
1413-
commands:
1414-
- func: bootstrap-mongo-orchestration
1415-
vars:
1416-
TOPOLOGY: "server"
1417-
AUTH: "noauth"
1418-
SSL: "nossl"
1419-
- func: start-cse-servers
1420-
- func: run-kms-tls-test
1421-
vars:
1422-
KMS_TLS_TESTCASE: "INVALID_CERT"
1423-
TOPOLOGY: "server"
1424-
AUTH: "noauth"
1425-
SSL: "nossl"
1426-
- name: "test-kms-tls-invalid-hostname"
1427-
tags: ["kms-test"]
1428-
commands:
1429-
- func: bootstrap-mongo-orchestration
1430-
vars:
1431-
TOPOLOGY: "server"
1432-
AUTH: "noauth"
1433-
SSL: "nossl"
1434-
- func: start-cse-servers
1435-
- func: run-kms-tls-test
1436-
vars:
1437-
KMS_TLS_TESTCASE: "INVALID_HOSTNAME"
1438-
TOPOLOGY: "server"
1439-
AUTH: "noauth"
1440-
SSL: "nossl"
14411393
- name: "test-kms-kmip"
14421394
tags: ["kms-kmip"]
14431395
commands:
@@ -1452,16 +1404,20 @@ tasks:
14521404
TOPOLOGY: "server"
14531405
AUTH: "noauth"
14541406
SSL: "nossl"
1455-
- name: "test-retry-kms-requests"
1456-
tags: ["kms-test"]
1407+
- name: "test-client-side-encryption"
1408+
tags: ["client-side-encryption-test"]
14571409
commands:
14581410
- func: bootstrap-mongo-orchestration
14591411
vars:
1460-
TOPOLOGY: "server"
1412+
TOPOLOGY: "replica_set"
14611413
AUTH: "noauth"
14621414
SSL: "nossl"
14631415
- func: start-cse-servers
1464-
- func: run-retry-kms-requests
1416+
- func: run-client-side-encryption-test
1417+
vars:
1418+
TOPOLOGY: "replica_set"
1419+
AUTH: "noauth"
1420+
SSL: "nossl"
14651421
- name: "testgcpkms-task"
14661422
commands:
14671423
- command: subprocess.exec
@@ -2088,11 +2044,11 @@ buildvariants:
20882044
display_name: "API Version ${version} ${os-ssl-40}"
20892045
tasks:
20902046
- name: ".versioned-api"
2091-
- matrix_name: "kms-test"
2092-
matrix_spec: {version: ["7.0"], os-ssl-40: ["rhel87-64"]}
2093-
display_name: "KMS TEST ${os-ssl-40}"
2047+
- matrix_name: "client-side-encryption-test"
2048+
matrix_spec: {version: ["latest"], os-ssl-40: ["rhel87-64"]}
2049+
display_name: "Client Side Encryption Tests ${os-ssl-40}"
20942050
tasks:
2095-
- name: ".kms-test"
2051+
- name: ".client-side-encryption-test"
20962052
- matrix_name: "load-balancer-test"
20972053
tags: ["pullrequest"]
20982054
matrix_spec: {version: ["5.0", "6.0", "7.0", "8.0"], os-ssl-40: ["rhel87-64"]}

Taskfile.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,8 @@ tasks:
9393
- go run -race ./internal/cmd/testoidcauth/main.go
9494
evg-test-kmip:
9595
- 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
96-
- 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
97-
- 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
98-
- 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
99-
- 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
100-
evg-test-kms:
101-
- 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
102-
evg-test-retry-kms-requests:
103-
- 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
96+
evg-test-client-side-encryption:
97+
- 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
10498
evg-test-load-balancers:
10599
# Load balancer should be tested with all unified tests as well as tests in the following
106100
# components: retryable reads, retryable writes, change streams, initial DNS seedlist discovery.

0 commit comments

Comments
 (0)