Skip to content

Commit 2d216ec

Browse files
markcowlmarkcowl
committed
Merge pull request #1244 from seanbamsft/release-1.0.0
KV: Add enabledForDiskEncryption and enabledForTemplateDeployment
2 parents fa56da9 + eca5193 commit 2d216ec

File tree

48 files changed

+2974
-2444
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2974
-2444
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,15 +1283,6 @@
12831283
<Component Id="cmp1C7EFB238F49BC10B88911B4DD7CD760" Guid="*">
12841284
<File Id="filC52B079BABFAD11D6B89732C6569172A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.Azure.ResourceManager.dll" />
12851285
</Component>
1286-
<Component Id="cmpF469AE6EA612B0399957FAF85083221B" Guid="*">
1287-
<File Id="fil5684108D378817FBD69741594A1691AA" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.Data.Edm.dll" />
1288-
</Component>
1289-
<Component Id="cmp28D6E7B5DF1FD9B79A5B4D16447379A1" Guid="*">
1290-
<File Id="fil5FFABBF4B17F9CB6DC30FB21B11A1B3F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.Data.OData.dll" />
1291-
</Component>
1292-
<Component Id="cmpCD008CF1C7D17EBD72102BD129C9372C" Guid="*">
1293-
<File Id="filAE03B936A9EEBD6BA395089F817FD5A0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.Data.Services.Client.dll" />
1294-
</Component>
12951286
<Component Id="cmpD542C61584E161A92D52490818D7E34A" Guid="*">
12961287
<File Id="filC47A710583991C8D624107A3F8EBDD72" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
12971288
</Component>
@@ -1331,9 +1322,6 @@
13311322
<Component Id="cmpD29EA01597258746011AE6EF9FC3D15A" Guid="*">
13321323
<File Id="filCE0262D8D43EF7AB4CDB25A0752B7121" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\System.Net.Http.Primitives.dll" />
13331324
</Component>
1334-
<Component Id="cmp8EE8340753317C13D69F692E7E42B175" Guid="*">
1335-
<File Id="filAE60D28516977FE205BBEB3D15EB53DE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\System.Spatial.dll" />
1336-
</Component>
13371325
</Directory>
13381326
<Directory Id="dir76147B1D381C34B7638F2A844B5685DC" Name="AzureRM.Network">
13391327
<Component Id="cmp33F39A22183184A6B41F85DF085BAD29" Guid="*">
@@ -5054,9 +5042,6 @@
50545042
<ComponentRef Id="cmpD1A5B61C7046E3D9D8256C632EED70EF" />
50555043
<ComponentRef Id="cmpFD1FF637F9EDD0BF88DE235BB7C878F2" />
50565044
<ComponentRef Id="cmp1C7EFB238F49BC10B88911B4DD7CD760" />
5057-
<ComponentRef Id="cmpF469AE6EA612B0399957FAF85083221B" />
5058-
<ComponentRef Id="cmp28D6E7B5DF1FD9B79A5B4D16447379A1" />
5059-
<ComponentRef Id="cmpCD008CF1C7D17EBD72102BD129C9372C" />
50605045
<ComponentRef Id="cmpD542C61584E161A92D52490818D7E34A" />
50615046
<ComponentRef Id="cmp0EE8FCFA5508960593F3537443DACD4E" />
50625047
<ComponentRef Id="cmp6D51C798EDF35CEA322D396B85FB8E18" />
@@ -5070,7 +5055,6 @@
50705055
<ComponentRef Id="cmp8F99791178CB394FC285BF5F9DA21047" />
50715056
<ComponentRef Id="cmp55A0977CC2E4CD91F6738FFD78449307" />
50725057
<ComponentRef Id="cmpD29EA01597258746011AE6EF9FC3D15A" />
5073-
<ComponentRef Id="cmp8EE8340753317C13D69F692E7E42B175" />
50745058
<ComponentRef Id="cmp33F39A22183184A6B41F85DF085BAD29" />
50755059
<ComponentRef Id="cmp70B60DBD32D61BCA5715AB2D64131358" />
50765060
<ComponentRef Id="cmp92653399A1E9659661E74CA982C1D16A" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
@{
1010

1111
# Version number of this module.
12-
ModuleVersion = '1.0.1'
12+
ModuleVersion = '1.1.0'
1313

1414
# ID used to uniquely identify this module
1515
GUID = 'fa236c1f-6464-4d6a-a48d-db47c0e7923d'

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@
7474
<Reference Include="Microsoft.Azure.Management.Authorization">
7575
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.1.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
7676
</Reference>
77-
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78-
<SpecificVersion>False</SpecificVersion>
79-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.1.0.0\lib\net40\Microsoft.Azure.Management.KeyVault.dll</HintPath>
80-
</Reference>
8177
<Reference Include="Microsoft.Azure.Common.NetFramework">
8278
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
8379
</Reference>
80+
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
81+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.1.0.1\lib\net40\Microsoft.Azure.Management.KeyVault.dll</HintPath>
82+
<Private>True</Private>
83+
</Reference>
8484
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8585
<SpecificVersion>False</SpecificVersion>
8686
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.7-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
@@ -257,6 +257,12 @@
257257
<None Include="SessionRecords\Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests\TestModifyAccessPolicyEnabledForDeployment.json">
258258
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
259259
</None>
260+
<None Include="SessionRecords\Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests\TestModifyAccessPolicyEnabledForDiskEncryption.json">
261+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
262+
</None>
263+
<None Include="SessionRecords\Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests\TestModifyAccessPolicyEnabledForTemplateDeployment.json">
264+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
265+
</None>
260266
<None Include="SessionRecords\Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests\TestRecreateVaultFails.json">
261267
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
262268
</None>

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,54 @@ public void TestModifyAccessPolicyEnabledForDeployment()
484484
}
485485

486486

487+
[Fact]
488+
[Trait(Category.AcceptanceType, Category.CheckIn)]
489+
public void TestModifyAccessPolicyEnabledForTemplateDeployment()
490+
{
491+
string upn = "";
492+
493+
_data.ResetPreCreatedVault();
494+
KeyVaultManagementController.NewInstance.RunPsTestWorkflow(
495+
() =>
496+
{
497+
return new[] { string.Format("{0} {1} {2} {3}", "Test-ModifyAccessPolicyEnabledForTemplateDeployment", _data.preCreatedVault, _data.resourceGroupName, upn) };
498+
},
499+
(env) =>
500+
{
501+
Initialize();
502+
upn = GetUser(env.GetTestEnvironment());
503+
},
504+
null,
505+
TestUtilities.GetCallingClass(),
506+
TestUtilities.GetCurrentMethodName()
507+
);
508+
}
509+
510+
511+
[Fact]
512+
[Trait(Category.AcceptanceType, Category.CheckIn)]
513+
public void TestModifyAccessPolicyEnabledForDiskEncryption()
514+
{
515+
string upn = "";
516+
517+
_data.ResetPreCreatedVault();
518+
KeyVaultManagementController.NewInstance.RunPsTestWorkflow(
519+
() =>
520+
{
521+
return new[] { string.Format("{0} {1} {2} {3}", "Test-ModifyAccessPolicyEnabledForDiskEncryption", _data.preCreatedVault, _data.resourceGroupName, upn) };
522+
},
523+
(env) =>
524+
{
525+
Initialize();
526+
upn = GetUser(env.GetTestEnvironment());
527+
},
528+
null,
529+
TestUtilities.GetCallingClass(),
530+
TestUtilities.GetCurrentMethodName()
531+
);
532+
}
533+
534+
487535
[Fact]
488536
[Trait(Category.AcceptanceType, Category.CheckIn)]
489537
public void TestModifyAccessPolicyNegativeCases()

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

Lines changed: 44 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ function Test-ModifyAccessPolicyEnabledForDeployment
439439
Assert-AreEqual 0 $vault.AccessPolicies.Count
440440
Assert-AreEqual $false $vault.EnabledForDeployment
441441

442-
# Set and Remove EnabledForDeployment, without any other permissions
442+
# Set and Remove EnabledForDeployment
443443
$vault = Set-AzureRmKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -EnabledForDeployment -PassThru
444444
Assert-NotNull $vault
445445
Assert-AreEqual 0 $vault.AccessPolicies.Count
@@ -449,17 +449,52 @@ function Test-ModifyAccessPolicyEnabledForDeployment
449449
Assert-NotNull $vault
450450
Assert-AreEqual 0 $vault.AccessPolicies.Count
451451
Assert-AreEqual $false $vault.EnabledForDeployment
452+
}
452453

453-
# Set and Remove EnabledForDeployment, with other permissions
454-
$PermToKeys = @("encrypt", "decrypt", "unwrapKey", "wrapKey", "verify", "sign", "get", "list", "update", "create", "import", "delete", "backup", "restore")
455-
$PermToSecrets = @("get", "list", "set", "delete")
456-
$vault = Set-AzureRmKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -EnabledForDeployment -UPN $upn -PermissionsToKeys $PermToKeys -PermissionsToSecrets $PermToSecrets -PassThru
457-
CheckVaultAccessPolicy $vault $PermToKeys $PermToSecrets
458-
Assert-AreEqual $true $vault.EnabledForDeployment
454+
function Test-ModifyAccessPolicyEnabledForTemplateDeployment
455+
{
456+
Param($existingVaultName, $rgName, $upn)
457+
$vault = Get-AzureRmKeyVault -VaultName $existingVaultName -ResourceGroupName $rgName
458+
Assert-NotNull $vault
459+
Assert-AreEqual 0 $vault.AccessPolicies.Count
460+
if ($vault.EnabledForTemplateDeployment -ne $null)
461+
{
462+
Assert-AreEqual $false $vault.EnabledForTemplateDeployment
463+
}
459464

460-
$vault = Remove-AzureRmKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -EnabledForDeployment -ObjectId $vault.AccessPolicies[0].ObjectId -PassThru
465+
# Set and Remove EnabledForTemplateDeployment
466+
$vault = Set-AzureRmKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -EnabledForTemplateDeployment -PassThru
467+
Assert-NotNull $vault
461468
Assert-AreEqual 0 $vault.AccessPolicies.Count
462-
Assert-AreEqual $false $vault.EnabledForDeployment
469+
Assert-AreEqual $true $vault.EnabledForTemplateDeployment
470+
471+
$vault = Remove-AzureRmKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -EnabledForTemplateDeployment -PassThru
472+
Assert-NotNull $vault
473+
Assert-AreEqual 0 $vault.AccessPolicies.Count
474+
Assert-AreEqual $false $vault.EnabledForTemplateDeployment
475+
}
476+
477+
function Test-ModifyAccessPolicyEnabledForDiskEncryption
478+
{
479+
Param($existingVaultName, $rgName, $upn)
480+
$vault = Get-AzureRmKeyVault -VaultName $existingVaultName -ResourceGroupName $rgName
481+
Assert-NotNull $vault
482+
Assert-AreEqual 0 $vault.AccessPolicies.Count
483+
if ($vault.EnabledForDiskEncryption -ne $null)
484+
{
485+
Assert-AreEqual $false $vault.EnabledForDiskEncryption
486+
}
487+
488+
# Set and Remove EnabledForDiskEncryption
489+
$vault = Set-AzureRmKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -EnabledForDiskEncryption -PassThru
490+
Assert-NotNull $vault
491+
Assert-AreEqual 0 $vault.AccessPolicies.Count
492+
Assert-AreEqual $true $vault.EnabledForDiskEncryption
493+
494+
$vault = Remove-AzureRmKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -EnabledForDiskEncryption -PassThru
495+
Assert-NotNull $vault
496+
Assert-AreEqual 0 $vault.AccessPolicies.Count
497+
Assert-AreEqual $false $vault.EnabledForDiskEncryption
463498
}
464499

465500
function Test-ModifyAccessPolicyNegativeCases

‎src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/VaultManagementTests.ps1

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,20 @@ function Test_ModifyAccessPolicyEnabledForDeployment
170170
Test-ModifyAccessPolicyEnabledForDeployment $global:precreatedVaultName $global:resourceGroupName $user
171171
}
172172

173+
function Test_ModifyAccessPolicyEnabledForTemplateDeployment
174+
{
175+
$user = (Get-AzureRmSubscription -Current).DefaultAccount
176+
Reset-PreCreatedVault
177+
Test-ModifyAccessPolicyEnabledForTemplateDeployment $global:precreatedVaultName $global:resourceGroupName $user
178+
}
179+
180+
function Test_ModifyAccessPolicyEnabledForDiskEncryption
181+
{
182+
$user = (Get-AzureRmSubscription -Current).DefaultAccount
183+
Reset-PreCreatedVault
184+
Test-ModifyAccessPolicyEnabledForDiskEncryption $global:precreatedVaultName $global:resourceGroupName $user
185+
}
186+
173187
function Test_ModifyAccessPolicyNegativeCases
174188
{
175189
$user = (Get-AzureRmSubscription -Current).DefaultAccount

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

Lines changed: 96 additions & 87 deletions
Large diffs are not rendered by default.

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

Lines changed: 57 additions & 51 deletions
Large diffs are not rendered by default.

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

Lines changed: 70 additions & 61 deletions
Large diffs are not rendered by default.

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

Lines changed: 42 additions & 39 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)