test(NODE-6024): sync skip rangePreview tests on server 8.0+ (#4039)

mongodb · Mar 15, 2024 · d86d2ae · d86d2ae
1 parent d15dcbb
commit d86d2ae
Show file tree

Hide file tree

Showing 91 changed files with 190 additions and 49 deletions.
diff --git a/.../client-side-encryption/client_side_encryption.prose.22.range_explicit_encryption.test.ts b/.../client-side-encryption/client_side_encryption.prose.22.range_explicit_encryption.test.ts
@@ -2,6 +2,7 @@ import { EJSON } from 'bson';
 import { expect } from 'chai';
 import { readFile } from 'fs/promises';
 import { join } from 'path';
+import * as semver from 'semver';
 
 import { Decimal128, type Document, Double, Long, type MongoClient } from '../../../src';
 /* eslint-disable @typescript-eslint/no-restricted-imports */
@@ -126,6 +127,14 @@ const readEncryptedFieldsFile = (dataType: string): Promise<string> =>
 describe('Range Explicit Encryption', function () {
  installNodeDNSWorkaroundHooks();
 
+ beforeEach(async function () {
+ if (semver.gte(this.configuration.version, '7.999.999')) {
+ if (this.currentTest)
+ this.currentTest.skipReason = 'TODO(NODE-5908): skip rangePreview tests on server 8.0+';
+ return this.currentTest?.skip();
+ }
+ });
+
  let clientEncryption;
  let keyId;
  let keyVaultClient;

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-MissingKey.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-MissingKey.json
@@ -54,7 +54,7 @@
  "key_vault_data": [],
  "tests": [
  {
- "description": "FLE2 encrypt fails with mising key",
+ "description": "FLE2 encrypt fails with missing key",
  "clientOptions": {
  "autoEncryptOpts": {
  "kmsProviders": {
@@ -85,7 +85,7 @@
  ]
  },
  {
- "description": "FLE2 decrypt fails with mising key",
+ "description": "FLE2 decrypt fails with missing key",
  "clientOptions": {
  "autoEncryptOpts": {
  "kmsProviders": {

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-MissingKey.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-MissingKey.yml
@@ -19,7 +19,7 @@ data: [
 encrypted_fields: {'fields': [{'keyId': {'$binary': {'base64': 'EjRWeBI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedIndexed', 'bsonType': 'string', 'queries': {'queryType': 'equality', 'contention': {'$numberLong': '0'}}}, {'keyId': {'$binary': {'base64': 'q83vqxI0mHYSNBI0VniQEg==', 'subType': '04'}}, 'path': 'encryptedUnindexed', 'bsonType': 'string'}]}
 key_vault_data: []
 tests:
- - description: "FLE2 encrypt fails with mising key"
+ - description: "FLE2 encrypt fails with missing key"
  clientOptions:
  autoEncryptOpts:
  kmsProviders:
@@ -30,7 +30,7 @@ tests:
  document: { _id: 1, encryptedIndexed: "123" }
  result:
  errorContains: "not all keys requested were satisfied"
- - description: "FLE2 decrypt fails with mising key"
+ - description: "FLE2 decrypt fails with missing key"
  clientOptions:
  autoEncryptOpts:
  kmsProviders:

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.json
@@ -6,7 +6,8 @@
  "replicaset",
  "sharded",
  "load-balanced"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Aggregate.yml
@@ -5,6 +5,8 @@ runOn:
  # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
  # FLE 2 Encrypted collections are not supported on standalone.
  topology: [ "replicaset", "sharded", "load-balanced" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.json
@@ -6,7 +6,8 @@
  "replicaset",
  "sharded",
  "load-balanced"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Correctness.yml
@@ -7,6 +7,8 @@ runOn:
  # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
  # FLE 2 Encrypted collections are not supported on standalone.
  topology: [ "replicaset", "sharded", "load-balanced" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.json
@@ -6,7 +6,8 @@
  "replicaset",
  "sharded",
  "load-balanced"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Delete.yml
@@ -5,6 +5,8 @@ runOn:
  # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
  # FLE 2 Encrypted collections are not supported on standalone.
  topology: [ "replicaset", "sharded", "load-balanced" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.json
@@ -6,7 +6,8 @@
  "replicaset",
  "sharded",
  "load-balanced"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml
@@ -5,6 +5,8 @@ runOn:
  # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
  # FLE 2 Encrypted collections are not supported on standalone.
  topology: [ "replicaset", "sharded", "load-balanced" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.json
@@ -6,7 +6,8 @@
  "replicaset",
  "sharded",
  "load-balanced"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-InsertFind.yml
@@ -5,6 +5,8 @@ runOn:
  # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
  # FLE 2 Encrypted collections are not supported on standalone.
  topology: [ "replicaset", "sharded", "load-balanced" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.json
@@ -6,7 +6,8 @@
  "replicaset",
  "sharded",
  "load-balanced"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Date-Update.yml
@@ -5,6 +5,8 @@ runOn:
  # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
  # FLE 2 Encrypted collections are not supported on standalone.
  topology: [ "replicaset", "sharded", "load-balanced" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.json
@@ -4,7 +4,8 @@
  "minServerVersion": "7.0.0",
  "topology": [
  "replicaset"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Aggregate.yml
@@ -6,6 +6,8 @@ runOn:
  # FLE 2 Encrypted collections are not supported on standalone.
  # Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout.
  topology: [ "replicaset" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.json
@@ -4,7 +4,8 @@
  "minServerVersion": "7.0.0",
  "topology": [
  "replicaset"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Correctness.yml
@@ -8,6 +8,8 @@ runOn:
  # FLE 2 Encrypted collections are not supported on standalone.
  # Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout.
  topology: [ "replicaset" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.json
@@ -4,7 +4,8 @@
  "minServerVersion": "7.0.0",
  "topology": [
  "replicaset"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Delete.yml
@@ -6,6 +6,8 @@ runOn:
  # FLE 2 Encrypted collections are not supported on standalone.
  # Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout.
  topology: [ "replicaset" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.json
@@ -4,7 +4,8 @@
  "minServerVersion": "7.0.0",
  "topology": [
  "replicaset"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-FindOneAndUpdate.yml
@@ -6,6 +6,8 @@ runOn:
  # FLE 2 Encrypted collections are not supported on standalone.
  # Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout.
  topology: [ "replicaset" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.json
@@ -4,7 +4,8 @@
  "minServerVersion": "7.0.0",
  "topology": [
  "replicaset"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-InsertFind.yml
@@ -6,6 +6,8 @@ runOn:
  # FLE 2 Encrypted collections are not supported on standalone.
  # Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout.
  topology: [ "replicaset" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.json
@@ -4,7 +4,8 @@
  "minServerVersion": "7.0.0",
  "topology": [
  "replicaset"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-Decimal-Update.yml
@@ -6,6 +6,8 @@ runOn:
  # FLE 2 Encrypted collections are not supported on standalone.
  # Tests for Decimal (without precision) must only run against a replica set. Decimal (without precision) queries are expected to take a long time and may exceed the default mongos timeout.
  topology: [ "replicaset" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.json
@@ -6,7 +6,8 @@
  "replicaset",
  "sharded",
  "load-balanced"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Aggregate.yml
@@ -5,6 +5,8 @@ runOn:
  # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
  # FLE 2 Encrypted collections are not supported on standalone.
  topology: [ "replicaset", "sharded", "load-balanced" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.json
@@ -6,7 +6,8 @@
  "replicaset",
  "sharded",
  "load-balanced"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Correctness.yml
@@ -7,6 +7,8 @@ runOn:
  # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
  # FLE 2 Encrypted collections are not supported on standalone.
  topology: [ "replicaset", "sharded", "load-balanced" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.json
@@ -6,7 +6,8 @@
  "replicaset",
  "sharded",
  "load-balanced"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Delete.yml
@@ -5,6 +5,8 @@ runOn:
  # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
  # FLE 2 Encrypted collections are not supported on standalone.
  topology: [ "replicaset", "sharded", "load-balanced" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/...c/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json b/...c/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.json
@@ -6,7 +6,8 @@
  "replicaset",
  "sharded",
  "load-balanced"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/...ec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml b/...ec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-FindOneAndUpdate.yml
@@ -5,6 +5,8 @@ runOn:
  # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
  # FLE 2 Encrypted collections are not supported on standalone.
  topology: [ "replicaset", "sharded", "load-balanced" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.json
@@ -6,7 +6,8 @@
  "replicaset",
  "sharded",
  "load-balanced"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.yml b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-InsertFind.yml
@@ -5,6 +5,8 @@ runOn:
  # Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
  # FLE 2 Encrypted collections are not supported on standalone.
  topology: [ "replicaset", "sharded", "load-balanced" ]
+ # Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
+ maxServerVersion: "7.99.99"
 database_name: &database_name "default"
 collection_name: &collection_name "default"
 data: []

diff --git a/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.json b/test/spec/client-side-encryption/tests/legacy/fle2v2-Range-DecimalPrecision-Update.json
@@ -6,7 +6,8 @@
  "replicaset",
  "sharded",
  "load-balanced"
- ]
+ ],
+ "maxServerVersion": "7.99.99"
  }
  ],
  "database_name": "default",