Skip to content

Commit 2e0b22c

Browse files
yoavrubinyoavrubin
committed
Upgrading secure connection APIs
1 parent 0d51101 commit 2e0b22c

File tree

9 files changed

+27
-21
lines changed

9 files changed

+27
-21
lines changed

‎src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\..\..\packages\xunit.runner.visualstudio.0.99.9-build1021\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.0.99.9-build1021\build\net20\xunit.runner.visualstudio.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -219,6 +219,7 @@
219219
</ProjectReference>
220220
</ItemGroup>
221221
<ItemGroup>
222+
<None Include="app.config" />
222223
<None Include="Build2014_Website_App.json">
223224
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
224225
</None>

‎src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -295,6 +295,7 @@
295295
<Content Include="AzureResourceManager.psd1">
296296
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
297297
</Content>
298+
<None Include="app.config" />
298299
<None Include="MSSharedLibKey.snk" />
299300
<None Include="packages.config" />
300301
<None Include="PostBuild.ps1" />

‎src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -58,8 +58,9 @@
5858
<Reference Include="Microsoft.Azure.Gallery">
5959
<HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
6060
</Reference>
61-
<Reference Include="Microsoft.Azure.Management.Sql">
62-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.17.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
61+
<Reference Include="Microsoft.Azure.Management.Sql, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62+
<SpecificVersion>False</SpecificVersion>
63+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.20.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
6364
</Reference>
6465
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6566
<SpecificVersion>False</SpecificVersion>
@@ -182,6 +183,7 @@
182183
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
183184
</ItemGroup>
184185
<ItemGroup>
186+
<None Include="app.config" />
185187
<None Include="MSSharedLibKey.snk" />
186188
<None Include="packages.config">
187189
<SubType>Designer</SubType>

‎src/ResourceManager/Sql/Commands.Sql.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Resources" version="2.14.1-preview" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Management.Sql" version="0.19.0-prerelease" targetFramework="net45" />
9+
<package id="Microsoft.Azure.Management.Sql" version="0.20.0-prerelease" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Test.Framework" version="1.0.5513.27084-prerelease" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5513.27084-prerelease" targetFramework="net45" />
1212
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

‎src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -51,6 +51,7 @@
5151
<Prefer32Bit>false</Prefer32Bit>
5252
</PropertyGroup>
5353
<ItemGroup>
54+
<None Include="app.config" />
5455
<None Include="MSSharedLibKey.snk" />
5556
<Compile Include="Properties\Resources.Designer.cs">
5657
<AutoGen>True</AutoGen>
@@ -130,7 +131,7 @@
130131
</Reference>
131132
<Reference Include="Microsoft.Azure.Management.Sql, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
132133
<SpecificVersion>False</SpecificVersion>
133-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.17.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
134+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.20.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
134135
</Reference>
135136
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
136137
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/Sql/Commands.Sql/Security/Services/SecureConnectionEndpointsCommunicator.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,20 @@ public SecureConnectionEndpointsCommunicator(AzureProfile profile , AzureSubscri
4343
/// <summary>
4444
/// Get the secure connection policy for a specific database
4545
/// </summary>
46-
public SecureConnectionPolicy GetDatabaseSecureConnectionPolicy(string resourceGroupName, string serverName, string databaseName, string clientRequestId)
46+
public DatabaseSecureConnectionPolicy GetDatabaseSecureConnectionPolicy(string resourceGroupName, string serverName, string databaseName, string clientRequestId)
4747
{
4848
ISecureConnectionPolicyOperations operations = GetCurrentSqlClient(clientRequestId).SecureConnection;
49-
SecureConnectionPolicyGetResponse response = operations.Get(resourceGroupName, serverName, databaseName);
49+
DatabaseSecureConnectionPolicyGetResponse response = operations.GetDatabasePolicy(resourceGroupName, serverName, databaseName);
5050
return response.SecureConnectionPolicy;
5151
}
5252

5353
/// <summary>
5454
/// Set (or create) the secure connection policy for a specific database
5555
/// </summary>
56-
public void SetDatabaseSecureConnectionPolicy(string resourceGroupName, string serverName, string databaseName, string clientRequestId, SecureConnectionPolicyCreateOrUpdateParameters parameters)
56+
public void SetDatabaseSecureConnectionPolicy(string resourceGroupName, string serverName, string databaseName, string clientRequestId, DatabaseSecureConnectionPolicyCreateOrUpdateParameters parameters)
5757
{
5858
ISecureConnectionPolicyOperations operations = GetCurrentSqlClient(clientRequestId).SecureConnection;
59-
operations.CreateOrUpdate(resourceGroupName, serverName, databaseName, parameters);
59+
operations.CreateOrUpdateDatabasePolicy(resourceGroupName, serverName, databaseName, parameters);
6060
}
6161

6262
/// <summary>

‎src/ResourceManager/Sql/Commands.Sql/Security/Services/SqlSecureConnectionAdapter.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public SqlSecureConnectionAdapter(AzureProfile profile , AzureSubscription subsc
5151
/// </summary>
5252
public DatabaseSecureConnectionPolicyModel GetDatabaseSecureConnectionPolicy(string resourceGroup, string serverName, string databaseName, string requestId)
5353
{
54-
SecureConnectionPolicy policy = Communicator.GetDatabaseSecureConnectionPolicy(resourceGroup, serverName, databaseName, requestId);
54+
DatabaseSecureConnectionPolicy policy = Communicator.GetDatabaseSecureConnectionPolicy(resourceGroup, serverName, databaseName, requestId);
5555
DatabaseSecureConnectionPolicyModel dbPolicyModel = ModelizeDatabaseSecureConnectionPolicy(policy);
5656
dbPolicyModel.ResourceGroupName = resourceGroup;
5757
dbPolicyModel.ServerName = serverName;
@@ -62,10 +62,10 @@ public DatabaseSecureConnectionPolicyModel GetDatabaseSecureConnectionPolicy(str
6262
/// <summary>
6363
/// Transforms a secure connection policy object to its cmdlet model representation
6464
/// </summary>
65-
private DatabaseSecureConnectionPolicyModel ModelizeDatabaseSecureConnectionPolicy(SecureConnectionPolicy policy)
65+
private DatabaseSecureConnectionPolicyModel ModelizeDatabaseSecureConnectionPolicy(DatabaseSecureConnectionPolicy policy)
6666
{
6767
DatabaseSecureConnectionPolicyModel dbPolicyModel = new DatabaseSecureConnectionPolicyModel();
68-
SecureConnectionPolicyProperties properties = policy.Properties;
68+
DatabaseSecureConnectionPolicyProperties properties = policy.Properties;
6969
dbPolicyModel.ProxyDnsName = properties.ProxyDnsName;
7070
dbPolicyModel.ProxyPort = properties.ProxyPort;
7171
dbPolicyModel.SecureConnectionState = properties.SecurityEnabledAccess == Constants.SecureConnectionEndpoint.Required ? SecureConnectionStateType.Required : SecureConnectionStateType.Optional;
@@ -77,7 +77,7 @@ private DatabaseSecureConnectionPolicyModel ModelizeDatabaseSecureConnectionPoli
7777
/// </summary>
7878
public void SetDatabaseSecureConnectionPolicy(DatabaseSecureConnectionPolicyModel model, String clientId)
7979
{
80-
SecureConnectionPolicyCreateOrUpdateParameters parameters = PolicizeDatabaseSecureConnectionModel(model);
80+
DatabaseSecureConnectionPolicyCreateOrUpdateParameters parameters = PolicizeDatabaseSecureConnectionModel(model);
8181
Communicator.SetDatabaseSecureConnectionPolicy(model.ResourceGroupName, model.ServerName, model.DatabaseName, clientId, parameters);
8282
}
8383

@@ -86,10 +86,10 @@ public void SetDatabaseSecureConnectionPolicy(DatabaseSecureConnectionPolicyMode
8686
/// </summary>
8787
/// <param name="policy">The Secure Connection Policy object</param>
8888
/// <returns>The communication model object</returns>
89-
private SecureConnectionPolicyCreateOrUpdateParameters PolicizeDatabaseSecureConnectionModel(DatabaseSecureConnectionPolicyModel model)
89+
private DatabaseSecureConnectionPolicyCreateOrUpdateParameters PolicizeDatabaseSecureConnectionModel(DatabaseSecureConnectionPolicyModel model)
9090
{
91-
SecureConnectionPolicyCreateOrUpdateParameters updateParameters = new SecureConnectionPolicyCreateOrUpdateParameters();
92-
SecureConnectionPolicyCreateOrUpdateProperties properties = new SecureConnectionPolicyCreateOrUpdateProperties();
91+
DatabaseSecureConnectionPolicyCreateOrUpdateParameters updateParameters = new DatabaseSecureConnectionPolicyCreateOrUpdateParameters();
92+
DatabaseSecureConnectionPolicyCreateOrUpdateProperties properties = new DatabaseSecureConnectionPolicyCreateOrUpdateProperties();
9393
updateParameters.Properties = properties;
9494
properties.SecurityEnabledAccess = model.SecureConnectionState == SecureConnectionStateType.Required ? Constants.SecureConnectionEndpoint.Required : Constants.SecureConnectionEndpoint.Optional;
9595
return updateParameters;

‎src/ResourceManager/Sql/Commands.Sql/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="Microsoft.Azure.Common.Authentication" version="1.0.17-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Resources" version="2.14.1-preview" targetFramework="net45" />
8-
<package id="Microsoft.Azure.Management.Sql" version="0.19.0-prerelease" targetFramework="net45" />
8+
<package id="Microsoft.Azure.Management.Sql" version="0.20.0-prerelease" targetFramework="net45" />
99
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1010
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
1111
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />

‎src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -115,6 +115,7 @@
115115
<Compile Include="Properties\AssemblyInfo.cs" />
116116
</ItemGroup>
117117
<ItemGroup>
118+
<None Include="app.config" />
118119
<None Include="MSSharedLibKey.snk" />
119120
<None Include="packages.config">
120121
<SubType>Designer</SubType>

0 commit comments

Comments
 (0)