Skip to content

Commit 888646d

Browse files
cormacpaynecormacpayne
authored
Merge pull request #6027 from maddieclayton/mergekv
Merge KeyVault_preview to preview
2 parents 1a87746 + 278d252 commit 888646d

File tree

165 files changed

+6342
-2886
lines changed

Some content is hidden

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

165 files changed

+6342
-2886
lines changed

‎src/ResourceManager/Compute/Commands.Compute/Commands.Compute.Netcore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<ItemGroup>
3030
<PackageReference Include="AutoMapper" Version="6.2.2" />
3131
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="18.0.0" />
32-
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.3.0-preview" />
32+
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.1-alpha" />
3333
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.1" />
3434
</ItemGroup>
3535

‎src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<Private>True</Private>
5858
</Reference>
5959
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
60-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.3.0-preview\lib\net452\Microsoft.Azure.Management.KeyVault.dll</HintPath>
60+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.4.1-alpha\lib\net452\Microsoft.Azure.Management.KeyVault.dll</HintPath>
6161
<Private>True</Private>
6262
</Reference>
6363
<Reference Include="Microsoft.Azure.Management.Storage">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="AutoMapper" version="6.0.2" targetFramework="net452" />
44
<package id="Microsoft.Azure.Management.Compute" version="18.0.0" targetFramework="net452" />
5-
<package id="Microsoft.Azure.Management.KeyVault" version="2.3.0-preview" targetFramework="net452" />
5+
<package id="Microsoft.Azure.Management.KeyVault" version="2.4.1-alpha" targetFramework="net452" />
66
<package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
77
<package id="WindowsAzure.Storage" version="8.1.1" targetFramework="net452" />
88
</packages>

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

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -74,50 +74,54 @@ NestedModules = @('.\Microsoft.Azure.Commands.KeyVault.dll')
7474
FunctionsToExport = @()
7575

7676
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
77-
CmdletsToExport = 'Add-AzureKeyVaultCertificate',
78-
'Set-AzureKeyVaultCertificateAttribute',
79-
'Stop-AzureKeyVaultCertificateOperation',
80-
'Get-AzureKeyVaultCertificateOperation',
81-
'Import-AzureKeyVaultCertificate',
82-
'Add-AzureKeyVaultCertificateContact',
83-
'Get-AzureKeyVaultCertificate',
84-
'Get-AzureKeyVaultCertificateContact',
85-
'Get-AzureKeyVaultCertificateIssuer',
86-
'New-AzureKeyVaultCertificatePolicy',
87-
'Remove-AzureKeyVaultCertificate',
88-
'Remove-AzureKeyVaultCertificateContact',
89-
'Remove-AzureKeyVaultCertificateIssuer',
90-
'Remove-AzureKeyVaultCertificateOperation',
91-
'Set-AzureKeyVaultCertificateIssuer',
92-
'Set-AzureKeyVaultCertificatePolicy', 'Get-AzureRmKeyVault',
93-
'New-AzureRmKeyVault', 'Remove-AzureRmKeyVault',
94-
'Undo-AzureRmKeyVaultRemoval', 'Remove-AzureRmKeyVaultAccessPolicy',
95-
'Set-AzureRmKeyVaultAccessPolicy', 'Backup-AzureKeyVaultKey',
96-
'Get-AzureKeyVaultKey', 'Get-AzureKeyVaultSecret',
97-
'Undo-AzureKeyVaultKeyRemoval', 'Undo-AzureKeyVaultSecretRemoval',
98-
'Add-AzureKeyVaultKey', 'Remove-AzureKeyVaultKey',
99-
'Remove-AzureKeyVaultSecret', 'Restore-AzureKeyVaultKey',
100-
'Set-AzureKeyVaultKeyAttribute', 'Set-AzureKeyVaultSecret',
101-
'Set-AzureKeyVaultSecretAttribute',
102-
'Get-AzureKeyVaultCertificatePolicy',
103-
'New-AzureKeyVaultCertificateAdministratorDetails',
104-
'New-AzureKeyVaultCertificateOrganizationDetails',
105-
'Backup-AzureKeyVaultSecret', 'Restore-AzureKeyVaultSecret',
106-
'Get-AzureKeyVaultManagedStorageAccount',
107-
'Add-AzureKeyVaultManagedStorageAccount',
108-
'Remove-AzureKeyVaultManagedStorageAccount',
109-
'Update-AzureKeyVaultManagedStorageAccount',
110-
'Update-AzureKeyVaultManagedStorageAccountKey',
111-
'Get-AzureKeyVaultManagedStorageSasDefinition',
112-
'Set-AzureKeyVaultManagedStorageSasDefinition',
113-
'Remove-AzureKeyVaultManagedStorageSasDefinition',
114-
'Undo-AzureKeyVaultCertificateRemoval'
77+
CmdletsToExport = 'Add-AzureKeyVaultCertificate', 'Update-AzureKeyVaultCertificate',
78+
'Stop-AzureKeyVaultCertificateOperation',
79+
'Get-AzureKeyVaultCertificateOperation',
80+
'Import-AzureKeyVaultCertificate',
81+
'Add-AzureKeyVaultCertificateContact',
82+
'Get-AzureKeyVaultCertificate',
83+
'Get-AzureKeyVaultCertificateContact',
84+
'Get-AzureKeyVaultCertificateIssuer',
85+
'New-AzureKeyVaultCertificatePolicy',
86+
'Remove-AzureKeyVaultCertificate',
87+
'Remove-AzureKeyVaultCertificateContact',
88+
'Remove-AzureKeyVaultCertificateIssuer',
89+
'Remove-AzureKeyVaultCertificateOperation',
90+
'Set-AzureKeyVaultCertificateIssuer',
91+
'Set-AzureKeyVaultCertificatePolicy', 'Get-AzureRmKeyVault',
92+
'New-AzureRmKeyVault', 'Remove-AzureRmKeyVault',
93+
'Undo-AzureRmKeyVaultRemoval', 'Remove-AzureRmKeyVaultAccessPolicy',
94+
'Set-AzureRmKeyVaultAccessPolicy', 'Backup-AzureKeyVaultKey',
95+
'Get-AzureKeyVaultKey', 'Get-AzureKeyVaultSecret',
96+
'Undo-AzureKeyVaultKeyRemoval', 'Undo-AzureKeyVaultSecretRemoval',
97+
'Add-AzureKeyVaultKey', 'Remove-AzureKeyVaultKey',
98+
'Remove-AzureKeyVaultSecret', 'Restore-AzureKeyVaultKey',
99+
'Update-AzureKeyVaultKey', 'Set-AzureKeyVaultSecret',
100+
'Update-AzureKeyVaultSecret', 'Get-AzureKeyVaultCertificatePolicy',
101+
'New-AzureKeyVaultCertificateAdministratorDetails',
102+
'New-AzureKeyVaultCertificateOrganizationDetails',
103+
'Backup-AzureKeyVaultSecret', 'Restore-AzureKeyVaultSecret',
104+
'Get-AzureKeyVaultManagedStorageAccount',
105+
'Add-AzureKeyVaultManagedStorageAccount',
106+
'Remove-AzureKeyVaultManagedStorageAccount',
107+
'Update-AzureKeyVaultManagedStorageAccount',
108+
'Update-AzureKeyVaultManagedStorageAccountKey',
109+
'Get-AzureKeyVaultManagedStorageSasDefinition',
110+
'Set-AzureKeyVaultManagedStorageSasDefinition',
111+
'Remove-AzureKeyVaultManagedStorageSasDefinition',
112+
'Undo-AzureKeyVaultCertificateRemoval',
113+
'Backup-AzureKeyVaultCertificate', 'Restore-AzureKeyVaultCertificate',
114+
'Backup-AzureKeyVaultManagedStorageAccount', 'Restore-AzureKeyVaultManagedStorageAccount',
115+
'Undo-AzureKeyVaultManagedStorageSasDefinitionRemoval',
116+
'Undo-AzureKeyVaultManagedStorageAccountRemoval'
115117

116118
# Variables to export from this module
117119
# VariablesToExport = @()
118120

119121
# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
120-
AliasesToExport = 'Set-AzureKeyVaultKey'
122+
AliasesToExport = 'Set-AzureKeyVaultKey', 'Set-AzureKeyVaultSecretAttribute',
123+
'Set-AzureKeyVaultKeyAttribute',
124+
'Set-AzureKeyVaultCertificateAttribute'
121125

122126
# DSC resources to export from this module
123127
# DscResourcesToExport = @()

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ NestedModules = @('.\Microsoft.Azure.Commands.KeyVault.dll')
7777
FunctionsToExport = @()
7878

7979
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
80-
CmdletsToExport = 'Add-AzureKeyVaultCertificate',
81-
'Set-AzureKeyVaultCertificateAttribute',
80+
CmdletsToExport = 'Add-AzureKeyVaultCertificate', 'Update-AzureKeyVaultCertificate',
8281
'Stop-AzureKeyVaultCertificateOperation',
8382
'Get-AzureKeyVaultCertificateOperation',
8483
'Import-AzureKeyVaultCertificate',
@@ -100,9 +99,8 @@ CmdletsToExport = 'Add-AzureKeyVaultCertificate',
10099
'Undo-AzureKeyVaultKeyRemoval', 'Undo-AzureKeyVaultSecretRemoval',
101100
'Add-AzureKeyVaultKey', 'Remove-AzureKeyVaultKey',
102101
'Remove-AzureKeyVaultSecret', 'Restore-AzureKeyVaultKey',
103-
'Set-AzureKeyVaultKeyAttribute', 'Set-AzureKeyVaultSecret',
104-
'Set-AzureKeyVaultSecretAttribute',
105-
'Get-AzureKeyVaultCertificatePolicy',
102+
'Update-AzureKeyVaultKey', 'Set-AzureKeyVaultSecret',
103+
'Update-AzureKeyVaultSecret', 'Get-AzureKeyVaultCertificatePolicy',
106104
'New-AzureKeyVaultCertificateAdministratorDetails',
107105
'New-AzureKeyVaultCertificateOrganizationDetails',
108106
'Backup-AzureKeyVaultSecret', 'Restore-AzureKeyVaultSecret',
@@ -114,13 +112,19 @@ CmdletsToExport = 'Add-AzureKeyVaultCertificate',
114112
'Get-AzureKeyVaultManagedStorageSasDefinition',
115113
'Set-AzureKeyVaultManagedStorageSasDefinition',
116114
'Remove-AzureKeyVaultManagedStorageSasDefinition',
117-
'Undo-AzureKeyVaultCertificateRemoval'
115+
'Undo-AzureKeyVaultCertificateRemoval',
116+
'Backup-AzureKeyVaultCertificate', 'Restore-AzureKeyVaultCertificate',
117+
'Backup-AzureKeyVaultManagedStorageAccount', 'Restore-AzureKeyVaultManagedStorageAccount',
118+
'Undo-AzureKeyVaultManagedStorageSasDefinitionRemoval',
119+
'Undo-AzureKeyVaultManagedStorageAccountRemoval'
118120

119121
# Variables to export from this module
120122
# VariablesToExport = @()
121123

122124
# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
123-
AliasesToExport = 'Set-AzureKeyVaultKey'
125+
AliasesToExport = 'Set-AzureKeyVaultKey', 'Set-AzureKeyVaultSecretAttribute',
126+
'Set-AzureKeyVaultKeyAttribute',
127+
'Set-AzureKeyVaultCertificateAttribute'
124128

125129
# DSC resources to export from this module
126130
# DscResourcesToExport = @()

‎src/ResourceManager/KeyVault/ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
- Additional information about change #1
1919
-->
2020
## Current Release
21+
* Breaking changes to support piping scenarios
22+
* Added new cmdlets: Backup/Restore-AzureKeyVaultManagedStorageAccount, Backup/Restore-AzureKeyVaultCertificate, Undo-AzureKeyVaultManagedStorageSasDefinitionRemoval, and Undo-AzureKeyVaultManagedStorageAccountRemoval
2123
* Set minimum dependency of module to PowerShell 5.0
2224

2325
## Version 4.3.0

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,10 @@
6666
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.3.4.0-preview\lib\net452\Microsoft.Azure.Graph.RBAC.dll</HintPath>
6767
</Reference>
6868
<Reference Include="Microsoft.Azure.KeyVault">
69-
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.2.3.2\lib\net452\Microsoft.Azure.KeyVault.dll</HintPath>
70-
<Private>True</Private>
69+
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.3.0.0-alpha\lib\net452\Microsoft.Azure.KeyVault.dll</HintPath>
7170
</Reference>
7271
<Reference Include="Microsoft.Azure.KeyVault.WebKey">
73-
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.WebKey.2.0.7\lib\net452\Microsoft.Azure.KeyVault.WebKey.dll</HintPath>
74-
<Private>True</Private>
72+
<HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.WebKey.3.0.0-alpha\lib\net452\Microsoft.Azure.KeyVault.WebKey.dll</HintPath>
7573
</Reference>
7674
<Reference Include="Microsoft.Azure.Management.Authorization">
7775
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
@@ -80,9 +78,8 @@
8078
<Reference Include="Microsoft.Azure.Common.NetFramework">
8179
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
8280
</Reference>
83-
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
84-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.3.0-preview\lib\net452\Microsoft.Azure.Management.KeyVault.dll</HintPath>
85-
<Private>True</Private>
81+
<Reference Include="Microsoft.Azure.Management.KeyVault">
82+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.4.1-alpha\lib\net452\Microsoft.Azure.Management.KeyVault.dll</HintPath>
8683
</Reference>
8784
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8885
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 1 addition & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1 @@
1-
{
2-
"Entries": [
3-
{
4-
"RequestUri": "/subscriptions/4fbe2810-8ec4-4443-88f4-1d0a6a212d02/resourceGroups/pshtestrg6477/providers/Microsoft.KeyVault/vaults/onesdk5122?api-version=2016-10-01",
5-
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNGZiZTI4MTAtOGVjNC00NDQzLTg4ZjQtMWQwYTZhMjEyZDAyL3Jlc291cmNlR3JvdXBzL3BzaHRlc3RyZzY0NzcvcHJvdmlkZXJzL01pY3Jvc29mdC5LZXlWYXVsdC92YXVsdHMvb25lc2RrNTEyMj9hcGktdmVyc2lvbj0yMDE2LTEwLTAx",
6-
"RequestMethod": "GET",
7-
"RequestBody": "",
8-
"RequestHeaders": {
9-
"x-ms-client-request-id": [
10-
"6cf4b48d-2199-411e-9374-6da673ba17a6"
11-
],
12-
"accept-language": [
13-
"en-US"
14-
],
15-
"User-Agent": [
16-
"FxVersion/4.6.1637.0",
17-
"OSName/Windows_10_Enterprise",
18-
"OSVersion/6.3.14393",
19-
"Microsoft.Azure.Management.KeyVault.KeyVaultManagementClient/2.2.0-preview"
20-
]
21-
},
22-
"ResponseBody": "{\r\n \"error\": {\r\n \"code\": \"ResourceNotFound\",\r\n \"message\": \"The Resource 'Microsoft.KeyVault/vaults/onesdk5122' under resource group 'pshtestrg6477' was not found.\"\r\n }\r\n}",
23-
"ResponseHeaders": {
24-
"Content-Length": [
25-
"153"
26-
],
27-
"Content-Type": [
28-
"application/json; charset=utf-8"
29-
],
30-
"Expires": [
31-
"-1"
32-
],
33-
"Pragma": [
34-
"no-cache"
35-
],
36-
"x-ms-failure-cause": [
37-
"gateway"
38-
],
39-
"x-ms-request-id": [
40-
"d5dd7dc9-cdbe-4399-8160-0fe653a251cc"
41-
],
42-
"x-ms-correlation-request-id": [
43-
"d5dd7dc9-cdbe-4399-8160-0fe653a251cc"
44-
],
45-
"x-ms-routing-request-id": [
46-
"WESTUS2:20170429T002509Z:d5dd7dc9-cdbe-4399-8160-0fe653a251cc"
47-
],
48-
"Strict-Transport-Security": [
49-
"max-age=31536000; includeSubDomains"
50-
],
51-
"Cache-Control": [
52-
"no-cache"
53-
],
54-
"Date": [
55-
"Sat, 29 Apr 2017 00:25:08 GMT"
56-
]
57-
},
58-
"StatusCode": 404
59-
}
60-
],
61-
"Names": {
62-
"Test-GetUnknownVaultFails": [
63-
"onesdk5122"
64-
]
65-
},
66-
"Variables": {
67-
"ResourceGroupName": "pshtestrg6477",
68-
"Location": "northcentralus",
69-
"PreCreatedVault": "pshtestvault7903",
70-
"SubscriptionId": "4fbe2810-8ec4-4443-88f4-1d0a6a212d02",
71-
"TenantId": "dab60df3-eb31-470e-9aa7-0bb580c2624c",
72-
"Domain": "mstestkeyvaultoutlook.onmicrosoft.com",
73-
"User": "[email protected]"
74-
}
75-
}
1+
{"Entries": [{"RequestUri": "/subscriptions/4fbe2810-8ec4-4443-88f4-1d0a6a212d02/resourceGroups/pshtestrg6477/providers/Microsoft.KeyVault/vaults/onesdk5122?api-version=2018-02-14-preview", "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNGZiZTI4MTAtOGVjNC00NDQzLTg4ZjQtMWQwYTZhMjEyZDAyL3Jlc291cmNlR3JvdXBzL3BzaHRlc3RyZzY0NzcvcHJvdmlkZXJzL01pY3Jvc29mdC5LZXlWYXVsdC92YXVsdHMvb25lc2RrNTEyMj9hcGktdmVyc2lvbj0yMDE4LTAyLTE0LXByZXZpZXc=", "RequestMethod": "GET", "RequestBody": "", "RequestHeaders": {"x-ms-client-request-id": ["6cf4b48d-2199-411e-9374-6da673ba17a6"], "accept-language": ["en-US"], "User-Agent": ["FxVersion/4.6.1637.0", "OSName/Windows_10_Enterprise", "OSVersion/6.3.14393", "Microsoft.Azure.Management.KeyVault.KeyVaultManagementClient/2.2.0-preview"]}, "ResponseBody": "{\r\n \"error\": {\r\n \"code\": \"ResourceNotFound\",\r\n \"message\": \"The Resource 'Microsoft.KeyVault/vaults/onesdk5122' under resource group 'pshtestrg6477' was not found.\"\r\n }\r\n}", "ResponseHeaders": {"Content-Length": ["153"], "Content-Type": ["application/json; charset=utf-8"], "Expires": ["-1"], "Pragma": ["no-cache"], "x-ms-failure-cause": ["gateway"], "x-ms-request-id": ["d5dd7dc9-cdbe-4399-8160-0fe653a251cc"], "x-ms-correlation-request-id": ["d5dd7dc9-cdbe-4399-8160-0fe653a251cc"], "x-ms-routing-request-id": ["WESTUS2:20170429T002509Z:d5dd7dc9-cdbe-4399-8160-0fe653a251cc"], "Strict-Transport-Security": ["max-age=31536000; includeSubDomains"], "Cache-Control": ["no-cache"], "Date": ["Sat, 29 Apr 2017 00:25:08 GMT"]}, "StatusCode": 404}], "Names": {"Test-GetUnknownVaultFails": ["onesdk5122"]}, "Variables": {"ResourceGroupName": "pshtestrg6477", "Location": "northcentralus", "PreCreatedVault": "pshtestvault7903", "SubscriptionId": "4fbe2810-8ec4-4443-88f4-1d0a6a212d02", "TenantId": "dab60df3-eb31-470e-9aa7-0bb580c2624c", "Domain": "mstestkeyvaultoutlook.onmicrosoft.com", "User": "[email protected]"}}

0 commit comments

Comments
 (0)