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.

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

Client Encryption: Adds release version of Microsoft.Azure.Cosmos to Microsoft.Azure.Cosmos.Encryption.Custom #3799

Merged
8 commits merged into from
Apr 27, 2023
Merged

Client Encryption: Adds release version of Microsoft.Azure.Cosmos to Microsoft.Azure.Cosmos.Encryption.Custom #3799

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
75bb08f
cosmos version change
vipulvishal-ms Apr 3, 2023
e5d6aa8
changing preview to release
vipulvishal-ms Apr 13, 2023
6e494ff
Merge branch 'master' of https://github.com/Azure/azure-cosmos-dotnet…
vipulvishal-ms Apr 13, 2023
0af8184
Merge branch 'master' of https://github.com/Azure/azure-cosmos-dotnet…
vipulvishal-ms Apr 18, 2023
89e7fbf
resolving code review comments
vipulvishal-ms Apr 18, 2023
aba0fff
Merge branch 'master' into users/vipulvishal/previewrelease
vipulvishal-ms Apr 19, 2023
ff1b729
Merge branch 'master' into users/vipulvishal/previewrelease
vipulvishal-ms Apr 26, 2023
e500412
Merge branch 'master' into users/vipulvishal/previewrelease
kr-santosh Apr 27, 2023
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
16 changes: 9 additions & 7 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 @@ -791,13 +791,6 @@ public override Task<IReadOnlyList<FeedRange>> GetFeedRangesAsync(
return this.container.GetFeedRangesAsync(cancellationToken);
}

public override Task<IEnumerable<string>> GetPartitionKeyRangesAsync(
FeedRange feedRange,
CancellationToken cancellationToken = default)
{
return this.container.GetPartitionKeyRangesAsync(feedRange, cancellationToken);
}

public override FeedIterator GetItemQueryStreamIterator(
FeedRange feedRange,
QueryDefinition queryDefinition,
Expand Down Expand Up @@ -1010,6 +1003,14 @@ public override async Task<FeedResponse<T>> ReadManyItemsAsync<T>(
return this.ResponseFactory.CreateItemFeedResponse<T>(responseMessage);
}

#if ENCRYPTIONPREVIEW
public override Task<IEnumerable<string>> GetPartitionKeyRangesAsync(
FeedRange feedRange,
CancellationToken cancellationToken = default)
{
return this.container.GetPartitionKeyRangesAsync(feedRange, cancellationToken);
}

public override Task<ResponseMessage> DeleteAllItemsByPartitionKeyStreamAsync(
Cosmos.PartitionKey partitionKey,
RequestOptions requestOptions = null,
Expand All @@ -1020,6 +1021,7 @@ public override Task<ResponseMessage> DeleteAllItemsByPartitionKeyStreamAsync(
requestOptions,
cancellationToken);
}
#endif

private async Task<ResponseMessage> ReadManyItemsHelperAsync(
IReadOnlyList<(string id, PartitionKey partitionKey)> items,
Expand Down
10 changes: 7 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 @@ -4,7 +4,7 @@
<AssemblyName>Microsoft.Azure.Cosmos.Encryption.Custom</AssemblyName>
<RootNamespace>Microsoft.Azure.Cosmos.Encryption.Custom</RootNamespace>
<LangVersion>$(LangVersion)</LangVersion>
<IsPreview>true</IsPreview>
<IsPreview>false</IsPreview>

<CurrentDate>$([System.DateTime]::Now.ToString(yyyyMMdd))</CurrentDate>
<Version>$(CustomEncryptionVersion)</Version>
Expand All @@ -24,8 +24,12 @@
<AdditionalFiles Include="..\..\Microsoft.Azure.Cosmos\src\stylecop.json" Link="stylecop.json" />
</ItemGroup>

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

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

<ItemGroup Condition=" '$(SdkProjectRef)' == 'True' ">
Expand Down