Add RetryingClientEncryption and use it in one prose test #1365
Conversation
This file contains 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
The intention is to reduce CI flakiness by retrying ClientEncryption operations that are known to fail occasionally in CI due to transient KMS errors.
jyemin
commented
Apr 11, 2024
| } | ||
|
|
||
| @Override | ||
| public ClientEncryption getClientEncryption(final ClientEncryptionSettings settings) { |
There was a problem hiding this comment.
This is actually a bug in the test, as this should be creating a reactive ClientEncryption and wrapping it in a SyncClientEncryption.
|
|
||
| public class ClientEncryptionRewrapManyDataKeyProseTest extends AbstractClientEncryptionRewrapManyDataKeyProseTest { | ||
|
|
||
| @Override | ||
| protected MongoClient createMongoClient(final MongoClientSettings settings) { |
There was a problem hiding this comment.
Never actually used, so removed it.
| @AfterEach | ||
| void cleanUp(){ | ||
| getMongoClient().getDatabase("keyvault").getCollection("datakeys").drop(); |
There was a problem hiding this comment.
No need to drop on cleanup, since we drop on setup.
| } | ||
|
|
||
| @Test | ||
| public void shouldThrowClientErrorWhenProviderIsNotSpecified() { | ||
| //given | ||
| ClientEncryption clientEncryption = getClientEncryption(ClientEncryptionSettings.builder() |
There was a problem hiding this comment.
Now created in setup. But we don't want to wrap with RetryingClientEncryption because we are actually testing that the operation throws an exception.
| BsonDocument srcKey = MASTER_KEYS_BY_PROVIDER.get(srcProvider); | ||
| BsonDocument dstKey = MASTER_KEYS_BY_PROVIDER.get(dstProvider); | ||
| BsonString testString = new BsonString("test"); | ||
|
|
||
| getMongoClient().getDatabase("keyvault").getCollection("datakeys").drop(); |
| testString, | ||
| new EncryptOptions("AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic").keyId(keyId)); | ||
|
|
||
| ClientEncryption clientEncryption2 = getClientEncryption(ClientEncryptionSettings.builder() |
There was a problem hiding this comment.
These two ClientEncryption instances are identical. Is there any actual need to have two of them?
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.
The intention is to reduce CI flakiness by retrying ClientEncryption operations that are known to fail occasionally in CI due to transient KMS errors.