SWIFT-1256 Pull in final changes for libmongoc 1.19 (#661)

Author: kmahar

Sources/CLibMongoC/include/CLibMongoC_bson-version.h

@@ -31,7 +31,7 @@
  *
  * BSON minor version component (e.g. 2 if %BSON_VERSION is 1.2.3)
  */
-#define BSON_MINOR_VERSION (18)
+#define BSON_MINOR_VERSION (19)
 
 
 /**
@@ -54,7 +54,7 @@
  *
  * BSON version.
  */
-#define BSON_VERSION (1.18.0)
+#define BSON_VERSION (1.19.0)
 
 
 /**
@@ -63,7 +63,7 @@
  * BSON version, encoded as a string, useful for printing and
  * concatenation.
  */
-#define BSON_VERSION_S "1.18.0"
+#define BSON_VERSION_S "1.19.0"
 
 
 /**

Sources/CLibMongoC/include/CLibMongoC_mongoc-version.h

@@ -31,7 +31,7 @@
  *
  * MONGOC minor version component (e.g. 2 if %MONGOC_VERSION is 1.2.3)
  */
-#define MONGOC_MINOR_VERSION (18)
+#define MONGOC_MINOR_VERSION (19)
 
 
 /**
@@ -55,7 +55,7 @@
  *
  * MONGOC version.
  */
-#define MONGOC_VERSION (1.18.0)
+#define MONGOC_VERSION (1.19.0)
 
 
 /**
@@ -64,7 +64,7 @@
  * MONGOC version, encoded as a string, useful for printing and
  * concatenation.
  */
-#define MONGOC_VERSION_S "1.18.0"
+#define MONGOC_VERSION_S "1.19.0"
 
 
 /**

Sources/CLibMongoC/mongoc/mongoc-cluster.c

@@ -2321,6 +2321,7 @@ _mongoc_cluster_stream_for_server (mongoc_cluster_t *cluster,
          mongoc_server_stream_cleanup (server_stream);
          mongoc_cluster_disconnect_node (cluster, server_id);
          bson_mutex_unlock (&topology->mutex);
+         _mongoc_bson_init_if_set (reply);
          return NULL;
       }
    }

Sources/CLibMongoC/mongoc/mongoc-cmd.c

@@ -1022,7 +1022,9 @@ mongoc_cmd_parts_assemble (mongoc_cmd_parts_t *parts,
       }
 
       ret = true;
-   } else if (server_type == MONGOC_SERVER_MONGOS) {
+   } else if (server_type == MONGOC_SERVER_MONGOS ||
+              server_stream->topology_type == MONGOC_TOPOLOGY_LOAD_BALANCED) {
+      /* TODO (CDRIVER-4117) remove the check of the topology description type. */
       _mongoc_cmd_parts_assemble_mongos (parts, server_stream);
       ret = true;
    } else {

Sources/CLibMongoC/mongoc/mongoc-server-description-private.h

@@ -200,4 +200,10 @@ bool
 mongoc_server_description_has_service_id (
    const mongoc_server_description_t *description);
 
+/* mongoc_global_mock_service_id is only used for testing. The test runner sets
+ * this to true when testing against a load balanced deployment to mock the
+ * presence of a serviceId field in the "hello" response. The purpose of this is
+ * further described in the Load Balancer test README. */
+extern bool mongoc_global_mock_service_id;
+
 #endif

Sources/CLibMongoC/mongoc/mongoc-server-description.c

@@ -33,6 +33,8 @@ static bson_oid_t kObjectIdZero = {{0}};
 
 const bson_oid_t kZeroServiceId = {{0}};
 
+bool mongoc_global_mock_service_id = false;
+
 static bool
 _match_tag_set (const mongoc_server_description_t *sd,
                 bson_iter_t *tag_set_iter);
@@ -735,6 +737,16 @@ mongoc_server_description_handle_hello (mongoc_server_description_t *sd,
       }
    }
 
+
+   if (mongoc_global_mock_service_id) {
+      bson_iter_t pid_iter;
+
+      if (bson_iter_init_find (&pid_iter, &sd->topology_version, "processId") &&
+          BSON_ITER_HOLDS_OID (&pid_iter)) {
+         bson_oid_copy (bson_iter_oid (&pid_iter), &sd->service_id);
+      }
+   }
+
    if (is_shard) {
       sd->type = MONGOC_SERVER_MONGOS;
    } else if (sd->set_name) {

Sources/CLibMongoC/mongoc/mongoc-uri.c

@@ -1339,7 +1339,6 @@ mongoc_uri_finalize_auth (mongoc_uri_t *uri,
    if (bson_iter_init_find_case (
           &iter, &uri->credentials, MONGOC_URI_AUTHSOURCE)) {
       source = bson_iter_utf8 (&iter, NULL);
-      require_auth = true;
    }
 
    if (mongoc_uri_get_auth_mechanism (uri)) {

Sources/MongoSwift/ConnectionString.swift

@@ -242,38 +242,47 @@ internal class ConnectionString {
 
     /// Sets and validates authentication-related on the underlying `mongoc_uri_t`.
     private func applyAndValidateAuthOptions(_ options: MongoClientOptions?) throws {
-        guard let credential = options?.credential else {
-            return
-        }
+        if let credential = options?.credential {
+            if let username = credential.username {
+                guard mongoc_uri_set_username(self._uri, username) else {
+                    throw self.failedToSet("username", to: username)
+                }
+            }
 
-        if let username = credential.username {
-            guard mongoc_uri_set_username(self._uri, username) else {
-                throw self.failedToSet("username", to: username)
+            if let password = credential.password {
+                guard mongoc_uri_set_password(self._uri, password) else {
+                    throw MongoError.InvalidArgumentError(message: "Failed to set password")
+                }
             }
-        }
 
-        if let password = credential.password {
-            guard mongoc_uri_set_password(self._uri, password) else {
-                throw MongoError.InvalidArgumentError(message: "Failed to set password")
+            if let authSource = credential.source {
+                guard mongoc_uri_set_auth_source(self._uri, authSource) else {
+                    throw self.failedToSet(MONGOC_URI_AUTHSOURCE, to: authSource)
+                }
             }
-        }
 
-        if let authSource = credential.source {
-            guard mongoc_uri_set_auth_source(self._uri, authSource) else {
-                throw self.failedToSet(MONGOC_URI_AUTHSOURCE, to: authSource)
+            if let mechanism = credential.mechanism {
+                guard mongoc_uri_set_auth_mechanism(self._uri, mechanism.name) else {
+                    throw self.failedToSet(MONGOC_URI_AUTHMECHANISM, to: mechanism)
+                }
             }
-        }
 
-        if let mechanism = credential.mechanism {
-            guard mongoc_uri_set_auth_mechanism(self._uri, mechanism.name) else {
-                throw self.failedToSet(MONGOC_URI_AUTHMECHANISM, to: mechanism)
+            try credential.mechanismProperties?.withBSONPointer { mechanismPropertiesPtr in
+                guard mongoc_uri_set_mechanism_properties(self._uri, mechanismPropertiesPtr) else {
+                    let desc = String(describing: credential.mechanismProperties)
+                    throw self.failedToSet(MONGOC_URI_AUTHMECHANISMPROPERTIES, to: desc)
+                }
             }
         }
 
-        try credential.mechanismProperties?.withBSONPointer { mechanismPropertiesPtr in
-            guard mongoc_uri_set_mechanism_properties(self._uri, mechanismPropertiesPtr) else {
-                let desc = String(describing: credential.mechanismProperties)
-                throw self.failedToSet(MONGOC_URI_AUTHMECHANISMPROPERTIES, to: desc)
+        // libmongoc incorrectly permits an empty string as auth source. this logic could be removed once CDRIVER-3517
+        // is complete (Swift work tracked by SWIFT-1298), however we are likely to be using the pure Swift URI parser
+        // by the time that happens anyway.
+        if let authSource = self.authSource {
+            guard !authSource.isEmpty else {
+                throw MongoError.InvalidArgumentError(
+                    message: "\(MONGOC_URI_AUTHSOURCE) cannot be set to an empty string"
+                )
             }
         }
     }

Tests/MongoSwiftTests/AuthTests.swift

@@ -27,12 +27,6 @@ final class AuthTests: MongoSwiftTestCase {
 
         for (_, file) in testFiles {
             for testCase in file.tests {
-                // skipping due to CDRIVER-3517
-                // TODO: SWIFT-1298 unskip this test
-                guard testCase.description != "must raise an error when the authSource is empty" else {
-                    continue
-                }
-
                 guard testCase.valid else {
                     expect(try ConnectionString(testCase.uri))
                         .to(

etc/vendor-libmongoc.sh

@@ -4,7 +4,7 @@ set -eou pipefail
 
 PWD=`pwd`
 LIBMONGOC_MAJOR_VERSION=1
-LIBMONGOC_MINOR_VERSION=18
+LIBMONGOC_MINOR_VERSION=19
 LIBMONGOC_PATCH_VERSION=0
 LIBMONGOC_PRERELEASE_VERSION=