From 7d92e882c300a0b60d2f3ba370c130fa77e35e23 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 12 Jun 2025 11:02:34 -0500 Subject: [PATCH 1/6] Update examples for CDRIVER-5710 and CDRIVER-6017 --- .../config_generator/components/funcs/install_c_driver.py | 2 +- .evergreen/generated_configs/functions.yml | 2 +- examples/api/bsoncxx/examples/validation/basic_usage.cpp | 4 ++-- examples/api/bsoncxx/examples/validation/validator.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.evergreen/config_generator/components/funcs/install_c_driver.py b/.evergreen/config_generator/components/funcs/install_c_driver.py index 26af7ba0ce..eccc96caaf 100644 --- a/.evergreen/config_generator/components/funcs/install_c_driver.py +++ b/.evergreen/config_generator/components/funcs/install_c_driver.py @@ -14,7 +14,7 @@ # Only MONGOC_DOWNLOAD_VERSION needs to be updated when pinning to an unreleased commit. # If pinning to an unreleased commit, create a "Blocked" JIRA ticket with # a "depends on" link to the appropriate C Driver version release ticket. -MONGOC_VERSION_MINIMUM = '2.0.0' +MONGOC_VERSION_MINIMUM = '2.0.2' class InstallCDriver(Function): diff --git a/.evergreen/generated_configs/functions.yml b/.evergreen/generated_configs/functions.yml index 6341391c02..e632dfde7f 100644 --- a/.evergreen/generated_configs/functions.yml +++ b/.evergreen/generated_configs/functions.yml @@ -443,7 +443,7 @@ functions: type: setup params: updates: - - { key: mongoc_version_minimum, value: 2.0.0 } + - { key: mongoc_version_minimum, value: 2.0.2 } - command: subprocess.exec type: setup params: diff --git a/examples/api/bsoncxx/examples/validation/basic_usage.cpp b/examples/api/bsoncxx/examples/validation/basic_usage.cpp index ceaf61f21a..9262e805d8 100644 --- a/examples/api/bsoncxx/examples/validation/basic_usage.cpp +++ b/examples/api/bsoncxx/examples/validation/basic_usage.cpp @@ -61,8 +61,8 @@ void example() { EXPECT(bsoncxx::validate(data, length) == bsoncxx::validate(data, length, options, &offset)); - // Not set when valid. - EXPECT(offset == 123u); + // Set to 0 when valid. + EXPECT(offset == 0u); } } // [Example] diff --git a/examples/api/bsoncxx/examples/validation/validator.cpp b/examples/api/bsoncxx/examples/validation/validator.cpp index fa461abb26..cf677f7db4 100644 --- a/examples/api/bsoncxx/examples/validation/validator.cpp +++ b/examples/api/bsoncxx/examples/validation/validator.cpp @@ -77,8 +77,8 @@ void example(std::uint8_t const* bytes, std::size_t length) { EXPECT(!bsoncxx::validate(bytes, length, options, &offset)); - // Offset of `"$numberInt": "123"` relative to start of the sub-document. (CDRIVER-5710) - EXPECT(offset == 4u); + // Offset of `"$numberInt": "123"` relative to start of the document. + EXPECT(offset == 31u); } } // [Example] From adac29e7c2b73906608853ef64f99dd81bb5151f Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Fri, 6 Jun 2025 09:31:15 -0500 Subject: [PATCH 2/6] Add missing import of ec2_assume_role --- .evergreen/config_generator/components/mongohouse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/config_generator/components/mongohouse.py b/.evergreen/config_generator/components/mongohouse.py index 8d262b5da8..dfa53097b9 100644 --- a/.evergreen/config_generator/components/mongohouse.py +++ b/.evergreen/config_generator/components/mongohouse.py @@ -8,7 +8,7 @@ from config_generator.etc.utils import bash_exec from shrub.v3.evg_build_variant import BuildVariant -from shrub.v3.evg_command import EvgCommandType +from shrub.v3.evg_command import EvgCommandType, ec2_assume_role from shrub.v3.evg_task import EvgTask, EvgTaskRef From 4284efa6db6e31ecbe66ef48f5b50150385e2486 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 12 Jun 2025 11:39:11 -0500 Subject: [PATCH 3/6] Also bump the auto-downloaded C Driver version --- CHANGELOG.md | 1 + CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01ba9b3a86..ae0b6cfaea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu ### Changed - CMake 3.16.0 or newer is required when `ENABLE_TESTS=ON` for compatibility with the updated Catch2 library version (3.7.0 -> 3.8.1). +- Bump the auto-downloaded C Driver version to [2.0.2](https://github.com/mongodb/mongo-c-driver/releases/tag/2.0.2). ## 4.1.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6caee2052f..e35770d609 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,7 @@ endif() # Also update etc/purls.txt. set(BSON_REQUIRED_VERSION 2.0.0) set(MONGOC_REQUIRED_VERSION 2.0.0) -set(MONGOC_DOWNLOAD_VERSION 2.0.0) +set(MONGOC_DOWNLOAD_VERSION 2.0.2) # All of our target compilers support the deprecated # attribute. Normally, we would just let the GenerateExportHeader From a3051e772150e986384cb5ecc3319f87d05a9fef Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 12 Jun 2025 12:43:10 -0500 Subject: [PATCH 4/6] CXX-3302 bump minimum required C Driver version to 2.0.2 --- CHANGELOG.md | 2 +- CMakeLists.txt | 4 ++-- etc/make_release.py | 2 +- etc/purls.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae0b6cfaea..4a1ce792e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu ### Changed - CMake 3.16.0 or newer is required when `ENABLE_TESTS=ON` for compatibility with the updated Catch2 library version (3.7.0 -> 3.8.1). -- Bump the auto-downloaded C Driver version to [2.0.2](https://github.com/mongodb/mongo-c-driver/releases/tag/2.0.2). +- Bump the minimum required C Driver version to [2.0.2](https://github.com/mongodb/mongo-c-driver/releases/tag/2.0.2). ## 4.1.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index e35770d609..6f750998d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,8 +45,8 @@ else() endif() # Also update etc/purls.txt. -set(BSON_REQUIRED_VERSION 2.0.0) -set(MONGOC_REQUIRED_VERSION 2.0.0) +set(BSON_REQUIRED_VERSION 2.0.2) +set(MONGOC_REQUIRED_VERSION 2.0.2) set(MONGOC_DOWNLOAD_VERSION 2.0.2) # All of our target compilers support the deprecated diff --git a/etc/make_release.py b/etc/make_release.py index e47616f8f7..42de090471 100755 --- a/etc/make_release.py +++ b/etc/make_release.py @@ -91,7 +91,7 @@ show_default=True, help='The remote reference which points to the mongodb/mongo-cxx-driver repo') @click.option('--c-driver-build-ref', - default='2.0.0', + default='2.0.2', show_default=True, help='When building the C driver, build at this Git reference') @click.option('--with-c-driver', diff --git a/etc/purls.txt b/etc/purls.txt index de138b5cce..ea12d65ef5 100644 --- a/etc/purls.txt +++ b/etc/purls.txt @@ -6,4 +6,4 @@ # re-generate the SBOM JSON file! # bson and mongoc may be obtained via cmake/FetchMongoC.cmake. -pkg:github/mongodb/mongo-c-driver@v2.0.0 +pkg:github/mongodb/mongo-c-driver@v2.0.2 From b15ef1d38aa48e4eac251cf7bdd218d146f7d2d0 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 12 Jun 2025 12:43:11 -0500 Subject: [PATCH 5/6] Update SBOM Lite --- etc/cyclonedx.sbom.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/etc/cyclonedx.sbom.json b/etc/cyclonedx.sbom.json index 7af05918a7..9ee60faeda 100644 --- a/etc/cyclonedx.sbom.json +++ b/etc/cyclonedx.sbom.json @@ -1,16 +1,16 @@ { "components": [ { - "bom-ref": "pkg:github/mongodb/mongo-c-driver@v2.0.0", + "bom-ref": "pkg:github/mongodb/mongo-c-driver@v2.0.2", "copyright": "Copyright 2009-present MongoDB, Inc.", "externalReferences": [ { "type": "distribution", - "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v2.0.0.tar.gz" + "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v2.0.2.tar.gz" }, { "type": "website", - "url": "https://github.com/mongodb/mongo-c-driver/tree/v2.0.0" + "url": "https://github.com/mongodb/mongo-c-driver/tree/v2.0.2" } ], "group": "mongodb", @@ -22,18 +22,18 @@ } ], "name": "mongo-c-driver", - "purl": "pkg:github/mongodb/mongo-c-driver@v2.0.0", + "purl": "pkg:github/mongodb/mongo-c-driver@v2.0.2", "type": "library", - "version": "v2.0.0" + "version": "v2.0.2" } ], "dependencies": [ { - "ref": "pkg:github/mongodb/mongo-c-driver@v2.0.0" + "ref": "pkg:github/mongodb/mongo-c-driver@v2.0.2" } ], "metadata": { - "timestamp": "2025-05-01T20:23:28.401764+00:00", + "timestamp": "2025-06-12T17:36:20.890153+00:00", "tools": [ { "externalReferences": [ From c1740c81c2953623c3e5cd0bb60fab5bc32ac9c3 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 12 Jun 2025 12:43:11 -0500 Subject: [PATCH 6/6] Update Augmented SBOM --- etc/augmented.sbom.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/etc/augmented.sbom.json b/etc/augmented.sbom.json index df8828d345..9ee60faeda 100644 --- a/etc/augmented.sbom.json +++ b/etc/augmented.sbom.json @@ -1,16 +1,16 @@ { "components": [ { - "bom-ref": "pkg:github/mongodb/mongo-c-driver@v2.0.0", + "bom-ref": "pkg:github/mongodb/mongo-c-driver@v2.0.2", "copyright": "Copyright 2009-present MongoDB, Inc.", "externalReferences": [ { "type": "distribution", - "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v2.0.0.tar.gz" + "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v2.0.2.tar.gz" }, { "type": "website", - "url": "https://github.com/mongodb/mongo-c-driver/tree/v2.0.0" + "url": "https://github.com/mongodb/mongo-c-driver/tree/v2.0.2" } ], "group": "mongodb", @@ -22,18 +22,18 @@ } ], "name": "mongo-c-driver", - "purl": "pkg:github/mongodb/mongo-c-driver@v2.0.0", + "purl": "pkg:github/mongodb/mongo-c-driver@v2.0.2", "type": "library", - "version": "v2.0.0" + "version": "v2.0.2" } ], "dependencies": [ { - "ref": "pkg:github/mongodb/mongo-c-driver@v2.0.0" + "ref": "pkg:github/mongodb/mongo-c-driver@v2.0.2" } ], "metadata": { - "timestamp": "2025-04-02T19:47:45.682404+00:00", + "timestamp": "2025-06-12T17:36:20.890153+00:00", "tools": [ { "externalReferences": [