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

Jump to bottom

Port clientside encryption to mono-dll #12183

Merged
merged 22 commits into from
Jun 8, 2020
Merged

Port clientside encryption to mono-dll #12183

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8e20e5b
Port clientside encryption to mono-dll
jaschrep-msft May 18, 2020
2df8a86
Removed crypto package from ci.yml
jaschrep-msft May 19, 2020
7906d8e
regenerate/export-api
jaschrep-msft May 19, 2020
4d71759
Ported clientside encryption for queues
jaschrep-msft May 19, 2020
5219aa5
Queues handles partial decryption errors.
jaschrep-msft May 20, 2020
295f1e8
Removed nonexistent project from sln
jaschrep-msft May 20, 2020
df0ccc9
Change in handling key resolution
jaschrep-msft May 21, 2020
cada706
Many PR comments addressed; key-substitution added
jaschrep-msft May 28, 2020
801fb3b
Refactors; Mocking some tests
jaschrep-msft May 29, 2020
69be140
Refactors and bug fixes
jaschrep-msft Jun 2, 2020
e0ae520
Export-API
jaschrep-msft Jun 2, 2020
1633ce0
Constant/error/assertion refactors
jaschrep-msft Jun 2, 2020
e32eaa6
Refactors
jaschrep-msft Jun 2, 2020
55ab4cc
Revert deletion of an api.cs file
jaschrep-msft Jun 2, 2020
9b8b321
Minor Crypto API Adjustments
jaschrep-msft Jun 4, 2020
5d2220d
Export API
jaschrep-msft Jun 4, 2020
b506071
Queue listener changed to events.
jaschrep-msft Jun 5, 2020
77c38c3
Export api
jaschrep-msft Jun 5, 2020
b3f5bc0
Testing for update message encryption
jaschrep-msft Jun 5, 2020
46eeb8b
Minor event API adjustments
jaschrep-msft Jun 5, 2020
7d3ce1b
export api
jaschrep-msft Jun 5, 2020
a04f168
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-net i…
jaschrep-msft Jun 5, 2020
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
1 change: 1 addition & 0 deletions eng/Packages.Data.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<PackageReference Update="Microsoft.Azure.Search" Version="10.1.0" />
<PackageReference Update="Microsoft.Azure.Services.AppAuthentication" Version="[1.0.3, 2.0.0)" />
<PackageReference Update="Microsoft.Azure.Storage.Blob" Version="11.0.0" />
<PackageReference Update="Microsoft.Azure.Storage.Queue" Version="11.0.0" />
<PackageReference Update="Microsoft.Azure.Test.HttpRecorder" Version="[1.13.3, 2.0.0)" />
<PackageReference Update="Microsoft.Bcl.Json.Sources" Version="4.6.0-preview3.19128.7" />
<PackageReference Update="Microsoft.Build.Tasks.Core" Version="15.5.180" />
Expand Down
2 changes: 0 additions & 2 deletions sdk/core/Azure.Core/Azure.Core.All.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Storage.Blobs.Batch.S
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Storage.Blobs.Batch.Tests", "..\..\storage\Azure.Storage.Blobs.Batch\tests\Azure.Storage.Blobs.Batch.Tests.csproj", "{EA651D86-70EE-4F32-AF1D-E5EB85ACF79F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Storage.Blobs.Cryptography", "..\..\storage\Azure.Storage.Blobs.Cryptography\src\Azure.Storage.Blobs.Cryptography.csproj", "{908FBA6A-12B2-44DA-BCFB-11750B613FFA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Storage.Blobs.Samples.Tests", "..\..\storage\Azure.Storage.Blobs\samples\Azure.Storage.Blobs.Samples.Tests.csproj", "{83DC827C-9AD6-4C76-883F-53AB4A027E82}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Storage.Blobs.Tests", "..\..\storage\Azure.Storage.Blobs\tests\Azure.Storage.Blobs.Tests.csproj", "{02708856-2D84-47E2-80DD-65A3A31E01C8}"
Expand Down
1 change: 0 additions & 1 deletion sdk/storage/Azure.Storage.Blobs.Batch/samples/Azure.Storage.Blobs.Batch.Samples.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Azure.Storage.Blobs\src\Azure.Storage.Blobs.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Azure.Storage.Common\src\Azure.Storage.Common.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Azure.Storage.Blobs.Batch\src\Azure.Storage.Blobs.Batch.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Azure.Storage.Blobs.Cryptography\src\Azure.Storage.Blobs.Cryptography.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)..\..\Azure.Storage.Common\tests\Shared\**\*.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
Expand Down
1 change: 1 addition & 0 deletions sdk/storage/Azure.Storage.Blobs.Batch/tests/Azure.Storage.Blobs.Batch.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Azure.Identity" />
<PackageReference Include="Azure.Security.KeyVault.Keys" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Azure.Storage.Common\src\Azure.Storage.Common.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Azure.Storage.Blobs\src\Azure.Storage.Blobs.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\src\Azure.Storage.Blobs.Batch.csproj" />
Expand Down
6 changes: 0 additions & 6 deletions sdk/storage/Azure.Storage.Blobs.Cryptography/BreakingChanges.txt
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions sdk/storage/Azure.Storage.Blobs.Cryptography/CHANGELOG.md
View file
Open in desktop

This file was deleted.

109 changes: 0 additions & 109 deletions sdk/storage/Azure.Storage.Blobs.Cryptography/README.md
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions ...e/Azure.Storage.Blobs.Cryptography/api/Azure.Storage.Blobs.Cryptography.netstandard2.0.cs
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions sdk/storage/Azure.Storage.Blobs.Cryptography/src/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions sdk/storage/Azure.Storage.Blobs.Cryptography/src/Azure.Storage.Blobs.Cryptography.csproj
View file
Open in desktop

This file was deleted.

142 changes: 0 additions & 142 deletions sdk/storage/Azure.Storage.Blobs.Cryptography/src/EncryptedBlockBlobClient.cs
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions sdk/storage/Azure.Storage.Blobs/api/Azure.Storage.Blobs.netstandard2.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,6 +989,10 @@ public BlobBaseClient(System.Uri blobUri, Azure.Storage.StorageSharedKeyCredenti
public virtual Azure.Storage.Blobs.Specialized.BlobBaseClient WithSnapshot(string snapshot) { throw null; }
protected virtual Azure.Storage.Blobs.Specialized.BlobBaseClient WithSnapshotCore(string snapshot) { throw null; }
}
public static partial class BlobClientExtensions
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should go in SpecializedBlobExtensions so we don't add a new type.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll mirror this in Queues as well. There needed to be a new type no matter what, but now it will be in line with this Blobs change.

{
public static Azure.Storage.Blobs.BlobClient WithClientSideEncryptionOptions(this Azure.Storage.Blobs.BlobClient client, Azure.Storage.ClientSideEncryptionOptions clientSideEncryptionOptions) { throw null; }
}
public partial class BlobLeaseClient
{
public static readonly System.TimeSpan InfiniteLeaseDuration;
Expand Down Expand Up @@ -1037,6 +1041,11 @@ public BlockBlobClient(System.Uri blobUri, Azure.Storage.StorageSharedKeyCredent
public new Azure.Storage.Blobs.Specialized.BlockBlobClient WithSnapshot(string snapshot) { throw null; }
protected sealed override Azure.Storage.Blobs.Specialized.BlobBaseClient WithSnapshotCore(string snapshot) { throw null; }
}
public partial class ExtendedBlobClientOptions : Azure.Storage.Blobs.BlobClientOptions
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extended is probably not the best prefix because a lot of folks have a visceral reaction to it. Could we call this SpecializedBlobClientOptions to match the Specialized namespace and terminology we've been building?

{
public ExtendedBlobClientOptions(Azure.Storage.Blobs.BlobClientOptions.ServiceVersion version = Azure.Storage.Blobs.BlobClientOptions.ServiceVersion.V2019_07_07) : base (default(Azure.Storage.Blobs.BlobClientOptions.ServiceVersion)) { }
public Azure.Storage.ClientSideEncryptionOptions ClientSideEncryption { get { throw null; } set { } }
}
public partial class PageBlobClient : Azure.Storage.Blobs.Specialized.BlobBaseClient
{
protected PageBlobClient() { }
Expand Down
1 change: 0 additions & 1 deletion sdk/storage/Azure.Storage.Blobs/samples/Azure.Storage.Blobs.Samples.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<ProjectReference Include="$(MSBuildThisFileDirectory)..\src\Azure.Storage.Blobs.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Azure.Storage.Common\src\Azure.Storage.Common.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Azure.Storage.Blobs.Batch\src\Azure.Storage.Blobs.Batch.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Azure.Storage.Blobs.Cryptography\src\Azure.Storage.Blobs.Cryptography.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)..\..\Azure.Storage.Common\tests\Shared\**\*.cs" Link="Shared\%(RecursiveDir)\%(Filename)%(Extension)" />
Expand Down
Loading