PYTHON-3088 [v3.13] Update load balancer tests to support dedicated load balancer port

.evergreen/config.yml

@@ -291,6 +291,7 @@ functions:
             DISABLE_TEST_COMMANDS=${DISABLE_TEST_COMMANDS} \
             ORCHESTRATION_FILE=${ORCHESTRATION_FILE} \
             REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
+            LOAD_BALANCER=${LOAD_BALANCER} \
             bash ${DRIVERS_TOOLS}/.evergreen/run-orchestration.sh
     # run-orchestration generates expansion file with the MONGODB_URI for the cluster
     - command: expansions.update
@@ -423,6 +424,7 @@ functions:
           fi
           if [ -n "${test_loadbalancer}" ]; then
             export TEST_LOADBALANCER=1
+            export LOAD_BALANCER=1
             export SINGLE_MONGOS_LB_URI="${SINGLE_MONGOS_LB_URI}"
             export MULTI_MONGOS_LB_URI="${MULTI_MONGOS_LB_URI}"
           fi
@@ -1771,7 +1773,10 @@ tasks:
         - func: "bootstrap mongo-orchestration"
           vars:
             TOPOLOGY: "sharded_cluster"
+            LOAD_BALANCER: true
         - func: "run load-balancer"
+          vars:
+            LOAD_BALANCER: true
         - func: "run tests"
 # }}}
     - name: "coverage-report"
@@ -2971,7 +2976,7 @@ buildvariants:
 - matrix_name: "load-balancer"
   matrix_spec:
     platform: awslinux
-    mongodb-version: ["5.0", "latest"]
+    mongodb-version: ["rapid", "latest"]
     auth-ssl: "*"
     python-version: ["2.7", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "pypy", "pypy3.5", "pypy3.7"]
     loadbalancer: "*"

bson/json_util.py

@@ -505,7 +505,7 @@ def object_hook(dct, json_options=DEFAULT_JSON_OPTIONS):
 def _parse_legacy_regex(doc):
     pattern = doc["$regex"]
     # Check if this is the $regex query operator.
-    if isinstance(pattern, Regex):
+    if not isinstance(pattern, (text_type, bytes)):
         return doc
     flags = 0
     # PyMongo always adds $options but some other tools may not.

doc/changelog.rst

@@ -1,6 +1,21 @@
 Changelog
 =========
 
+Changes in Version 3.12.3
+-------------------------
+
+Issues Resolved
+...............
+
+Version 3.12.3 fixes a bug that prevented :meth:`bson.json_util.loads` from
+decoding a document with a non-string "$regex" field (`PYTHON-3028`_).
+
+See the `PyMongo 3.12.3 release notes in JIRA`_ for the list of resolved issues
+in this release.
+
+.. _PYTHON-3028: https://jira.mongodb.org/browse/PYTHON-3028
+.. _PyMongo 3.12.3 release notes in JIRA: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=32505
+
 Changes in Version 3.12.2
 -------------------------
 

doc/examples/uuid.rst

@@ -1,3 +1,4 @@
+
 .. _handling-uuid-data-example:
 
 Handling UUID Data
@@ -12,7 +13,7 @@ to MongoDB and retrieve them as native :class:`uuid.UUID` objects::
   from uuid import uuid4
 
   # use the 'standard' representation for cross-language compatibility.
-  client = MongoClient(uuid_representation=UuidRepresentation.STANDARD)
+  client = MongoClient(uuidRepresentation='standard')
   collection = client.get_database('uuid_db').get_collection('uuid_coll')
 
   # remove all documents from collection

pymongo/__init__.py

@@ -99,7 +99,7 @@
    Deprecated
 """
 
-version_tuple = (3, 12, 2)
+version_tuple = (3, 12, 4, '.dev0')
 
 def get_version_string():
     if isinstance(version_tuple[-1], str):

pymongo/mongo_client.py

@@ -342,9 +342,9 @@ def __init__(
             speed. 9 is best compression. Defaults to -1.
           - `uuidRepresentation`: The BSON representation to use when encoding
             from and decoding to instances of :class:`~uuid.UUID`. Valid
-            values are `pythonLegacy` (the default), `javaLegacy`,
-            `csharpLegacy`, `standard` and `unspecified`. New applications
-            should consider setting this to `standard` for cross language
+            values are the strings: "pythonLegacy" (the default), "javaLegacy",
+            "csharpLegacy", "standard" and "unspecified". New applications
+            should consider setting this to "standard" for cross language
             compatibility. See :ref:`handling-uuid-data-example` for details.
           - `unicode_decode_error_handler`: The error handler to apply when
             a Unicode-related error occurs during BSON decoding that would

pymongo/pool.py

@@ -220,9 +220,6 @@ def _set_keepalive_times(sock):
 # main thread, to avoid the deadlock. See PYTHON-607.
 u'foo'.encode('idna')
 
-# Remove after PYTHON-2712
-_MOCK_SERVICE_ID = False
-
 
 def _raise_connection_failure(address, error, msg_prefix=None):
     """Convert a socket.error to ConnectionFailure and raise it."""
@@ -584,14 +581,7 @@ def _hello(self, cluster_time, topology_version,
         if auth_ctx:
             cmd['speculativeAuthenticate'] = auth_ctx.speculate_command()
 
-        doc = self.command('admin', cmd, publish_events=False,
-                           exhaust_allowed=awaitable)
-        # PYTHON-2712 will remove this topologyVersion fallback logic.
-        if self.opts.load_balanced and _MOCK_SERVICE_ID:
-            process_id = doc.get('topologyVersion', {}).get('processId')
-            doc.setdefault('serviceId', process_id)
-        if not self.opts.load_balanced:
-            doc.pop('serviceId', None)
+        doc = self.command("admin", cmd, publish_events=False, exhaust_allowed=awaitable)
         hello = IsMaster(doc, awaitable=awaitable)
         self.is_writable = hello.is_writable
         self.max_wire_version = hello.max_wire_version
@@ -629,9 +619,6 @@ def _next_reply(self):
         unpacked_docs = reply.unpack_response()
         response_doc = unpacked_docs[0]
         helpers._check_command_response(response_doc, self.max_wire_version)
-        # Remove after PYTHON-2712.
-        if not self.opts.load_balanced:
-            response_doc.pop('serviceId', None)
         return response_doc
 
     def command(self, dbname, spec, secondary_ok=False,

setup.py

@@ -43,7 +43,7 @@
     except ImportError:
         _HAVE_SPHINX = False
 
-version = "3.12.2"
+version = "3.12.4.dev0"
 
 f = open("README.rst")
 try:

test/__init__.py

@@ -99,13 +99,10 @@
 SINGLE_MONGOS_LB_URI = os.environ.get("SINGLE_MONGOS_LB_URI")
 MULTI_MONGOS_LB_URI = os.environ.get("MULTI_MONGOS_LB_URI")
 if TEST_LOADBALANCER:
-    # Remove after PYTHON-2712
-    from pymongo import pool
-    pool._MOCK_SERVICE_ID = True
-    res = parse_uri(SINGLE_MONGOS_LB_URI)
-    host, port = res['nodelist'][0]
-    db_user = res['username'] or db_user
-    db_pwd = res['password'] or db_pwd
+    res = parse_uri(SINGLE_MONGOS_LB_URI or "")
+    host, port = res["nodelist"][0]
+    db_user = res["username"] or db_user
+    db_pwd = res["password"] or db_pwd
 elif TEST_SERVERLESS:
     TEST_LOADBALANCER = True
     res = parse_uri(SINGLE_MONGOS_LB_URI)

test/test_json_util.py

@@ -262,6 +262,15 @@ def test_regex(self):
             '{"$regex": ".*", "$options": "mx"}',
             json_util.dumps(re.compile(b'.*', re.M | re.X)))
 
+    def test_regex_validation(self):
+        non_str_types = [10, {}, []]
+        docs = [{"$regex": i} for i in non_str_types]
+        for doc in docs:
+            self.assertEqual(doc, json_util.loads(json.dumps(doc)))
+
+        doc = {"$regex": ""}
+        self.assertIsInstance(json_util.loads(json.dumps(doc)), Regex)
+
     def test_minkey(self):
         self.round_trip({"m": MinKey()})