[v4.1] CXX-3302 Update bsoncxx validation examples with offsets (#1416)

.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):

.evergreen/generated_configs/functions.yml

@@ -506,7 +506,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:

CMakeLists.txt

@@ -45,9 +45,9 @@ else()
 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(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
 # attribute. Normally, we would just let the GenerateExportHeader

etc/augmented.sbom.json

@@ -1,16 +1,16 @@
 {
   "components": [
     {
-      "bom-ref": "pkg:github/mongodb/[email protected].0",
+      "bom-ref": "pkg:github/mongodb/[email protected].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,14 +22,14 @@
         }
       ],
       "name": "mongo-c-driver",
-      "purl": "pkg:github/mongodb/[email protected].0",
+      "purl": "pkg:github/mongodb/[email protected].2",
       "type": "library",
-      "version": "v2.0.0"
+      "version": "v2.0.2"
     }
   ],
   "dependencies": [
     {
-      "ref": "pkg:github/mongodb/[email protected].0"
+      "ref": "pkg:github/mongodb/[email protected].2"
     }
   ],
   "metadata": {

etc/cyclonedx.sbom.json

@@ -1,16 +1,16 @@
 {
   "components": [
     {
-      "bom-ref": "pkg:github/mongodb/[email protected].0",
+      "bom-ref": "pkg:github/mongodb/[email protected].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,14 +22,14 @@
         }
       ],
       "name": "mongo-c-driver",
-      "purl": "pkg:github/mongodb/[email protected].0",
+      "purl": "pkg:github/mongodb/[email protected].2",
       "type": "library",
-      "version": "v2.0.0"
+      "version": "v2.0.2"
     }
   ],
   "dependencies": [
     {
-      "ref": "pkg:github/mongodb/[email protected].0"
+      "ref": "pkg:github/mongodb/[email protected].2"
     }
   ],
   "metadata": {

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',

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/[email protected].0
+pkg:github/mongodb/[email protected].2

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]

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]