Skip to content

Commit c86a85f

Browse files
committed
maybe this works?
1 parent dccd96a commit c86a85f

File tree

7 files changed

+59
-114
lines changed

7 files changed

+59
-114
lines changed

pymongo/asynchronous/encryption.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ async def kms_request(self, kms_context: MongoCryptKmsContext) -> None:
165165
166166
:return: None
167167
"""
168+
self.opts._parse_kms_tls_options(_IS_SYNC)
168169
endpoint = kms_context.endpoint
169170
message = kms_context.message
170171
provider = kms_context.kms_provider
@@ -675,8 +676,8 @@ def __init__(
675676
key_vault_namespace,
676677
kms_tls_options=kms_tls_options,
677678
key_expiration_ms=key_expiration_ms,
678-
is_sync=_IS_SYNC,
679679
)
680+
opts._parse_kms_tls_options(_IS_SYNC)
680681
self._io_callbacks: Optional[_EncryptionIO] = _EncryptionIO(
681682
None, key_vault_coll, None, opts
682683
)

pymongo/encryption_options.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ def __init__(
5858
bypass_query_analysis: bool = False,
5959
encrypted_fields_map: Optional[Mapping[str, Any]] = None,
6060
key_expiration_ms: Optional[int] = None,
61-
is_sync: bool = True,
6261
) -> None:
6362
"""Options to configure automatic client-side field level encryption.
6463
@@ -237,10 +236,14 @@ def __init__(
237236
if not any("idleShutdownTimeoutSecs" in s for s in self._mongocryptd_spawn_args):
238237
self._mongocryptd_spawn_args.append("--idleShutdownTimeoutSecs=60")
239238
# Maps KMS provider name to a SSLContext.
240-
self._kms_ssl_contexts = _parse_kms_tls_options(kms_tls_options, is_sync)
239+
self._kms_tls_options = kms_tls_options
240+
# self._kms_ssl_contexts = _parse_kms_tls_options(kms_tls_options, is_sync)
241241
self._bypass_query_analysis = bypass_query_analysis
242242
self._key_expiration_ms = key_expiration_ms
243243

244+
def _parse_kms_tls_options(self, is_sync):
245+
self._kms_ssl_contexts = _parse_kms_tls_options(self._kms_tls_options, is_sync)
246+
244247

245248
class RangeOpts:
246249
"""Options to configure encrypted queries using the range algorithm."""

pymongo/synchronous/encryption.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ def kms_request(self, kms_context: MongoCryptKmsContext) -> None:
164164
165165
:return: None
166166
"""
167+
self.opts._parse_kms_tls_options(_IS_SYNC)
167168
endpoint = kms_context.endpoint
168169
message = kms_context.message
169170
provider = kms_context.kms_provider
@@ -668,8 +669,8 @@ def __init__(
668669
key_vault_namespace,
669670
kms_tls_options=kms_tls_options,
670671
key_expiration_ms=key_expiration_ms,
671-
is_sync=_IS_SYNC,
672672
)
673+
opts._parse_kms_tls_options(_IS_SYNC)
673674
self._io_callbacks: Optional[_EncryptionIO] = _EncryptionIO(
674675
None, key_vault_coll, None, opts
675676
)

test/asynchronous/test_client_bulk_write.py

-1
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,6 @@ async def test_returns_error_if_auto_encryption_configured(self):
545545
opts = AutoEncryptionOpts(
546546
key_vault_namespace="db.coll",
547547
kms_providers={"aws": {"accessKeyId": "foo", "secretAccessKey": "bar"}},
548-
is_sync=_IS_SYNC,
549548
)
550549
client = await self.async_rs_or_single_client(auto_encryption_opts=opts)
551550

0 commit comments

Comments
 (0)