-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Adding support for encryption with customer-managed keys to Azure Search #5858
Conversation
Can one of the admins verify this patch? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Since I couldn't find how to set the option myself, please use "squash" commits when completing the PR (once it gets approval). Thanks |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Test code looks good, EncryptionFixture needs some work
src/SDKs/Search/Management/Search.Management.Tests/Utilities/SearchServiceFixture.cs
Show resolved
Hide resolved
src/SDKs/Search/Management/Search.Management.Tests/Search.Management.Tests.csproj
Outdated
Show resolved
Hide resolved
src/SDKs/Search/DataPlane/Search.Tests/Tests/EncryptionWithCMK.cs
Outdated
Show resolved
Hide resolved
src/SDKs/Search/DataPlane/Search.Tests/Tests/EncryptionWithCMK.cs
Outdated
Show resolved
Hide resolved
src/SDKs/Search/DataPlane/Search.Tests/Tests/EncryptionWithCMK.cs
Outdated
Show resolved
Hide resolved
src/SDKs/Search/DataPlane/Search.Tests/Tests/EncryptionWithCMK.cs
Outdated
Show resolved
Hide resolved
{ | ||
SearchServiceClient searchClient = Data.GetSearchServiceClient(); | ||
|
||
Index encryptedIndex = CreateEncryptedTestIndex(new EncryptionKey() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wanted to call this out as an example of test code done right. Your instinct in production code might be to factor these details out into a method, but in a test like this having the details be explicit clearly communicates the intended usage of the API. This test communicates exactly what it needs to.
@brjohnstmsft Hi Bruce, can you please take a look at the latest iteration when you have some time? Thanks |
@shmed Please pull from latest master and update the PR to fix the Travis failures |
@shmed Will review on Wednesday. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some earlier issues are not resolved yet. Also, please update your PR to pick up the latest changes from search-preview and fix the identified merge conflicts. This should fix your broken build.
src/SDKs/Search/DataPlane/Search.Tests/Utilities/EncryptionFixture.cs
Outdated
Show resolved
Hide resolved
src/SDKs/Search/DataPlane/Search.Tests/Utilities/EncryptionFixture.cs
Outdated
Show resolved
Hide resolved
src/SDKs/Search/DataPlane/Search.Tests/Utilities/EncryptionFixture.cs
Outdated
Show resolved
Hide resolved
src/SDKs/Search/DataPlane/Search.Tests/Utilities/EncryptionFixture.cs
Outdated
Show resolved
Hide resolved
src/SDKs/Search/DataPlane/Search.Tests/Utilities/EncryptionFixture.cs
Outdated
Show resolved
Hide resolved
@dsgouda Any idea why this "default" check is stuck at "expected"? It stayed this way for hours today, and closing and re-opening the PR didn't seem to help. |
Taking a look |
@brjohnstmsft We have some unexpectedly high load and all 4 Jenkins workers are busy, I am guessing this will be picked up once one of them is free. |
@dsgouda Thanks |
@dsgouda This still appears to be stuck and is blocking our deliverables for //build. Can you please investigate? |
Apologies, taking a look again,. |
This adds the generated code for the changes in API specs from this commit -> Azure/azure-rest-api-specs@6720121
which was reviewed in this PR -> Azure/azure-rest-api-specs#5567
Adds the Azure Search models for EncryptionKey and AzureActiveDirectoryApplicationCredentials, as well as adds the encryptionKey property to the Index and SynonymMap models.
This PR also includes serialization and deserialization test for the following scenario