Remove get_client_encryption

Author: aclark4life

django_mongodb_backend/encryption.py

@@ -1,10 +1,6 @@
 # Queryable Encryption helpers
 import os
 
-from bson.binary import STANDARD
-from bson.codec_options import CodecOptions
-from pymongo.encryption import ClientEncryption
-
 KEY_VAULT_COLLECTION_NAME = "__keyVault"
 KEY_VAULT_DATABASE_NAME = "keyvault"
 KEY_VAULT_NAMESPACE = f"{KEY_VAULT_DATABASE_NAME}.{KEY_VAULT_COLLECTION_NAME}"
@@ -108,12 +104,3 @@ def range(cls, *, sparsity=None, precision=None, trimFactor=None):
         if trimFactor is not None:
             query["trimFactor"] = trimFactor
         return query
-
-
-def get_client_encryption(client, key_vault_namespace=None, kms_providers=None):
-    """
-    Return a `ClientEncryption` instance for use with Queryable Encryption.
-    """
-
-    codec_options = CodecOptions(uuid_representation=STANDARD)
-    return ClientEncryption(kms_providers, key_vault_namespace, client, codec_options)

django_mongodb_backend/schema.py

@@ -2,9 +2,9 @@
 from django.db import router
 from django.db.backends.base.schema import BaseDatabaseSchemaEditor
 from django.db.models import Index, UniqueConstraint
+from pymongo.encryption import ClientEncryption, CodecOptions
 from pymongo.operations import SearchIndexModel
 
-from .encryption import get_client_encryption
 from .fields import EmbeddedModelField
 from .indexes import SearchIndex
 from .query import wrap_database_errors
@@ -435,12 +435,8 @@ def _create_collection(self, model):
 
             key_vault_namespace = options._key_vault_namespace
             kms_providers = options._kms_providers
-
-            ce = get_client_encryption(
-                client,
-                key_vault_namespace=key_vault_namespace,
-                kms_providers=kms_providers,
-            )
+            codec_options = CodecOptions()
+            ce = ClientEncryption(kms_providers, key_vault_namespace, client, codec_options)
             table = model._meta.db_table
             fields = {"fields": self._get_encrypted_fields_map(model)}
             provider = router.kms_provider(model)