Skip to content

Commit

Permalink
Add support for new BYOK parameter keyVaultKeyUri (Azure#15684)
Browse files Browse the repository at this point in the history
* Add support for new BYOK parameter keyVaultKeyUri

* Since the parameter re-ordering in the ServicesProperties ctor is a breaking change, I've bumped the package version to 2.0.0
  • Loading branch information
shmartel authored and annelo-msft committed Feb 17, 2021
1 parent 89c1890 commit 0f70176
Show file tree
Hide file tree
Showing 19 changed files with 72 additions and 65 deletions.
6 changes: 3 additions & 3 deletions eng/mgmt/mgmtmetadata/healthcareapis_resource-manager.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ AutoRest installed successfully.
Commencing code generation
Generating CSharp code
Executing AutoRest command
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/healthcareapis/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=C:\Users\rojo\source\repos\azure-sdk-for-net\sdk
2020-05-06 20:36:05 UTC
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/healthcareapis/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=C:\Users\shmartel\source\repos\azure-sdk-for-net\sdk
2020-10-01 19:41:55 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
Commit: 01735394bc1f2ccd9577ac6dd3ef547ab10f2d5c
Commit: 3695f4ef3bf65c253509d2708c31c96b71822613
AutoRest information
Requested version: v2
Bootstrapper version: autorest@2.0.4413
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
<PropertyGroup>
<AzureApiTag>HealthcareApis_2019-09-16;</AzureApiTag>
<AzureApiTag>HealthcareApis_2020-03-15;</AzureApiTag>
<PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
</PropertyGroup>
</Project>

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<Description>Provides management capabilities for Microsoft Azure Healthcare Apis.</Description>
<AssemblyTitle>Microsoft Azure Healthcare Apis Management</AssemblyTitle>
<AssemblyName>Microsoft.Azure.Management.HealthcareApis</AssemblyName>
<Version>1.1.0</Version>
<Version>2.0.0</Version>
<RootNamespace>Microsoft.Azure.Management.HealthcareApis</RootNamespace>
<PackageTags>Microsoft Azure Healthcare Apis;HealthcareApis management;HealthcareApis;</PackageTags>
<PackageReleaseNotes>
<![CDATA[
1) Change: Add support for managed identity and export settings
1) Change: Add support for customer-managed key configuration setting
]]></PackageReleaseNotes>
<PackageReleaseNotes>Management SDK for Healthcare APIs.</PackageReleaseNotes>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
[assembly: AssemblyTitle("Microsoft Azure Management HealthcareApis Library")]
[assembly: AssemblyDescription("Provides management functionality for Microsoft Azure HealthcareApis Management Platform.")]

[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Microsoft Azure .NET SDK")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public static class HealthcareApisManagementTestUtilities
public static string audience = "https://azurehealthcareapis.com";
public static bool smartOnFhirEnabled = false;
public static int offerThroughput = 400;
public static string keyVaultKeyUri = "https://my-vault.vault.azure.net/keys/my-key";

private static HttpClientHandler GetHandler()
{
Expand Down Expand Up @@ -96,10 +97,10 @@ public static ServicesProperties GetServiceProperties()

string provisioningState = "Succeeded";

ServiceCosmosDbConfigurationInfo cosmosDbConfigurationInfo = new ServiceCosmosDbConfigurationInfo(offerThroughput);
ServiceCosmosDbConfigurationInfo cosmosDbConfigurationInfo = new ServiceCosmosDbConfigurationInfo(offerThroughput, keyVaultKeyUri);
ServiceAuthenticationConfigurationInfo authenticationConfigurationInfo = new ServiceAuthenticationConfigurationInfo(authority, audience, smartOnFhirEnabled);

var serviceProperties = new ServicesProperties(accessPolicies, provisioningState, cosmosDbConfigurationInfo, authenticationConfigurationInfo);
var serviceProperties = new ServicesProperties(provisioningState, accessPolicies, cosmosDbConfigurationInfo, authenticationConfigurationInfo);

return serviceProperties;
}
Expand Down Expand Up @@ -134,7 +135,8 @@ public static void VerifyAccountProperties(ServicesDescription account, bool use
Assert.Equal("https://login.microsoftonline.com/common", account.Properties.AuthenticationConfiguration.Authority);
Assert.Equal("https://azurehealthcareapis.com", account.Properties.AuthenticationConfiguration.Audience);
Assert.False(account.Properties.AuthenticationConfiguration.SmartProxyEnabled);
Assert.Equal(400, account.Properties.CosmosDbConfiguration.OfferThroughput);
Assert.Equal(offerThroughput, account.Properties.CosmosDbConfiguration.OfferThroughput);
Assert.Equal(keyVaultKeyUri, account.Properties.CosmosDbConfiguration.KeyVaultKeyUri);
Assert.Equal(1, account.Properties.AccessPolicies.Count);
Assert.Equal(ProvisioningState.Succeeded, account.Properties.ProvisioningState);
Assert.Equal(Kind.FhirR4, account.Kind);
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0f70176

Please sign in to comment.