PHPLIB-1702: Always consult server encryptedFieldsMap when dropping collections #1742
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GromNaN
reviewed
Aug 8, 2025
| $client = static::createTestClient(); | ||
|
|
||
| // Ensure the key vault collection is dropped before each test | ||
| $collection = $client->selectCollection('keyvault', 'datakeys', ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)]); |
There was a problem hiding this comment.
You'll get used to the new name of this method.
Suggested change
| $collection = $client->selectCollection('keyvault', 'datakeys', ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)]); | |
| $collection = $client->getCollection('keyvault', 'datakeys', ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)]); |
Why do you need to set the writeConcern, as that doesn't guarantee that all replica are up to date.
| $collection->drop(); | ||
|
|
||
| $this->clientEncryption = $client->createClientEncryption([ | ||
| 'keyVaultNamespace' => 'keyvault.datakeys', |
There was a problem hiding this comment.
To prevent any typo:
Suggested change
| 'keyVaultNamespace' => 'keyvault.datakeys', | |
| 'keyVaultNamespace' => $collection->getNamespace(), |
Otherwise you don't really need the $collection variable.
|
|
||
| // Ensure the key vault collection is dropped before each test | ||
| $collection = $client->selectCollection('keyvault', 'datakeys', ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)]); | ||
| $collection->drop(); |
There was a problem hiding this comment.
You should also drop this collection in tearDown.
| $client = static::createTestClient(); | ||
|
|
||
| // Ensure the key vault collection is dropped before each test | ||
| $collection = $client->selectCollection('keyvault', 'datakeys', ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)]); |
There was a problem hiding this comment.
Suggested change
| $collection = $client->selectCollection('keyvault', 'datakeys', ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)]); | |
| $collection = $client->getCollection('keyvault', 'datakeys', ['writeConcern' => new WriteConcern(WriteConcern::MAJORITY)]); |
| { | ||
| protected ClientEncryption $clientEncryption; | ||
|
|
||
| public function setUp(): void |
There was a problem hiding this comment.
Both test classes has the same setUp method. They should probably be a single test class with 2 test methods.
alcaeus
requested changes
Aug 8, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://jira.mongodb.org/browse/PHPLIB-1702