Skip to content

Commit 637aeee

Browse files
author
Maddie Clayton
authored
Merge branch 'preview' into iss#865
2 parents ee45910 + c9b63c0 commit 637aeee

File tree

8 files changed

+7
-2448
lines changed

8 files changed

+7
-2448
lines changed

‎TestMappings.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@
122122
".\\src\\ResourceManager\\RecoveryServices.Backup\\Commands.RecoveryServices.Backup.Test\\bin\\Debug\\Microsoft.Azure.Commands.RecoveryServices.Backup.Test.dll",
123123
".\\src\\ResourceManager\\ServiceFabric\\Commands.ServiceFabric.Test\\bin\\Debug\\Microsoft.Azure.Commands.ServiceFabric.Test.dll",
124124
".\\src\\ResourceManager\\Sql\\Commands.Sql.Test\\bin\\Debug\\Microsoft.Azure.Commands.Sql.Test.dll",
125-
".\\src\\ResourceManager\\Dns\\Commands.Dns.Test\\bin\\Debug\\Microsoft.Azure.Commands.Dns.Test.dll",
126-
".\\src\\ResourceManager\\KeyVault\\Commands.KeyVault.Test\\bin\\Debug\\Microsoft.Azure.Commands.KeyVault.Test.dll"
125+
".\\src\\ResourceManager\\Dns\\Commands.Dns.Test\\bin\\Debug\\Microsoft.Azure.Commands.Dns.Test.dll"
127126
],
128127
"src/ResourceManager/NotificationHubs /": [
129128
".\\src\\ResourceManager\\NotificationHubs\\Commands.NotificationHubs.Test\\bin\\Debug\\Microsoft.Azure.Commands.NotificationHubs.Test.dll"

‎src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,7 @@ CmdletsToExport = 'Add-AzureKeyVaultCertificate', 'Update-AzureKeyVaultCertifica
118118
'Backup-AzureKeyVaultManagedStorageAccount',
119119
'Restore-AzureKeyVaultManagedStorageAccount',
120120
'Undo-AzureKeyVaultManagedStorageSasDefinitionRemoval',
121-
'Undo-AzureKeyVaultManagedStorageAccountRemoval',
122-
'Add-AzureRmKeyVaultNetworkRule',
123-
'Update-AzureRmKeyVaultNetworkRuleSet',
124-
'Remove-AzureRmKeyVaultNetworkRule'
121+
'Undo-AzureKeyVaultManagedStorageAccountRemoval'
125122

126123
# Variables to export from this module
127124
# VariablesToExport = @()
@@ -163,7 +160,7 @@ PrivateData = @{
163160
* Set minimum dependency of module to PowerShell 5.0'
164161

165162
# Prerelease string of this module
166-
Prerelease = 'preview'
163+
# Prerelease = ''
167164

168165
# Flag to indicate whether the module requires explicit user acceptance for install/update
169166
# RequireLicenseAcceptance = $false

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,6 @@
8181
<Reference Include="Microsoft.Azure.Management.KeyVault">
8282
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.4.1-alpha\lib\net452\Microsoft.Azure.Management.KeyVault.dll</HintPath>
8383
</Reference>
84-
<Reference Include="Microsoft.Azure.Management.Network">
85-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.17.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
86-
</Reference>
87-
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
88-
<SpecificVersion>False</SpecificVersion>
89-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.6.0-preview\lib\net452\Microsoft.Azure.Management.ResourceManager.dll</HintPath>
90-
</Reference>
9184
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9285
<SpecificVersion>False</SpecificVersion>
9386
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.20.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
@@ -306,9 +299,6 @@
306299
<None Include="SessionRecords\Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests\TestSetRemoveAccessPolicyByUPN.json">
307300
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
308301
</None>
309-
<None Include="SessionRecords\Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests\TestNetworkSet.json">
310-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
311-
</None>
312302
</ItemGroup>
313303
<ItemGroup>
314304
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication.Abstractions\Commands.Common.Authentication.Abstractions.csproj">

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementController.cs

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,10 @@
2929
using System.IO;
3030
using System.Linq;
3131
using LegacyTest = Microsoft.Azure.Test;
32-
using LegacyRMClient = Microsoft.Azure.Management.Resources;
33-
using RM = Microsoft.Azure.Management.ResourceManager;
3432

3533
namespace Microsoft.Azure.Commands.KeyVault.Test
3634
{
3735
using Common.Authentication.Abstractions;
38-
using Management.Network;
3936
using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
4037

4138
using TestBase = Microsoft.Azure.Test.TestBase;
@@ -50,12 +47,10 @@ public class KeyVaultManagementController
5047
private const string DomainKey = "Domain";
5148
private const string SubscriptionIdKey = "SubscriptionId";
5249

53-
public LegacyRMClient.ResourceManagementClient ResourceManagementClient { get; private set; }
50+
public ResourceManagementClient ResourceManagementClient { get; private set; }
5451

5552
public Management.Internal.Resources.ResourceManagementClient NewResourceManagementClient { get; private set; }
5653

57-
public RM.ResourceManagementClient ResourceClient { get; private set; }
58-
5954
public SubscriptionClient SubscriptionClient { get; private set; }
6055

6156
public KeyVaultManagementClient KeyVaultManagementClient { get; private set; }
@@ -66,8 +61,6 @@ public class KeyVaultManagementController
6661

6762
public GraphRbacManagementClient GraphClient { get; private set; }
6863

69-
public NetworkManagementClient NetworkManagementClient { get; private set; }
70-
7164
public string UserDomain { get; private set; }
7265

7366
public static KeyVaultManagementController NewInstance
@@ -139,8 +132,7 @@ public void RunPsTestWorkflow(
139132
"Scripts\\ControlPlane\\" + callingClassName + ".ps1",
140133
helper.RMProfileModule,
141134
helper.RMResourceModule,
142-
helper.GetRMModulePath("AzureRM.KeyVault.psd1"),
143-
helper.RMNetworkModule);
135+
helper.GetRMModulePath("AzureRM.KeyVault.psd1"));
144136

145137
try
146138
{
@@ -168,17 +160,13 @@ private void SetupManagementClients(MockContext context)
168160
{
169161
ResourceManagementClient = GetResourceManagementClient();
170162
NewResourceManagementClient = GetResourceManagementClient(context);
171-
ResourceClient = GetResourceClient(context);
172-
NetworkManagementClient = GetNetworkManagementClient(context);
173163
SubscriptionClient = GetSubscriptionClient();
174164
GalleryClient = GetGalleryClient();
175165
AuthorizationManagementClient = GetAuthorizationManagementClient();
176166
GraphClient = GetGraphClient(context);
177167
KeyVaultManagementClient = GetKeyVaultManagementClient(context);
178168
helper.SetupManagementClients(ResourceManagementClient,
179169
NewResourceManagementClient,
180-
ResourceClient,
181-
NetworkManagementClient,
182170
SubscriptionClient,
183171
KeyVaultManagementClient,
184172
AuthorizationManagementClient,
@@ -187,31 +175,21 @@ private void SetupManagementClients(MockContext context)
187175
);
188176
}
189177

190-
private NetworkManagementClient GetNetworkManagementClient(MockContext context)
191-
{
192-
return context.GetServiceClient<NetworkManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
193-
}
194-
195178
private AuthorizationManagementClient GetAuthorizationManagementClient()
196179
{
197180
return LegacyTest.TestBase.GetServiceClient<AuthorizationManagementClient>(this.csmTestFactory);
198181
}
199182

200-
private LegacyRMClient.ResourceManagementClient GetResourceManagementClient()
183+
private ResourceManagementClient GetResourceManagementClient()
201184
{
202-
return LegacyTest.TestBase.GetServiceClient<LegacyRMClient.ResourceManagementClient>(this.csmTestFactory);
185+
return LegacyTest.TestBase.GetServiceClient<ResourceManagementClient>(this.csmTestFactory);
203186
}
204187

205188
private Management.Internal.Resources.ResourceManagementClient GetResourceManagementClient(MockContext context)
206189
{
207190
return context.GetServiceClient<Management.Internal.Resources.ResourceManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
208191
}
209192

210-
private RM.ResourceManagementClient GetResourceClient(MockContext context)
211-
{
212-
return context.GetServiceClient<RM.ResourceManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
213-
}
214-
215193
private KeyVaultManagementClient GetKeyVaultManagementClient(MockContext context)
216194
{
217195
return context.GetServiceClient<KeyVaultManagementClient>(TestEnvironmentFactory.GetTestEnvironment());

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementTests.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -630,19 +630,6 @@ public void TestCreateDeleteVaultWithPiping()
630630

631631
#endregion
632632

633-
[Fact]
634-
[Trait(Category.AcceptanceType, Category.CheckIn)]
635-
public void TestNetworkSet()
636-
{
637-
KeyVaultManagementController.NewInstance.RunPsTestWorkflow(
638-
() => { return new[] { "Test-NetworkRuleSet" }; },
639-
(env) => Initialize(),
640-
null,
641-
TestUtilities.GetCallingClass(),
642-
TestUtilities.GetCurrentMethodName()
643-
);
644-
}
645-
646633
#region Helper Methods
647634
private string GetUser(TestEnvironment environment)
648635
{

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/ControlPlane/KeyVaultManagementTests.ps1

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -808,49 +808,4 @@ function Compare-Vaults
808808
CheckVaultAccessPolicy $vault1 $vault2.AccessPolicies[0].PermissionsToKeys $vault2.AccessPolicies[0].PermissionsToSecrets $vault2.AccessPolicies[0].PermissionsToCertificates $vault2.AccessPolicies[0].PermissionsToStorage
809809
Assert-AreEqual $vault1.AccessPolicies[0].ObjectId $vault2.AccessPolicies[0].ObjectId
810810
}
811-
}
812-
813-
function Test-NetworkRuleSet
814-
{
815-
$resourceGroupName = getAssetName
816-
$resourceGroupLocation = Get-Location "Microsoft.Resources" "resourceGroups" "westus"
817-
$vaultName = getAssetName
818-
$vaultLocation = Get-Location "Microsoft.KeyVault" "vaults" "westus"
819-
$virtualNetworkName = getAssetName
820-
$virtualNetworkLocation = Get-Location "Microsoft.Network" "virtualNetworks" "westus"
821-
822-
try
823-
{
824-
$rg = New-AzureRmResourceGroup -Name $resourceGroupName -Location $resourceGroupLocation
825-
$vault = New-AzureRmKeyVault -VaultName $vaultName -ResourceGroupName $resourceGroupName -Location $vaultLocation
826-
827-
$frontendSubnet = New-AzureRmVirtualNetworkSubnetConfig -Name frontendSubnet -AddressPrefix "10.0.1.0/24" -ServiceEndpoint Microsoft.KeyVault
828-
$virtualNetwork = New-AzureRmVirtualNetwork -Name $virtualNetworkName -ResourceGroupName $resourceGroupName -Location $virtualNetworkLocation -AddressPrefix "10.0.0.0/16" -Subnet $frontendSubnet
829-
830-
$myNetworkResId = (Get-AzureRmVirtualNetwork -Name $virtualNetworkName -ResourceGroupName $resourceGroupName).Subnets[0].Id
831-
Add-AzureRmKeyVaultNetworkRule -VaultName $vaultName -IpAddressRange "10.0.1.0/24" -VirtualNetworkResourceId $myNetworkResId
832-
$vault = Get-AzureRmKeyVault -ResourceGroupName $resourceGroupName -Name $vaultName
833-
Assert-AreEqual $vault.NetworkAcls.IpAddressRanges.Count 1
834-
Assert-AreEqual $vault.NetworkAcls.IpAddressRanges[0] "10.0.1.0/24"
835-
Assert-AreEqual $vault.NetworkAcls.VirtualNetworkResourceIds.Count 1
836-
Assert-AreEqual $vault.NetworkAcls.VirtualNetworkResourceIds[0] $myNetworkResId
837-
Assert-AreEqual $vault.NetworkAcls.Bypass.toString() "AzureServices"
838-
Assert-AreEqual $vault.NetworkAcls.DefaultAction.toString() "Allow"
839-
840-
$networkRule = Update-AzureRmKeyVaultNetworkRuleSet -VaultName $vaultName -ResourceGroupName $resourceGroupName -Bypass None -DefaultAction Deny -PassThru
841-
Assert-AreEqual $networkRule.NetworkAcls.Bypass.toString() "None"
842-
Assert-AreEqual $networkRule.NetworkAcls.DefaultAction.toString() "Deny"
843-
$vault = Get-AzureRmKeyVault -ResourceGroupName $resourceGroupName -Name $vaultName
844-
Assert-AreEqual $vault.NetworkAcls.Bypass.toString() "None"
845-
Assert-AreEqual $vault.NetworkAcls.DefaultAction.toString() "Deny"
846-
847-
Remove-AzureRmKeyVaultNetworkRule -VaultName $vaultName -ResourceGroupName $resourceGroupName -IpAddressRange "10.0.1.0/24" -VirtualNetworkResourceId $myNetworkResId
848-
$vault = Get-AzureRmKeyVault -ResourceGroupName $resourceGroupName -Name $vaultName
849-
Assert-AreEqual $vault.NetworkAcls.IpAddressRanges.Count 0
850-
Assert-AreEqual $vault.NetworkAcls.VirtualNetworkResourceIds.Count 0
851-
}
852-
finally
853-
{
854-
Remove-AzureRmResourceGroup -Name $resourceGroupName -Force
855-
}
856811
}

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/SessionRecords/Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestNetworkSet.json

Lines changed: 0 additions & 2341 deletions
This file was deleted.

‎src/ResourceManager/KeyVault/KeyVault.sln

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "
3838
EndProject
3939
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Compute", "..\..\Common\Commands.Common.Compute\Commands.Common.Compute.csproj", "{F6D508D1-BE2D-475D-AA0F-DFB5C615CC9D}"
4040
EndProject
41-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Network", "..\Network\Commands.Network\Commands.Network.csproj", "{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}"
42-
EndProject
4341
Global
4442
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4543
Debug|Any CPU = Debug|Any CPU
@@ -114,10 +112,6 @@ Global
114112
{F6D508D1-BE2D-475D-AA0F-DFB5C615CC9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
115113
{F6D508D1-BE2D-475D-AA0F-DFB5C615CC9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
116114
{F6D508D1-BE2D-475D-AA0F-DFB5C615CC9D}.Release|Any CPU.Build.0 = Release|Any CPU
117-
{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
118-
{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Debug|Any CPU.Build.0 = Debug|Any CPU
119-
{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Release|Any CPU.ActiveCfg = Release|Any CPU
120-
{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Release|Any CPU.Build.0 = Release|Any CPU
121115
EndGlobalSection
122116
GlobalSection(SolutionProperties) = preSolution
123117
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)