Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Client Encryption: Removes retry behavior for point operations during client encryption policy change. #2648

Merged
merged 58 commits into from
Dec 14, 2021
Merged
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
0f15769
Patch retry post policy refresh and refactoring.
kr-santosh Aug 3, 2021
fd69e86
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Aug 4, 2021
33ebde4
Update EncryptionContainer.cs
kr-santosh Aug 4, 2021
6fd6d1c
Update MdeEncryptionTests.cs
kr-santosh Aug 6, 2021
7607b97
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Aug 19, 2021
5196d60
Support policy refresh during delete operation.
kr-santosh Aug 19, 2021
a286881
Merge branch 'users/sakulk/bugfixes2' of https://github.com/Azure/azu…
kr-santosh Aug 19, 2021
d2af66f
Update EncryptionSettings.cs
kr-santosh Aug 24, 2021
92d09d0
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Aug 24, 2021
825c465
Update MdeEncryptionTests.cs
kr-santosh Aug 26, 2021
d25c3ac
Update EncryptionContainer.cs
kr-santosh Sep 3, 2021
afd75dd
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Sep 3, 2021
20c90f0
Update MdeEncryptionTests.cs
kr-santosh Sep 9, 2021
8415cd6
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Sep 9, 2021
0abdd93
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Sep 13, 2021
ce95fc6
Update MdeEncryptionTests.cs
kr-santosh Sep 15, 2021
c179d49
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Sep 22, 2021
b888aa1
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Sep 27, 2021
2f3f906
Update EncryptionContainer.cs
kr-santosh Sep 27, 2021
fcbe1f4
Update EncryptionFeedIterator.cs
kr-santosh Sep 27, 2021
172388b
Removed the retry logic, we not just update the settings and throw ex…
kr-santosh Sep 27, 2021
45193f8
Updated exception message.
kr-santosh Sep 27, 2021
409630e
Update EncryptionTransactionalBatch.cs
kr-santosh Sep 27, 2021
458b0f5
Update MdeEncryptionTests.cs
kr-santosh Sep 27, 2021
f8bc05f
Update MdeEncryptionTests.cs
kr-santosh Sep 27, 2021
2674ba2
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Sep 28, 2021
1bd0c80
Update EncryptionSettingForProperty.cs
kr-santosh Sep 28, 2021
63222a5
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Sep 29, 2021
a1cfd32
Update EncryptionSettingForProperty.cs
kr-santosh Sep 29, 2021
ab8fc10
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Sep 30, 2021
3968bef
Fixes as per review request.
kr-santosh Sep 30, 2021
44b4c3b
Update MdeEncryptionTests.cs
kr-santosh Sep 30, 2021
4cdefa0
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Oct 4, 2021
9d3a8e7
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Oct 18, 2021
260ece5
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Oct 25, 2021
e4ab2ac
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Oct 26, 2021
10417a6
Update MdeEncryptionTests.cs
kr-santosh Oct 26, 2021
89f947b
Update EncryptionContainer.cs
kr-santosh Oct 26, 2021
cf1a4e5
Merge branch 'master' into users/sakulk/bugfixes2
j82w Oct 27, 2021
7271635
Update EncryptionProcessor.cs
kr-santosh Oct 27, 2021
79361af
refactor, static creation of serializers..
kr-santosh Oct 27, 2021
e40d72a
Added change logs to custom pkg, bumped up package version.
kr-santosh Oct 28, 2021
5e73fe5
Update changelog.md
kr-santosh Oct 28, 2021
0e84171
Update changelog.md
kr-santosh Oct 28, 2021
41fc38c
updates.
kr-santosh Oct 28, 2021
6e3cca2
Revert "updates."
kr-santosh Oct 29, 2021
e9cd6db
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Oct 29, 2021
42678f5
Revert "Update changelog.md"
kr-santosh Oct 29, 2021
b4c4c93
Reverting changes w.r.t to custom package.
kr-santosh Oct 29, 2021
1323b6d
Reverting changes w.r.t custom package.
kr-santosh Oct 29, 2021
0397bd9
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Nov 9, 2021
8f01564
Pass diagnostics in exception.
kr-santosh Nov 10, 2021
1993aac
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Dec 7, 2021
5f12290
throw EncryptionCosmosException instead of InvalidOperationException …
kr-santosh Dec 7, 2021
69f6908
Update MdeEncryptionTests.cs
kr-santosh Dec 7, 2021
63f89e2
Merge branch 'master' into users/sakulk/bugfixes2
kr-santosh Dec 14, 2021
9f35ab9
Update EncryptionContainer.cs
kr-santosh Dec 14, 2021
405838b
Merge branch 'users/sakulk/bugfixes2' of https://github.com/Azure/azu…
kr-santosh Dec 14, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update EncryptionContainer.cs
  • Loading branch information
kr-santosh committed Oct 26, 2021
commit 89f947baac6c3209488706b38723322440abfb61
10 changes: 5 additions & 5 deletions Microsoft.Azure.Cosmos.Encryption/src/EncryptionContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ internal async Task<List<PatchOperation>> EncryptPatchOperationsAsync(
/// </summary>
/// <param name="itemRequestOptions"> Original ItemRequestOptions.</param>
/// <returns> ItemRequestOptions.</returns>
private static ItemRequestOptions GetClonedItemRequestOptions(ItemRequestOptions itemRequestOptions)
private static ItemRequestOptions EncryptionContainerGetClonedItemRequestOptions(ItemRequestOptions itemRequestOptions)
{
ItemRequestOptions clonedRequestOptions = itemRequestOptions != null ? (ItemRequestOptions)itemRequestOptions.ShallowCopy() : new ItemRequestOptions();

Expand Down Expand Up @@ -870,7 +870,7 @@ private async Task<ResponseMessage> CreateItemHelperAsync(
cancellationToken);

// Clone the request options since we modify it to set AddRequestHeaders to add additional headers.
ItemRequestOptions clonedRequestOptions = GetClonedItemRequestOptions(requestOptions);
ItemRequestOptions clonedRequestOptions = EncryptionContainerGetClonedItemRequestOptions(requestOptions);

encryptionSettings.SetRequestHeaders(clonedRequestOptions);

Expand Down Expand Up @@ -909,7 +909,7 @@ private async Task<ResponseMessage> ReadItemHelperAsync(
}

// Clone the request options since we modify it to set AddRequestHeaders to add additional headers.
ItemRequestOptions clonedRequestOptions = GetClonedItemRequestOptions(requestOptions);
ItemRequestOptions clonedRequestOptions = EncryptionContainerGetClonedItemRequestOptions(requestOptions);

encryptionSettings.SetRequestHeaders(clonedRequestOptions);

Expand Down Expand Up @@ -965,7 +965,7 @@ private async Task<ResponseMessage> ReplaceItemHelperAsync(
ItemRequestOptions clonedRequestOptions = requestOptions;

// Clone the request options since we modify it to set AddRequestHeaders to add additional headers.
clonedRequestOptions = GetClonedItemRequestOptions(requestOptions);
clonedRequestOptions = EncryptionContainerGetClonedItemRequestOptions(requestOptions);

encryptionSettings.SetRequestHeaders(clonedRequestOptions);

Expand Down Expand Up @@ -1019,7 +1019,7 @@ private async Task<ResponseMessage> UpsertItemHelperAsync(
ItemRequestOptions clonedRequestOptions = requestOptions;

// Clone the request options since we modify it to set AddRequestHeaders to add additional headers.
clonedRequestOptions = GetClonedItemRequestOptions(requestOptions);
clonedRequestOptions = EncryptionContainerGetClonedItemRequestOptions(requestOptions);

encryptionSettings.SetRequestHeaders(clonedRequestOptions);

Expand Down