CXX-3323 drop support for MongoDB Server 4.0 or older (#1436)

* Rename test_util::newer_than -> test_util::server_version_is_at_least

Author: eramongodb

examples/mongocxx/mongodb.com/transactions_examples.cpp

@@ -265,10 +265,6 @@ int EXAMPLES_CDECL main() {
         if (max_wire_version.type() != bsoncxx::type::k_int32) {
             throw std::logic_error{"max wire version is not int32"};
         }
-        if (max_wire_version.get_int32().value < 7) {
-            std::cerr << "Skipping: transactions example requires max wire version is >= 7" << std::endl;
-            return EXIT_SUCCESS;
-        }
     }
 
     for (auto const& example : examples) {

src/mongocxx/include/mongocxx/v_noabi/mongocxx/result/bulk_write.hpp

@@ -59,8 +59,6 @@ class bulk_write {
     ///
     /// @return The number of documents that were modified.
     ///
-    /// @throws with server versions below 2.6 due to the field `nModified` not being returned.
-    ///
     MONGOCXX_ABI_EXPORT_CDECL(std::int32_t) modified_count() const;
 
     ///

src/mongocxx/lib/mongocxx/v_noabi/mongocxx/collection.cpp

@@ -1297,12 +1297,8 @@ void collection::_drop(
     scoped_bson_t opts_bson{opts_doc.view()};
     auto result = libmongoc::collection_drop_with_opts(_get_impl().collection_t, opts_bson.bson(), &error);
 
-    // Throw an exception if the command failed, unless the failure was due to a non-existent
-    // collection. We check for this failure using 'code', but we fall back to checking 'message'
-    // for old server versions (3.0 and earlier) that do not send a code with the command response.
-    if (!result &&
-        !(error.code == ::MONGOC_ERROR_COLLECTION_DOES_NOT_EXIST ||
-          bsoncxx::v_noabi::stdx::string_view{error.message} == bsoncxx::v_noabi::stdx::string_view{"ns not found"})) {
+    // Throw an exception if the command failed, unless the failure was due to a non-existent collection.
+    if (!result && error.code != MONGOC_ERROR_COLLECTION_DOES_NOT_EXIST) {
         throw_exception<operation_exception>(error);
     }
 }

src/mongocxx/test/spec/gridfs.cpp

@@ -473,12 +473,6 @@ TEST_CASE("GridFS spec automated tests", "[gridfs_spec]") {
 
     client client{uri{}, test_util::add_test_server_api()};
 
-    // Because the GridFS spec tests use write commands that were only added to MongoDB in version
-    // 2.6, the tests will not run against any server versions older than that.
-    if (test_util::compare_versions(test_util::get_server_version(), "2.6") < 0) {
-        return;
-    }
-
     auto cb = [&](std::string const& test_file) { run_gridfs_tests_in_file(test_file, &client); };
 
     mongocxx::spec::run_tests_in_suite("GRIDFS_TESTS_PATH", cb);

src/mongocxx/test/spec/unified_tests/runner.cpp

@@ -295,20 +295,6 @@ bool compatible_with_server(bsoncxx::array::element const& requirement) {
         }
     }
 
-    if (auto const csfle = requirement["csfle"]) {
-        // csfle: Optional boolean. If true, the tests MUST only run if the
-        // driver and server support Client-Side Field Level Encryption. A
-        // server supports CSFLE if it is version 4.2.0 or higher. If false,
-        // tests MUST only run if CSFLE is not enabled. If this field is
-        // omitted, there is no CSFLE requirement.
-        std::vector<int> const requires_at_least{4, 2, 0};
-        bool const is_csfle = csfle.get_bool().value;
-        if (is_csfle) {
-            if (!is_compatible_version(requires_at_least, expected)) {
-                return false;
-            }
-        }
-    }
     return true;
 }
 

src/mongocxx/test/v_noabi/client.cpp

@@ -387,8 +387,6 @@ TEST_CASE("integration tests for client metadata handshake feature") {
 
             found_op = true;
 
-            std::string server_version = test_util::get_server_version();
-
             REQUIRE(op_view["clientMetadata"]);
             auto metadata = op_view["clientMetadata"].get_document();
             auto metadata_view = metadata.view();

src/mongocxx/test/v_noabi/client_helpers.cpp

@@ -231,7 +231,7 @@ std::int32_t compare_versions(std::string version1, std::string version2) {
     return 0;
 }
 
-bool newer_than(std::string version) {
+bool server_version_is_at_least(std::string version) {
     auto server_version = get_server_version();
     return (compare_versions(server_version, version) >= 0);
 }

src/mongocxx/test/v_noabi/client_helpers.hh

@@ -56,7 +56,7 @@ std::int32_t compare_versions(std::string version1, std::string version2);
 // Returns 'true' if the server version for the default client is at least 'version',
 // returns 'false' otherwise.
 //
-bool newer_than(std::string version);
+bool server_version_is_at_least(std::string version);
 
 //
 // Converts a hexadecimal string to an string of bytes.

src/mongocxx/test/v_noabi/client_session.cpp

@@ -822,11 +822,6 @@ TEST_CASE("with_transaction", "[session]") {
     // The following three tests are prose tests from the with_transaction spec.
     SECTION("prose tests for with_transaction") {
         SECTION("callback raises a custom error") {
-            // Multi-document transactions require server 4.2+.
-            if (compare_versions(get_server_version(), "4.2") < 0) {
-                SKIP("MongoDB server 4.2 or newer required");
-            }
-
             // Test an operation_exception
             REQUIRE_THROWS_MATCHES(
                 session.with_transaction([](client_session*) { throw operation_exception{{}, "The meaning of life"}; }),

src/mongocxx/test/v_noabi/client_side_encryption.cpp

@@ -343,11 +343,6 @@ TEST_CASE("Datakey and double encryption", "[client_side_encryption]") {
 
     mongocxx::client setup_client{uri{}, test_util::add_test_server_api(client_opts)};
 
-    if (test_util::get_max_wire_version() < 8) {
-        // Automatic encryption requires wire version 8.
-        SKIP("max wire version is < 8");
-    }
-
     // 2. Drop keyvault.datakeys and db.coll
     _setup_drop_collections(setup_client);
 
@@ -579,11 +574,6 @@ TEST_CASE("External key vault", "[client_side_encryption]") {
         test_util::add_test_server_api(),
     };
 
-    if (test_util::get_max_wire_version() < 8) {
-        // Automatic encryption requires wire version 8.
-        SKIP("max wire version is < 8");
-    }
-
     run_external_key_vault_test(true);
     run_external_key_vault_test(false);
 }
@@ -599,11 +589,6 @@ TEST_CASE("BSON size limits and batch splitting", "[client_side_encryption]") {
         test_util::add_test_server_api(),
     };
 
-    if (test_util::get_max_wire_version() < 8) {
-        // Automatic encryption requires wire version 8.
-        SKIP("max wire version is < 8");
-    }
-
     // Load in json schema limits/limits-schema.json and limits/limits-key.json
     auto limits_schema = _doc_from_file("/limits/limits-schema.json");
     auto limits_key = _doc_from_file("/limits/limits-key.json");
@@ -757,11 +742,6 @@ TEST_CASE("Views are prohibited", "[client_side_encryption]") {
         test_util::add_test_server_api(),
     };
 
-    if (test_util::get_max_wire_version() < 8) {
-        // Automatic encryption requires wire version 8.
-        SKIP("max wire version is < 8");
-    }
-
     // Using client, drop and create a view named db.view with an empty pipeline.
     // E.g. using the command { "create": "view", "viewOn": "coll" }.
     auto db = client["db"];
@@ -1096,11 +1076,6 @@ TEST_CASE("Corpus", "[client_side_encryption]") {
         uri{},
         test_util::add_test_server_api(),
     };
-
-    if (test_util::get_max_wire_version() < 8) {
-        // Automatic encryption requires wire version 8.
-        SKIP("max wire version is < 8");
-    }
     _run_corpus_test(true);
     _run_corpus_test(false);
 }
@@ -1217,11 +1192,6 @@ TEST_CASE("Custom endpoint", "[client_side_encryption]") {
         test_util::add_test_server_api(),
     };
 
-    if (test_util::get_max_wire_version() < 8) {
-        // Automatic encryption requires wire version 8.
-        SKIP("max wire version is < 8");
-    }
-
     // Call client_encryption.createDataKey() with "aws" as the provider and the following
     // masterKey:
     // {
@@ -1560,11 +1530,6 @@ TEST_CASE("Bypass spawning mongocryptd", "[client_side_encryption]") {
         test_util::add_test_server_api(),
     };
 
-    if (test_util::get_max_wire_version() < 8) {
-        // Automatic encryption requires wire version 8.
-        SKIP("max wire version is < 8");
-    }
-
     auto shared_lib_path = getenv("CRYPT_SHARED_LIB_PATH");
 
     auto external_schema_file = _doc_from_file("/external/external-schema.json");
@@ -1703,11 +1668,6 @@ TEST_CASE("KMS TLS expired certificate", "[client_side_encryption]") {
         SKIP("KMS TLS tests disabled (BUILD-14068)");
     }
 
-    if (test_util::get_max_wire_version() < 8) {
-        // Automatic encryption requires wire version 8.
-        SKIP("max wire version is < 8");
-    }
-
     options::client_encryption cse_opts;
     _add_cse_opts(&cse_opts, &setup_client);
     client_encryption client_encryption{std::move(cse_opts)};
@@ -1759,11 +1719,6 @@ TEST_CASE("KMS TLS wrong host certificate", "[client_side_encryption]") {
         SKIP("KMS TLS tests disabled (BUILD-14068)");
     }
 
-    if (test_util::get_max_wire_version() < 8) {
-        // Automatic encryption requires wire version 8.
-        SKIP("max wire version is < 8");
-    }
-
     options::client_encryption cse_opts;
     _add_cse_opts(&cse_opts, &setup_client);
     client_encryption client_encryption{std::move(cse_opts)};
@@ -1868,11 +1823,6 @@ TEST_CASE("KMS TLS Options Tests", "[client_side_encryption][!mayfail]") {
         SKIP("KMS TLS tests disabled (BUILD-14068)");
     }
 
-    if (test_util::get_max_wire_version() < 8) {
-        // Automatic encryption requires wire version 8.
-        SKIP("max wire version is < 8");
-    }
-
     auto client_encryption_no_client_cert =
         make_prose_test_11_ce(&setup_client, "127.0.0.1:9002", "127.0.0.1:9002", "127.0.0.1:5698", with_certs::ca_only);
     auto client_encryption_with_tls =
@@ -2120,7 +2070,7 @@ TEST_CASE("Explicit Encryption", "[client_side_encryption]") {
         test_util::add_test_server_api(),
     };
 
-    if (!test_util::newer_than("7.0")) {
+    if (!test_util::server_version_is_at_least("7.0")) {
         SKIP("MongoDB server 7.0 or newer required");
     }
 
@@ -2420,7 +2370,7 @@ TEST_CASE("Create Encrypted Collection", "[client_side_encryption]") {
 
     mongocxx::client conn{mongocxx::uri{}, test_util::add_test_server_api()};
 
-    if (!test_util::newer_than("7.0")) {
+    if (!test_util::server_version_is_at_least("7.0")) {
         SKIP("Explicit Encryption tests require MongoDB server 7.0+.");
     }
 
@@ -2550,10 +2500,6 @@ TEST_CASE("Unique Index on keyAltNames", "[client_side_encryption]") {
 
     CLIENT_SIDE_ENCRYPTION_ENABLED_OR_SKIP();
 
-    if (!test_util::newer_than("4.2")) {
-        SKIP("requires MongoDB server 4.2+");
-    }
-
     // 1. Create a MongoClient object (referred to as client).
     mongocxx::client client{mongocxx::uri{}, test_util::add_test_server_api()};
 
@@ -2691,10 +2637,6 @@ TEST_CASE("Custom Key Material Test", "[client_side_encryption]") {
 
     CLIENT_SIDE_ENCRYPTION_ENABLED_OR_SKIP();
 
-    if (!test_util::newer_than("4.2")) {
-        SKIP("MongoDB server 4.2 or newer required");
-    }
-
     // 1. Create a MongoClient object (referred to as client).
     mongocxx::client client{mongocxx::uri{}, test_util::add_test_server_api()};
 
@@ -3037,7 +2979,7 @@ TEST_CASE("Range Explicit Encryption", "[client_side_encryption]") {
     {
         auto client = mongocxx::client(mongocxx::uri(), test_util::add_test_server_api());
 
-        if (!test_util::newer_than("8.0")) {
+        if (!test_util::server_version_is_at_least("8.0")) {
             SKIP("MongoDB server 8.0 or newer required");
         }
 
@@ -3443,7 +3385,7 @@ TEST_CASE("Range Explicit Encryption applies defaults", "[client_side_encryption
         test_util::add_test_server_api(),
     };
 
-    if (!test_util::newer_than("8.0")) {
+    if (!test_util::server_version_is_at_least("8.0")) {
         SKIP("MongoDB server 8.0 or newer required");
     }