Skip to content

Conversation

@ShaneHarvey
Copy link
Member

@ShaneHarvey ShaneHarvey commented Jun 3, 2022

@ShaneHarvey ShaneHarvey marked this pull request as ready for review June 3, 2022 17:19

# TODO: Test with 'pip install pymongocrypt'
git clone --branch master https://github.com/mongodb/libmongocrypt.git libmongocrypt_git
git clone --branch PYTHON-3285 https://github.com/ShaneHarvey/libmongocrypt.git libmongocrypt_git
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be removed once mongodb/libmongocrypt#358 is merged.

kms_tls_options: Optional[Mapping[str, Any]] = None,
crypt_shared_lib_path: Optional[str] = None,
crypt_shared_lib_required: bool = False,
bypass_query_analysis: bool = False,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will conflict with Julius' auto encryption PR but it was required for the tests.

SPEC_PATH = os.path.join(BASE, "spec")

OPTS = CodecOptions(uuid_representation=STANDARD)
OPTS = CodecOptions()
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uuid_representation=STANDARD is no longer needed now that we decode uuid's to Binary by default.

with self.assertRaisesRegex(EncryptionError, "IP address mismatch|wronghost"):
with self.assertRaisesRegex(
EncryptionError, "IP address mismatch|wronghost|IPAddressMismatch"
):
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IPAddressMismatch is included in the error when pyopenssl is installed.

Copy link
Member

@blink1073 blink1073 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!


class TestEncryptedBulkWrite(BulkTestBase, EncryptionIntegrationTest):
def test_upsert_uuid_standard_encrypte(self):
def test_upsert_uuid_standard_encrypt(self):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haha nice catch

@ShaneHarvey ShaneHarvey merged commit 154d878 into mongodb:master Jun 3, 2022
@ShaneHarvey ShaneHarvey deleted the PYTHON-3245 branch June 3, 2022 20:14
juliusgeo pushed a commit to juliusgeo/mongo-python-driver that referenced this pull request Jun 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants