Skip to content

Commit 370dd18

Browse files
committed
Remove KMS_CREDENTIALS
Also conditionally include `master_key` in call to `create_data_key` if kms_provider != "local".
1 parent ee86799 commit 370dd18

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

django_mongodb_backend/schema.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,8 @@ def _get_encrypted_fields(self, model, key_alt_name=None, path_prefix=None):
500500
)
501501

502502
kms_provider = router.kms_provider(model)
503-
master_key = connection.settings_dict.get("KMS_CREDENTIALS", {}).get(kms_provider)
503+
kms_providers = auto_encryption_opts._kms_providers
504+
master_key = kms_providers.get(kms_provider, {})
504505
client_encryption = self.connection.client_encryption
505506

506507
field_list = []
@@ -525,11 +526,10 @@ def _get_encrypted_fields(self, model, key_alt_name=None, path_prefix=None):
525526
if data_key:
526527
data_key = data_key["_id"]
527528
else:
528-
data_key = client_encryption.create_data_key(
529-
kms_provider=kms_provider,
530-
master_key=master_key,
531-
key_alt_names=[new_key_alt_name],
532-
)
529+
kwargs = {"kms_provider": kms_provider, "key_alt_names": [new_key_alt_name]}
530+
if kms_provider != "local":
531+
kwargs["master_key"] = master_key
532+
data_key = client_encryption.create_data_key(**kwargs)
533533
field_dict = {
534534
"bsonType": bson_type,
535535
"path": path,

0 commit comments

Comments
 (0)