diff options
5 files changed, 13 insertions, 4 deletions
diff --git a/buildscripts/resmokeconfig/suites/fle2.yml b/buildscripts/resmokeconfig/suites/fle2.yml index 1d123c5fcd4..cfb1939eecf 100644 --- a/buildscripts/resmokeconfig/suites/fle2.yml +++ b/buildscripts/resmokeconfig/suites/fle2.yml @@ -11,7 +11,7 @@ executor: - ValidateCollections config: shell_options: - eval: "testingReplication = true; testingFLESharding = false;" + eval: "testingReplication = true; testingFLESharding = false; testingFLE2Range = true;" setShellParameter: featureFlagFLE2Range=true hooks: # We don't execute dbHash or oplog consistency checks since there is only a single replica set diff --git a/buildscripts/resmokeconfig/suites/fle2_high_cardinality.yml b/buildscripts/resmokeconfig/suites/fle2_high_cardinality.yml index 3b39160afe4..501ad825ee3 100644 --- a/buildscripts/resmokeconfig/suites/fle2_high_cardinality.yml +++ b/buildscripts/resmokeconfig/suites/fle2_high_cardinality.yml @@ -15,7 +15,7 @@ executor: - ValidateCollections config: shell_options: - eval: "testingReplication = true; testingFLESharding = false;" + eval: "testingReplication = true; testingFLESharding = false; testingFLE2Range = true;" setShellParameter: featureFlagFLE2Range=true hooks: # We don't execute dbHash or oplog consistency checks since there is only a single replica set diff --git a/buildscripts/resmokeconfig/suites/fle2_sharding.yml b/buildscripts/resmokeconfig/suites/fle2_sharding.yml index a7768069563..6db1bd377ca 100644 --- a/buildscripts/resmokeconfig/suites/fle2_sharding.yml +++ b/buildscripts/resmokeconfig/suites/fle2_sharding.yml @@ -12,7 +12,7 @@ executor: - ValidateCollections config: shell_options: - eval: "testingReplication = false; testingFLESharding = true;" + eval: "testingReplication = false; testingFLESharding = true; testingFLE2Range = true;" setShellParameter: featureFlagFLE2Range=true hooks: - class: CheckReplDBHash diff --git a/buildscripts/resmokeconfig/suites/fle2_sharding_high_cardinality.yml b/buildscripts/resmokeconfig/suites/fle2_sharding_high_cardinality.yml index 32f14ce8dcc..4e66988a8b0 100644 --- a/buildscripts/resmokeconfig/suites/fle2_sharding_high_cardinality.yml +++ b/buildscripts/resmokeconfig/suites/fle2_sharding_high_cardinality.yml @@ -16,7 +16,7 @@ executor: - ValidateCollections config: shell_options: - eval: "testingReplication = false; testingFLESharding = true;" + eval: "testingReplication = false; testingFLESharding = true; testingFLE2Range = true;" setShellParameter: featureFlagFLE2Range=true hooks: - class: CheckReplDBHash diff --git a/jstests/fle2/libs/encrypted_client_util.js b/jstests/fle2/libs/encrypted_client_util.js index 91a08f8e732..bcbde09b0f2 100644 --- a/jstests/fle2/libs/encrypted_client_util.js +++ b/jstests/fle2/libs/encrypted_client_util.js @@ -355,6 +355,15 @@ function isFLE2ReplicationEnabled() { return typeof (testingReplication) == "undefined" || testingReplication === true; } +// TODO SERVER-67760 remove once feature flag is gone + +/** + * @returns Returns true if featureFlagFLE2Range is enabled + */ +function isFLE2RangeEnabled() { + return typeof (testingFLE2Range) !== "undefined" && testingFLE2Range && + (TestData == undefined || TestData.setParameters.featureFlagFLE2Range); +} /** * Assert a field is an indexed encrypted field. That includes both * equality and range |