pymongo4 updates

Author: cognifloyd

st2auth_mongodb_backend/mongodb.py

@@ -42,7 +42,7 @@ class MongoDBAuthenticationBackend(object):
 
     _collection_name = 'users'
     _indexes = [
-        ('username', pymongo.ASCENDING)
+        pymongo.IndexModel([('username', pymongo.ASCENDING)], unique=True)
     ]
     _hash_function = hashlib.sha256
 
@@ -53,12 +53,17 @@ def __init__(self, db_host='localhost', db_port=27017, db_name='st2auth', db_use
         self._db_port = db_port
         self._db_username = db_username
         self._db_password = db_password
+        self._db_indexes_created = False
 
-        self._client = MongoClient(host=self._db_host, port=self._db_port, tz_aware=True)
-        self._db = self._client[db_name]
-
+        kwargs = {}
         if self._db_username:
-            self._db.authenticate(name=self._db_username, password=self._db_password)
+            kwargs["username"] = self._db_username
+            kwargs["password"] = self._db_password
+
+        self._client = MongoClient(
+            host=self._db_host, port=self._db_port, tz_aware=True, **kwargs
+        )
+        self._db = self._client[db_name]
 
         self._collection = self._db[self._collection_name]
         self._ensure_indexes()
@@ -87,4 +92,7 @@ def get_user(self, username):
         pass
 
     def _ensure_indexes(self):
-        self._collection.ensure_index(self._indexes, unique=True)
+        if self._db_indexes_created:
+            return
+        self._collection.create_indexes(self._indexes)
+        self._db_indexes_created = True

tests/unit/test_mongodb_backend.py

@@ -34,15 +34,14 @@ def setUp(self):
         self._backend = MongoDBAuthenticationBackend(db_name='st2authtest')
 
         # Clear database
-        self._backend._collection.remove()
+        self._backend._collection.delete_many({})
 
         # Add fixtures
-        for fixture in self.fixtures:
-            self._backend._collection.insert(fixture)
+        self._backend._collection.insert_many(self.fixtures)
 
     def tearDown(self):
         # Clear database
-        self._backend._collection.remove()
+        self._backend._collection.delete_many({})
 
     def test_authenticate(self):
         # Inexistent user