Skip to content

[Client Encryption]: Adds support for latest Cosmos Package. #4546

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.

Sign up for GitHub

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

Merged
merged 10 commits into from
Jun 20, 2024
Merged

[Client Encryption]: Adds support for latest Cosmos Package. #4546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4f99383
support latest cosmos package
kr-santosh Jun 12, 2024
9cb196d
Update changelog.md
kr-santosh Jun 12, 2024
49bebd2
Update Microsoft.Azure.Cosmos.Encryption.Custom.csproj
kr-santosh Jun 12, 2024
dffbe59
Update EncryptionContainer.cs
kr-santosh Jun 12, 2024
231b826
Update EncryptionContainer.cs
kr-santosh Jun 12, 2024
d4b9272
Fixes to accommodate binary encoding issue.
kr-santosh Jun 13, 2024
4b6abf3
Fixes to accommodate binary encoding issue.
kr-santosh Jun 13, 2024
dd37661
Fixes to accommodate binary encoding issue.
kr-santosh Jun 13, 2024
b513901
Merge branch 'master' into users/sakulk/fixTeamsIssues
ealsur Jun 18, 2024
283b6a6
Merge branch 'master' into users/sakulk/fixTeamsIssues
ealsur Jun 20, 2024
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
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<EncryptionOfficialVersion>2.0.4</EncryptionOfficialVersion>
<EncryptionPreviewVersion>2.1.0</EncryptionPreviewVersion>
<EncryptionPreviewSuffixVersion>preview4</EncryptionPreviewSuffixVersion>
<CustomEncryptionVersion>1.0.0-preview06</CustomEncryptionVersion>
<CustomEncryptionVersion>1.0.0-preview07</CustomEncryptionVersion>
<HybridRowVersion>1.1.0-preview3</HybridRowVersion>
<LangVersion>10.0</LangVersion>
<AboveDirBuildProps>$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))</AboveDirBuildProps>
Expand Down
5 changes: 5 additions & 0 deletions Microsoft.Azure.Cosmos.Encryption.Custom/changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ Preview features are treated as a separate branch and will not be included in th
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

### <a name="1.0.0-preview07"/> [1.0.0-preview07](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption.Custom/1.0.0-preview07) - 2024-06-12

#### Fixes
- [#4546](https://github.com/Azure/azure-cosmos-dotnet-v3/pull/4546) Updates package reference Microsoft.Azure.Cosmos to version 3.41.0-preview and 3.40.0 for preview and stable version support.

### <a name="1.0.0-preview06"/> [1.0.0-preview06](https://www.nuget.org/packages/Microsoft.Azure.Cosmos.Encryption.Custom/1.0.0-preview06) - 2023-06-28

#### Fixes
Expand Down
6 changes: 1 addition & 5 deletions Microsoft.Azure.Cosmos.Encryption.Custom/src/EncryptionContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,12 +1020,8 @@ public override Task<ResponseMessage> DeleteAllItemsByPartitionKeyStreamAsync(
requestOptions,
cancellationToken);
}
#endif

#if SDKPROJECTREF
public override ChangeFeedProcessorBuilder GetChangeFeedProcessorBuilderWithAllVersionsAndDeletes<T>(
string processorName,
ChangeFeedHandler<ChangeFeedItem<T>> onChangesDelegate)
public override ChangeFeedProcessorBuilder GetChangeFeedProcessorBuilderWithAllVersionsAndDeletes<T>(string processorName, ChangeFeedHandler<ChangeFeedItem<T>> onChangesDelegate)
{
return this.container.GetChangeFeedProcessorBuilderWithAllVersionsAndDeletes(
processorName,
Expand Down
6 changes: 3 additions & 3 deletions Microsoft.Azure.Cosmos.Encryption.Custom/src/Microsoft.Azure.Cosmos.Encryption.Custom.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
</ItemGroup>

<ItemGroup Condition=" '$(SdkProjectRef)' != 'True' AND '$(IsPreview)' != 'True' ">
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.32.3" />
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.40.0" />
</ItemGroup>

<ItemGroup Condition=" '$(SdkProjectRef)' != 'True' AND '$(IsPreview)' == 'True' ">
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.35.1-preview" />
<PackageReference Include="Microsoft.Azure.Cosmos" Version="3.41.0-preview.0" />
</ItemGroup>

<ItemGroup Condition=" '$(SdkProjectRef)' == 'True' ">
Expand All @@ -36,7 +36,7 @@

<ItemGroup>
<PackageReference Include="Azure.Core" Version="1.38.0" />
<PackageReference Include="Azure.Identity" Version="1.11.0" />
<PackageReference Include="Azure.Identity" Version="1.11.4" />
<PackageReference Include="Microsoft.Data.Encryption.Cryptography" Version="0.2.0-pre" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
</ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions Microsoft.Azure.Cosmos.Encryption.Custom/tests/EmulatorTests/LegacyEncryptionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,11 +308,14 @@ public async Task EncryptionCreateItem()

TestDoc expectedDoc = new TestDoc(testDoc);

#if SDKPROJECTREF
// FIXME Remove the above once the binary encoding issue is fixed.
// Read feed (null query)
await LegacyEncryptionTests.ValidateQueryResultsAsync(
LegacyEncryptionTests.encryptionContainer,
query: null,
expectedDoc);
#endif

await LegacyEncryptionTests.ValidateQueryResultsAsync(
LegacyEncryptionTests.encryptionContainer,
Expand Down
12 changes: 9 additions & 3 deletions Microsoft.Azure.Cosmos.Encryption.Custom/tests/EmulatorTests/MdeCustomEncryptionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,11 +441,14 @@ public async Task EncryptionCreateItem()

TestDoc expectedDoc = new TestDoc(testDoc);

#if SDKPROJECTREF
// FIXME Remove the above once the binary encoding issue is fixed.
// Read feed (null query)
await MdeCustomEncryptionTests.ValidateQueryResultsAsync(
MdeCustomEncryptionTests.encryptionContainer,
query: null,
expectedDoc);
#endif

await MdeCustomEncryptionTests.ValidateQueryResultsAsync(
MdeCustomEncryptionTests.encryptionContainer,
Expand Down Expand Up @@ -2263,7 +2266,7 @@ public override async Task<byte[]> EncryptAsync(


#region Legacy
#pragma warning disable CS0618 // Type or member is obsolete
#pragma warning disable CS0618 // Type or member is obsolete
[TestMethod]
public async Task EncryptionCreateDekWithDualDekProvider()
{
Expand Down Expand Up @@ -2477,12 +2480,15 @@ public async Task ReadLegacyEncryptedDataWithMdeProcessor()

TestDoc expectedDoc = new TestDoc(testDoc);

#if SDKPROJECTREF
// FIXME Remove the above once the binary encoding issue is fixed.
// Read feed (null query)
await MdeCustomEncryptionTests.ValidateQueryResultsAsync(
MdeCustomEncryptionTests.encryptionContainer,
query: null,
expectedDoc,
legacyAlgo: true);
#endif

await MdeCustomEncryptionTests.ValidateQueryResultsAsync(
MdeCustomEncryptionTests.encryptionContainer,
Expand Down Expand Up @@ -2651,7 +2657,7 @@ public override Task<EncryptionKeyWrapResult> WrapKeyAsync(byte[] key, Encryptio
}
}

#pragma warning restore CS0618 // Type or member is obsolete
#endregion
#pragma warning restore CS0618 // Type or member is obsolete
#endregion
}
}
2 changes: 1 addition & 1 deletion ...ption.Custom/tests/Microsoft.Azure.Cosmos.Encryption.Custom.Tests/CosmosEncryptorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ await CosmosEncryptorTests.cosmosEncryptor.EncryptAsync(
}
catch (InvalidOperationException ex)
{
Assert.AreEqual("Null DataEncryptionKey returned from FetchDataEncryptionKeyAsync.", ex.Message);
Assert.AreEqual("Null DataEncryptionKey returned from FetchDataEncryptionKeyWithoutRawKeyAsync.", ex.Message);
}
}

Expand Down