Skip to content

Commit e81397e

Browse files
kirankumarkollikirankumarkolli
authored
Merge branch 'master' into users/hdornadula/bulk_prepwork
2 parents e28dc15 + 900a076 commit e81397e

File tree

82 files changed

+3791
-136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+3791
-136
lines changed

‎Directory.Build.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<ClientOfficialVersion>3.43.1</ClientOfficialVersion>
4-
<ClientPreviewVersion>3.44.0</ClientPreviewVersion>
5-
<ClientPreviewSuffixVersion>preview.1</ClientPreviewSuffixVersion>
3+
<ClientOfficialVersion>3.44.0</ClientOfficialVersion>
4+
<ClientPreviewVersion>3.45.0</ClientPreviewVersion>
5+
<ClientPreviewSuffixVersion>preview.0</ClientPreviewSuffixVersion>
66
<DirectVersion>3.36.1</DirectVersion>
77
<EncryptionOfficialVersion>2.0.4</EncryptionOfficialVersion>
88
<EncryptionPreviewVersion>2.1.0</EncryptionPreviewVersion>

‎Microsoft.Azure.Cosmos.Encryption.Custom/src/AeadAes256CbcHmac256Algorithm.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ public override byte[] EncryptData(byte[] plainText)
156156
/// cell_tag = HMAC_SHA-2-256(mac_key, versionbyte + cell_iv + cell_ciphertext + versionbyte_length)
157157
/// cell_blob = versionbyte + cell_tag + cell_iv + cell_ciphertext
158158
/// </summary>
159-
/// <param name="plainText">Plaintext data to be encrypted</param>
160159
/// <returns>Returns the ciphertext corresponding to the plaintext.</returns>
161160
public override int EncryptData(byte[] plainText, int plainTextOffset, int plainTextLength, byte[] output, int outputOffset)
162161
{

‎Microsoft.Azure.Cosmos.Encryption.Custom/src/Common/CosmosDiagnosticsContext.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Microsoft.Azure.Cosmos.Encryption.Custom
77
using System;
88

99
/// <summary>
10-
/// This is an empty implementation of CosmosDiagnosticsContext which has been plumbed through the DataEncryptionKeyProvider & EncryptionContainer.
10+
/// This is an empty implementation of CosmosDiagnosticsContext which has been plumbed through the DataEncryptionKeyProvider and EncryptionContainer.
1111
/// This may help adding diagnostics more easily in future.
1212
/// </summary>
1313
internal class CosmosDiagnosticsContext

‎Microsoft.Azure.Cosmos.Encryption.Custom/src/Common/EncryptionTransactionalBatchOperationResult{T}.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ namespace Microsoft.Azure.Cosmos.Encryption.Custom
77
internal sealed class EncryptionTransactionalBatchOperationResult<T> : TransactionalBatchOperationResult<T>
88
{
99
/// <summary>
10-
/// Initializes a new instance of the <see cref="TransactionalBatchOperationResult{T}"/> class.
10+
/// Initializes a new instance of the <see cref="EncryptionTransactionalBatchOperationResult{T}"/> class.
1111
/// </summary>
12-
/// <param name="result">BatchOperationResult with stream resource.</param>
1312
/// <param name="resource">Deserialized resource.</param>
1413
internal EncryptionTransactionalBatchOperationResult(T resource)
1514
{

‎Microsoft.Azure.Cosmos.Encryption.Custom/src/DataEncryptionKeyContainer.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44

55
namespace Microsoft.Azure.Cosmos.Encryption.Custom
66
{
7+
using System;
78
using System.Threading;
89
using System.Threading.Tasks;
10+
using Microsoft.Azure.Cosmos.Fluent;
911

1012
/// <summary>
1113
/// Container for data encryption keys. Provides methods to create, re-wrap, read and enumerate data encryption keys.
@@ -132,7 +134,7 @@ public abstract Task<ItemResponse<DataEncryptionKeyProperties>> RewrapDataEncryp
132134
/// </code>
133135
/// </example>
134136
/// <remarks>
135-
/// <see cref="DataEncryptionKey.ReadDataEncryptionKeyAsync" /> is recommended for single data encryption key look-up.
137+
/// <see cref="DataEncryptionKeyContainer.ReadDataEncryptionKeyAsync" /> is recommended for single data encryption key look-up.
136138
/// </remarks>
137139
public abstract FeedIterator<T> GetDataEncryptionKeyQueryIterator<T>(
138140
string queryText = null,
@@ -167,7 +169,7 @@ public abstract FeedIterator<T> GetDataEncryptionKeyQueryIterator<T>(
167169
/// </code>
168170
/// </example>
169171
/// <remarks>
170-
/// <see cref="DataEncryptionKey.ReadDataEncryptionKeyAsync" /> is recommended for single data encryption key look-up.
172+
/// <see cref="DataEncryptionKeyContainer.ReadDataEncryptionKeyAsync" /> is recommended for single data encryption key look-up.
171173
/// </remarks>
172174
public abstract FeedIterator<T> GetDataEncryptionKeyQueryIterator<T>(
173175
QueryDefinition queryDefinition,

‎Microsoft.Azure.Cosmos.Encryption.Custom/src/EncryptableItem.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Microsoft.Azure.Cosmos.Encryption.Custom
88
using Newtonsoft.Json.Linq;
99

1010
/// <summary>
11-
/// Input type should implement this abstract class for lazy decryption & to retrieve the details in the write path.
11+
/// Input type should implement this abstract class for lazy decryption and to retrieve the details in the write path.
1212
/// </summary>
1313
public abstract class EncryptableItem
1414
{

‎Microsoft.Azure.Cosmos.Encryption.Custom/src/EncryptionContainer.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,6 +1041,7 @@ public override Task<bool> IsFeedRangePartOfAsync(
10411041
cancellationToken);
10421042
}
10431043
#endif
1044+
10441045
private async Task<ResponseMessage> ReadManyItemsHelperAsync(
10451046
IReadOnlyList<(string id, PartitionKey partitionKey)> items,
10461047
ReadManyRequestOptions readManyRequestOptions = null,

‎Microsoft.Azure.Cosmos.Encryption.Custom/src/MdeServices/MdeEncryptionAlgorithm.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace Microsoft.Azure.Cosmos.Encryption.Custom
88
using Microsoft.Data.Encryption.Cryptography;
99

1010
/// <summary>
11-
/// Encryption Algorithm provided by MDE Encryption Package
11+
/// Encryption Algorithm provided by MDE Encryption Package.
1212
/// </summary>
1313
internal sealed class MdeEncryptionAlgorithm : DataEncryptionKey
1414
{
@@ -27,9 +27,6 @@ internal sealed class MdeEncryptionAlgorithm : DataEncryptionKey
2727
/// <see href="http://tools.ietf.org/html/draft-mcgrew-aead-aes-cbc-hmac-sha2-05">here</see> .
2828
/// More specifically this implements AEAD_AES_256_CBC_HMAC_SHA256 algorithm.
2929
/// </summary>
30-
/// <param name="dekProperties"> Data Encryption Key properties</param>
31-
/// <param name="encryptionType"> Encryption type </param>
32-
/// <param name="encryptionKeyStoreProvider"> EncryptionKeyStoreProvider for wrapping and unwrapping </param>
3330
public MdeEncryptionAlgorithm(
3431
DataEncryptionKeyProperties dekProperties,
3532
Data.Encryption.Cryptography.EncryptionType encryptionType,
@@ -92,8 +89,6 @@ public MdeEncryptionAlgorithm(
9289
/// <see href="http://tools.ietf.org/html/draft-mcgrew-aead-aes-cbc-hmac-sha2-05">here</see> .
9390
/// More specifically this implements AEAD_AES_256_CBC_HMAC_SHA256 algorithm.
9491
/// </summary>
95-
/// <param name="dataEncryptionKey"> Data Encryption Key </param>
96-
/// <param name="encryptionType"> Encryption type </param>
9792
public MdeEncryptionAlgorithm(
9893
byte[] rawkey,
9994
Data.Encryption.Cryptography.DataEncryptionKey dataEncryptionKey,

‎Microsoft.Azure.Cosmos.Encryption.Custom/src/MemoryTextReader.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Microsoft.Azure.Cosmos.Encryption.Custom
99
using System.IO;
1010

1111
/// <summary>
12-
/// Adjusted implementation of .Net StringReader reading from a Memory<char> instead of a string.
12+
/// Adjusted implementation of .Net StringReader reading from a Memory{char} instead of a string.
1313
/// </summary>
1414
internal class MemoryTextReader : TextReader
1515
{

‎Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<PackageLicenseUrl>https://aka.ms/netcoregaeula</PackageLicenseUrl>
1717
<PackageProjectUrl>https://github.com/Azure/azure-cosmos-dotnet-v3</PackageProjectUrl>
1818
<PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
19+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
20+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1921
<PackageTags>microsoft;azure;cosmos;cosmosdb;documentdb;docdb;nosql;azureofficial;dotnetcore;netcore;netstandard;client;encryption;byok</PackageTags>
2022
</PropertyGroup>
2123
<ItemGroup>
@@ -38,6 +40,7 @@
3840
<PackageReference Include="Azure.Core" Version="1.38.0" />
3941
<PackageReference Include="Azure.Identity" Version="1.11.4" />
4042
<PackageReference Include="Microsoft.Data.Encryption.Cryptography" Version="2.0.0-pre007" />
43+
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
4144
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
4245
</ItemGroup>
4346

0 commit comments

Comments
 (0)