Skip to content

KV: Add enabledForDiskEncryption and enabledForTemplateDeployment #1244

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Nov 7, 2015
Merged

KV: Add enabledForDiskEncryption and enabledForTemplateDeployment #1244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87ca37a
KV: Add enabledForTemplateDeployment and enabledForDiskEncryption flags
seanbamsft Oct 29, 2015
b303701
Update Key Vault tests and recordings
seanbamsft Nov 6, 2015
c1d9bbc
KV: Add new test session records to csproj
seanbamsft Nov 6, 2015
4e7803b
Merge branch 'DiskEncryption' into release-1.0.0
seanbamsft Nov 6, 2015
5ac23fd
KV: Update module and assembly version
seanbamsft Nov 6, 2015
eca5193
KV: Update AssemblyFileVersion
seanbamsft Nov 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions setup/azurecmdfiles.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1283,15 +1283,6 @@
<Component Id="cmp1C7EFB238F49BC10B88911B4DD7CD760" Guid="*">
<File Id="filC52B079BABFAD11D6B89732C6569172A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.Azure.ResourceManager.dll" />
</Component>
<Component Id="cmpF469AE6EA612B0399957FAF85083221B" Guid="*">
<File Id="fil5684108D378817FBD69741594A1691AA" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.Data.Edm.dll" />
</Component>
<Component Id="cmp28D6E7B5DF1FD9B79A5B4D16447379A1" Guid="*">
<File Id="fil5FFABBF4B17F9CB6DC30FB21B11A1B3F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.Data.OData.dll" />
</Component>
<Component Id="cmpCD008CF1C7D17EBD72102BD129C9372C" Guid="*">
<File Id="filAE03B936A9EEBD6BA395089F817FD5A0" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.Data.Services.Client.dll" />
</Component>
<Component Id="cmpD542C61584E161A92D52490818D7E34A" Guid="*">
<File Id="filC47A710583991C8D624107A3F8EBDD72" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
</Component>
Expand Down Expand Up @@ -1331,9 +1322,6 @@
<Component Id="cmpD29EA01597258746011AE6EF9FC3D15A" Guid="*">
<File Id="filCE0262D8D43EF7AB4CDB25A0752B7121" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\System.Net.Http.Primitives.dll" />
</Component>
<Component Id="cmp8EE8340753317C13D69F692E7E42B175" Guid="*">
<File Id="filAE60D28516977FE205BBEB3D15EB53DE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.KeyVault\System.Spatial.dll" />
</Component>
</Directory>
<Directory Id="dir76147B1D381C34B7638F2A844B5685DC" Name="AzureRM.Network">
<Component Id="cmp33F39A22183184A6B41F85DF085BAD29" Guid="*">
Expand Down Expand Up @@ -5054,9 +5042,6 @@
<ComponentRef Id="cmpD1A5B61C7046E3D9D8256C632EED70EF" />
<ComponentRef Id="cmpFD1FF637F9EDD0BF88DE235BB7C878F2" />
<ComponentRef Id="cmp1C7EFB238F49BC10B88911B4DD7CD760" />
<ComponentRef Id="cmpF469AE6EA612B0399957FAF85083221B" />
<ComponentRef Id="cmp28D6E7B5DF1FD9B79A5B4D16447379A1" />
<ComponentRef Id="cmpCD008CF1C7D17EBD72102BD129C9372C" />
<ComponentRef Id="cmpD542C61584E161A92D52490818D7E34A" />
<ComponentRef Id="cmp0EE8FCFA5508960593F3537443DACD4E" />
<ComponentRef Id="cmp6D51C798EDF35CEA322D396B85FB8E18" />
Expand All @@ -5070,7 +5055,6 @@
<ComponentRef Id="cmp8F99791178CB394FC285BF5F9DA21047" />
<ComponentRef Id="cmp55A0977CC2E4CD91F6738FFD78449307" />
<ComponentRef Id="cmpD29EA01597258746011AE6EF9FC3D15A" />
<ComponentRef Id="cmp8EE8340753317C13D69F692E7E42B175" />
<ComponentRef Id="cmp33F39A22183184A6B41F85DF085BAD29" />
<ComponentRef Id="cmp70B60DBD32D61BCA5715AB2D64131358" />
<ComponentRef Id="cmp92653399A1E9659661E74CA982C1D16A" />
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '1.0.1'
ModuleVersion = '1.1.0'

# ID used to uniquely identify this module
GUID = 'fa236c1f-6464-4d6a-a48d-db47c0e7923d'
Expand Down
14 changes: 10 additions & 4 deletions src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@
<Reference Include="Microsoft.Azure.Management.Authorization">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.1.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.1.0.0\lib\net40\Microsoft.Azure.Management.KeyVault.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common.NetFramework">
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.1.0.1\lib\net40\Microsoft.Azure.Management.KeyVault.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.7-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
Expand Down Expand Up @@ -257,6 +257,12 @@
<None Include="SessionRecords\Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests\TestModifyAccessPolicyEnabledForDeployment.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests\TestModifyAccessPolicyEnabledForDiskEncryption.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests\TestModifyAccessPolicyEnabledForTemplateDeployment.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests\TestRecreateVaultFails.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down
48 changes: 48 additions & 0 deletions src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,54 @@ public void TestModifyAccessPolicyEnabledForDeployment()
}


[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestModifyAccessPolicyEnabledForTemplateDeployment()
{
string upn = "";

_data.ResetPreCreatedVault();
KeyVaultManagementController.NewInstance.RunPsTestWorkflow(
() =>
{
return new[] { string.Format("{0} {1} {2} {3}", "Test-ModifyAccessPolicyEnabledForTemplateDeployment", _data.preCreatedVault, _data.resourceGroupName, upn) };
},
(env) =>
{
Initialize();
upn = GetUser(env.GetTestEnvironment());
},
null,
TestUtilities.GetCallingClass(),
TestUtilities.GetCurrentMethodName()
);
}


[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestModifyAccessPolicyEnabledForDiskEncryption()
{
string upn = "";

_data.ResetPreCreatedVault();
KeyVaultManagementController.NewInstance.RunPsTestWorkflow(
() =>
{
return new[] { string.Format("{0} {1} {2} {3}", "Test-ModifyAccessPolicyEnabledForDiskEncryption", _data.preCreatedVault, _data.resourceGroupName, upn) };
},
(env) =>
{
Initialize();
upn = GetUser(env.GetTestEnvironment());
},
null,
TestUtilities.GetCallingClass(),
TestUtilities.GetCurrentMethodName()
);
}


[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestModifyAccessPolicyNegativeCases()
Expand Down
53 changes: 44 additions & 9 deletions ...eManager/KeyVault/Commands.KeyVault.Test/Scripts/ControlPlane/KeyVaultManagementTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ function Test-ModifyAccessPolicyEnabledForDeployment
Assert-AreEqual 0 $vault.AccessPolicies.Count
Assert-AreEqual $false $vault.EnabledForDeployment

# Set and Remove EnabledForDeployment, without any other permissions
# Set and Remove EnabledForDeployment
$vault = Set-AzureRmKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -EnabledForDeployment -PassThru
Assert-NotNull $vault
Assert-AreEqual 0 $vault.AccessPolicies.Count
Expand All @@ -449,17 +449,52 @@ function Test-ModifyAccessPolicyEnabledForDeployment
Assert-NotNull $vault
Assert-AreEqual 0 $vault.AccessPolicies.Count
Assert-AreEqual $false $vault.EnabledForDeployment
}

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

$vault = Remove-AzureRmKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -EnabledForDeployment -ObjectId $vault.AccessPolicies[0].ObjectId -PassThru
# Set and Remove EnabledForTemplateDeployment
$vault = Set-AzureRmKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -EnabledForTemplateDeployment -PassThru
Assert-NotNull $vault
Assert-AreEqual 0 $vault.AccessPolicies.Count
Assert-AreEqual $false $vault.EnabledForDeployment
Assert-AreEqual $true $vault.EnabledForTemplateDeployment

$vault = Remove-AzureRmKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -EnabledForTemplateDeployment -PassThru
Assert-NotNull $vault
Assert-AreEqual 0 $vault.AccessPolicies.Count
Assert-AreEqual $false $vault.EnabledForTemplateDeployment
}

function Test-ModifyAccessPolicyEnabledForDiskEncryption
{
Param($existingVaultName, $rgName, $upn)
$vault = Get-AzureRmKeyVault -VaultName $existingVaultName -ResourceGroupName $rgName
Assert-NotNull $vault
Assert-AreEqual 0 $vault.AccessPolicies.Count
if ($vault.EnabledForDiskEncryption -ne $null)
{
Assert-AreEqual $false $vault.EnabledForDiskEncryption
}

# Set and Remove EnabledForDiskEncryption
$vault = Set-AzureRmKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -EnabledForDiskEncryption -PassThru
Assert-NotNull $vault
Assert-AreEqual 0 $vault.AccessPolicies.Count
Assert-AreEqual $true $vault.EnabledForDiskEncryption

$vault = Remove-AzureRmKeyVaultAccessPolicy -VaultName $existingVaultName -ResourceGroupName $rgName -EnabledForDiskEncryption -PassThru
Assert-NotNull $vault
Assert-AreEqual 0 $vault.AccessPolicies.Count
Assert-AreEqual $false $vault.EnabledForDiskEncryption
}

function Test-ModifyAccessPolicyNegativeCases
Expand Down
14 changes: 14 additions & 0 deletions src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/VaultManagementTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,20 @@ function Test_ModifyAccessPolicyEnabledForDeployment
Test-ModifyAccessPolicyEnabledForDeployment $global:precreatedVaultName $global:resourceGroupName $user
}

function Test_ModifyAccessPolicyEnabledForTemplateDeployment
{
$user = (Get-AzureRmSubscription -Current).DefaultAccount
Reset-PreCreatedVault
Test-ModifyAccessPolicyEnabledForTemplateDeployment $global:precreatedVaultName $global:resourceGroupName $user
}

function Test_ModifyAccessPolicyEnabledForDiskEncryption
{
$user = (Get-AzureRmSubscription -Current).DefaultAccount
Reset-PreCreatedVault
Test-ModifyAccessPolicyEnabledForDiskEncryption $global:precreatedVaultName $global:resourceGroupName $user
}

function Test_ModifyAccessPolicyNegativeCases
{
$user = (Get-AzureRmSubscription -Current).DefaultAccount
Expand Down
183 changes: 96 additions & 87 deletions ....KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestCreateDeleteVaultWithPiping.json
View file
Open in desktop

Large diffs are not rendered by default.

108 changes: 57 additions & 51 deletions ....ScenarioTests.KeyVaultManagementTests/TestCreateNewPremiumVaultEnabledForDeployment.json
View file
Open in desktop

Large diffs are not rendered by default.

131 changes: 70 additions & 61 deletions ...zure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestCreateNewVault.json
View file
Open in desktop

Large diffs are not rendered by default.

81 changes: 42 additions & 39 deletions ...Vault.Test.ScenarioTests.KeyVaultManagementTests/TestCreateVaultInUnknownResGrpFails.json
View file
Open in desktop

Large diffs are not rendered by default.

106 changes: 56 additions & 50 deletions ....KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestCreateVaultPositionalParams.json
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions ...ands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestDeleteUnknownVaultFails.json
View file
Open in desktop

Large diffs are not rendered by default.

152 changes: 79 additions & 73 deletions ...e.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestDeleteVaultByName.json
View file
Open in desktop

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions ...ommands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestGetUnknownVaultFails.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"Entries": [
{
"RequestUri": "/subscriptions/31bdf18e-b058-4d3a-838c-e123ac60bc43/resourceGroups/pshtestrg6355/providers/Microsoft.KeyVault/vaults/onesdk7870?api-version=2015-06-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMzFiZGYxOGUtYjA1OC00ZDNhLTgzOGMtZTEyM2FjNjBiYzQzL3Jlc291cmNlR3JvdXBzL3BzaHRlc3RyZzYzNTUvcHJvdmlkZXJzL01pY3Jvc29mdC5LZXlWYXVsdC92YXVsdHMvb25lc2RrNzg3MD9hcGktdmVyc2lvbj0yMDE1LTA2LTAx",
"RequestUri": "/subscriptions/4fbe2810-8ec4-4443-88f4-1d0a6a212d02/resourceGroups/pshtestrg9281/providers/Microsoft.KeyVault/vaults/onesdk2286?api-version=2015-06-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNGZiZTI4MTAtOGVjNC00NDQzLTg4ZjQtMWQwYTZhMjEyZDAyL3Jlc291cmNlR3JvdXBzL3BzaHRlc3RyZzkyODEvcHJvdmlkZXJzL01pY3Jvc29mdC5LZXlWYXVsdC92YXVsdHMvb25lc2RrMjI4Nj9hcGktdmVyc2lvbj0yMDE1LTA2LTAx",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
"User-Agent": [
"Microsoft.Azure.Management.KeyVault.KeyVaultManagementClient/1.0.0.0"
]
},
"ResponseBody": "{\r\n \"error\": {\r\n \"code\": \"ResourceNotFound\",\r\n \"message\": \"Resource not found.\"\r\n }\r\n}",
"ResponseBody": "{\r\n \"error\": {\r\n \"code\": \"ResourceNotFound\",\r\n \"message\": \"The Resource 'Microsoft.KeyVault/vaults/onesdk2286' under resource group 'pshtestrg9281' was not found.\"\r\n }\r\n}",
"ResponseHeaders": {
"Content-Length": [
"69"
"153"
],
"Content-Type": [
"application/json; charset=utf-8"
Expand All @@ -28,13 +28,13 @@
"gateway"
],
"x-ms-request-id": [
"0f52801c-f573-4c34-a1a0-bc7b6ac163ba"
"d490e1bd-cc07-45bb-bcdc-57d95d7aa4a6"
],
"x-ms-correlation-request-id": [
"0f52801c-f573-4c34-a1a0-bc7b6ac163ba"
"d490e1bd-cc07-45bb-bcdc-57d95d7aa4a6"
],
"x-ms-routing-request-id": [
"WESTUS:20150616T173827Z:0f52801c-f573-4c34-a1a0-bc7b6ac163ba"
"WESTUS:20151106T004524Z:d490e1bd-cc07-45bb-bcdc-57d95d7aa4a6"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
Expand All @@ -43,24 +43,24 @@
"no-cache"
],
"Date": [
"Tue, 16 Jun 2015 17:38:27 GMT"
"Fri, 06 Nov 2015 00:45:24 GMT"
]
},
"StatusCode": 404
}
],
"Names": {
"Test-GetUnknownVaultFails": [
"onesdk7870"
"onesdk2286"
]
},
"Variables": {
"ResourceGroupName": "pshtestrg6355",
"ResourceGroupName": "pshtestrg9281",
"Location": "northcentralus",
"PreCreatedVault": "pshtestvault4651",
"SubscriptionId": "31bdf18e-b058-4d3a-838c-e123ac60bc43",
"TenantId": "8448c020-6abd-43d5-8ebc-410f7b59ffa9",
"Domain": "keyvaultsdktestdg.onmicrosoft.com",
"User": "keyvaultsdktester1@keyvaultsdktestdg.onmicrosoft.com"
"PreCreatedVault": "pshtestvault7095",
"SubscriptionId": "4fbe2810-8ec4-4443-88f4-1d0a6a212d02",
"TenantId": "dab60df3-eb31-470e-9aa7-0bb580c2624c",
"Domain": "mstestkeyvaultoutlook.onmicrosoft.com",
"User": "testuser@mstestkeyvaultoutlook.onmicrosoft.com"
}
}
48 changes: 24 additions & 24 deletions ...zure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestGetVaultByName.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading