Merge KeyVault_preview to preview

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

@@ -29,7 +29,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="6.2.2" />
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="18.0.0" />
-    <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.3.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="2.4.1-alpha" />
     <PackageReference Include="System.ServiceModel.Primitives" Version="4.4.1" />
   </ItemGroup>
 

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

@@ -57,7 +57,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.3.0-preview\lib\net452\Microsoft.Azure.Management.KeyVault.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.4.1-alpha\lib\net452\Microsoft.Azure.Management.KeyVault.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Storage">

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

@@ -2,7 +2,7 @@
 <packages>
   <package id="AutoMapper" version="6.0.2" targetFramework="net452" />
   <package id="Microsoft.Azure.Management.Compute" version="18.0.0" targetFramework="net452" />
-  <package id="Microsoft.Azure.Management.KeyVault" version="2.3.0-preview" targetFramework="net452" />
+  <package id="Microsoft.Azure.Management.KeyVault" version="2.4.1-alpha" targetFramework="net452" />
   <package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
   <package id="WindowsAzure.Storage" version="8.1.1" targetFramework="net452" />
 </packages>

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

@@ -74,50 +74,54 @@ NestedModules = @('.\Microsoft.Azure.Commands.KeyVault.dll')
 FunctionsToExport = @()
 
 # 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.
-CmdletsToExport = 'Add-AzureKeyVaultCertificate', 
-    'Set-AzureKeyVaultCertificateAttribute', 
-    'Stop-AzureKeyVaultCertificateOperation', 
-    'Get-AzureKeyVaultCertificateOperation', 
-    'Import-AzureKeyVaultCertificate', 
-    'Add-AzureKeyVaultCertificateContact', 
-    'Get-AzureKeyVaultCertificate', 
-    'Get-AzureKeyVaultCertificateContact', 
-    'Get-AzureKeyVaultCertificateIssuer', 
-    'New-AzureKeyVaultCertificatePolicy', 
-    'Remove-AzureKeyVaultCertificate', 
-    'Remove-AzureKeyVaultCertificateContact', 
-    'Remove-AzureKeyVaultCertificateIssuer', 
-    'Remove-AzureKeyVaultCertificateOperation', 
-    'Set-AzureKeyVaultCertificateIssuer', 
-    'Set-AzureKeyVaultCertificatePolicy', 'Get-AzureRmKeyVault', 
-    'New-AzureRmKeyVault', 'Remove-AzureRmKeyVault', 
-    'Undo-AzureRmKeyVaultRemoval', 'Remove-AzureRmKeyVaultAccessPolicy', 
-    'Set-AzureRmKeyVaultAccessPolicy', 'Backup-AzureKeyVaultKey', 
-    'Get-AzureKeyVaultKey', 'Get-AzureKeyVaultSecret', 
-    'Undo-AzureKeyVaultKeyRemoval', 'Undo-AzureKeyVaultSecretRemoval', 
-    'Add-AzureKeyVaultKey', 'Remove-AzureKeyVaultKey', 
-    'Remove-AzureKeyVaultSecret', 'Restore-AzureKeyVaultKey', 
-    'Set-AzureKeyVaultKeyAttribute', 'Set-AzureKeyVaultSecret', 
-    'Set-AzureKeyVaultSecretAttribute', 
-    'Get-AzureKeyVaultCertificatePolicy', 
-    'New-AzureKeyVaultCertificateAdministratorDetails', 
-    'New-AzureKeyVaultCertificateOrganizationDetails', 
-    'Backup-AzureKeyVaultSecret', 'Restore-AzureKeyVaultSecret', 
-    'Get-AzureKeyVaultManagedStorageAccount', 
-    'Add-AzureKeyVaultManagedStorageAccount', 
-    'Remove-AzureKeyVaultManagedStorageAccount', 
-    'Update-AzureKeyVaultManagedStorageAccount', 
-    'Update-AzureKeyVaultManagedStorageAccountKey', 
-    'Get-AzureKeyVaultManagedStorageSasDefinition', 
-    'Set-AzureKeyVaultManagedStorageSasDefinition', 
-    'Remove-AzureKeyVaultManagedStorageSasDefinition', 
-    'Undo-AzureKeyVaultCertificateRemoval'
+CmdletsToExport = 'Add-AzureKeyVaultCertificate', 'Update-AzureKeyVaultCertificate', 
+               'Stop-AzureKeyVaultCertificateOperation', 
+               'Get-AzureKeyVaultCertificateOperation', 
+               'Import-AzureKeyVaultCertificate', 
+               'Add-AzureKeyVaultCertificateContact', 
+               'Get-AzureKeyVaultCertificate', 
+               'Get-AzureKeyVaultCertificateContact', 
+               'Get-AzureKeyVaultCertificateIssuer', 
+               'New-AzureKeyVaultCertificatePolicy', 
+               'Remove-AzureKeyVaultCertificate', 
+               'Remove-AzureKeyVaultCertificateContact', 
+               'Remove-AzureKeyVaultCertificateIssuer', 
+               'Remove-AzureKeyVaultCertificateOperation', 
+               'Set-AzureKeyVaultCertificateIssuer', 
+               'Set-AzureKeyVaultCertificatePolicy', 'Get-AzureRmKeyVault', 
+               'New-AzureRmKeyVault', 'Remove-AzureRmKeyVault', 
+               'Undo-AzureRmKeyVaultRemoval', 'Remove-AzureRmKeyVaultAccessPolicy', 
+               'Set-AzureRmKeyVaultAccessPolicy', 'Backup-AzureKeyVaultKey', 
+               'Get-AzureKeyVaultKey', 'Get-AzureKeyVaultSecret', 
+               'Undo-AzureKeyVaultKeyRemoval', 'Undo-AzureKeyVaultSecretRemoval', 
+               'Add-AzureKeyVaultKey', 'Remove-AzureKeyVaultKey', 
+               'Remove-AzureKeyVaultSecret', 'Restore-AzureKeyVaultKey', 
+               'Update-AzureKeyVaultKey', 'Set-AzureKeyVaultSecret', 
+               'Update-AzureKeyVaultSecret', 'Get-AzureKeyVaultCertificatePolicy', 
+               'New-AzureKeyVaultCertificateAdministratorDetails', 
+               'New-AzureKeyVaultCertificateOrganizationDetails', 
+               'Backup-AzureKeyVaultSecret', 'Restore-AzureKeyVaultSecret', 
+               'Get-AzureKeyVaultManagedStorageAccount', 
+               'Add-AzureKeyVaultManagedStorageAccount', 
+               'Remove-AzureKeyVaultManagedStorageAccount', 
+               'Update-AzureKeyVaultManagedStorageAccount', 
+               'Update-AzureKeyVaultManagedStorageAccountKey', 
+               'Get-AzureKeyVaultManagedStorageSasDefinition', 
+               'Set-AzureKeyVaultManagedStorageSasDefinition', 
+               'Remove-AzureKeyVaultManagedStorageSasDefinition', 
+               'Undo-AzureKeyVaultCertificateRemoval',
+               'Backup-AzureKeyVaultCertificate', 'Restore-AzureKeyVaultCertificate',
+               'Backup-AzureKeyVaultManagedStorageAccount', 'Restore-AzureKeyVaultManagedStorageAccount',
+               'Undo-AzureKeyVaultManagedStorageSasDefinitionRemoval',
+               'Undo-AzureKeyVaultManagedStorageAccountRemoval'
 
 # Variables to export from this module
 # VariablesToExport = @()
 
 # 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.
-AliasesToExport = 'Set-AzureKeyVaultKey'
+AliasesToExport = 'Set-AzureKeyVaultKey', 'Set-AzureKeyVaultSecretAttribute', 
+               'Set-AzureKeyVaultKeyAttribute', 
+               'Set-AzureKeyVaultCertificateAttribute'
 
 # DSC resources to export from this module
 # DscResourcesToExport = @()

src/ResourceManager/KeyVault/AzureRM.KeyVault.psd1

@@ -77,8 +77,7 @@ NestedModules = @('.\Microsoft.Azure.Commands.KeyVault.dll')
 FunctionsToExport = @()
 
 # 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.
-CmdletsToExport = 'Add-AzureKeyVaultCertificate', 
-               'Set-AzureKeyVaultCertificateAttribute', 
+CmdletsToExport = 'Add-AzureKeyVaultCertificate', 'Update-AzureKeyVaultCertificate', 
                'Stop-AzureKeyVaultCertificateOperation', 
                'Get-AzureKeyVaultCertificateOperation', 
                'Import-AzureKeyVaultCertificate', 
@@ -100,9 +99,8 @@ CmdletsToExport = 'Add-AzureKeyVaultCertificate',
                'Undo-AzureKeyVaultKeyRemoval', 'Undo-AzureKeyVaultSecretRemoval', 
                'Add-AzureKeyVaultKey', 'Remove-AzureKeyVaultKey', 
                'Remove-AzureKeyVaultSecret', 'Restore-AzureKeyVaultKey', 
-               'Set-AzureKeyVaultKeyAttribute', 'Set-AzureKeyVaultSecret', 
-               'Set-AzureKeyVaultSecretAttribute', 
-               'Get-AzureKeyVaultCertificatePolicy', 
+               'Update-AzureKeyVaultKey', 'Set-AzureKeyVaultSecret', 
+               'Update-AzureKeyVaultSecret', 'Get-AzureKeyVaultCertificatePolicy', 
                'New-AzureKeyVaultCertificateAdministratorDetails', 
                'New-AzureKeyVaultCertificateOrganizationDetails', 
                'Backup-AzureKeyVaultSecret', 'Restore-AzureKeyVaultSecret', 
@@ -114,13 +112,19 @@ CmdletsToExport = 'Add-AzureKeyVaultCertificate',
                'Get-AzureKeyVaultManagedStorageSasDefinition', 
                'Set-AzureKeyVaultManagedStorageSasDefinition', 
                'Remove-AzureKeyVaultManagedStorageSasDefinition', 
-               'Undo-AzureKeyVaultCertificateRemoval'
+               'Undo-AzureKeyVaultCertificateRemoval',
+               'Backup-AzureKeyVaultCertificate', 'Restore-AzureKeyVaultCertificate',
+               'Backup-AzureKeyVaultManagedStorageAccount', 'Restore-AzureKeyVaultManagedStorageAccount',
+               'Undo-AzureKeyVaultManagedStorageSasDefinitionRemoval',
+               'Undo-AzureKeyVaultManagedStorageAccountRemoval'
 
 # Variables to export from this module
 # VariablesToExport = @()
 
 # 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.
-AliasesToExport = 'Set-AzureKeyVaultKey'
+AliasesToExport = 'Set-AzureKeyVaultKey', 'Set-AzureKeyVaultSecretAttribute', 
+               'Set-AzureKeyVaultKeyAttribute', 
+               'Set-AzureKeyVaultCertificateAttribute'
 
 # DSC resources to export from this module
 # DscResourcesToExport = @()

src/ResourceManager/KeyVault/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Breaking changes to support piping scenarios
+* Added new cmdlets: Backup/Restore-AzureKeyVaultManagedStorageAccount, Backup/Restore-AzureKeyVaultCertificate, Undo-AzureKeyVaultManagedStorageSasDefinitionRemoval, and Undo-AzureKeyVaultManagedStorageAccountRemoval
 * Set minimum dependency of module to PowerShell 5.0
 
 ## Version 4.3.0

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

@@ -66,12 +66,10 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.3.4.0-preview\lib\net452\Microsoft.Azure.Graph.RBAC.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.KeyVault">
-      <HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.2.3.2\lib\net452\Microsoft.Azure.KeyVault.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.3.0.0-alpha\lib\net452\Microsoft.Azure.KeyVault.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.KeyVault.WebKey">
-      <HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.WebKey.2.0.7\lib\net452\Microsoft.Azure.KeyVault.WebKey.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.WebKey.3.0.0-alpha\lib\net452\Microsoft.Azure.KeyVault.WebKey.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Authorization">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
@@ -80,9 +78,8 @@
     <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=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.3.0-preview\lib\net452\Microsoft.Azure.Management.KeyVault.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Azure.Management.KeyVault">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.KeyVault.2.4.1-alpha\lib\net452\Microsoft.Azure.Management.KeyVault.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

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

@@ -1,75 +1 @@
-{
-  "Entries": [
-    {
-      "RequestUri": "/subscriptions/4fbe2810-8ec4-4443-88f4-1d0a6a212d02/resourceGroups/pshtestrg6477/providers/Microsoft.KeyVault/vaults/onesdk5122?api-version=2016-10-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNGZiZTI4MTAtOGVjNC00NDQzLTg4ZjQtMWQwYTZhMjEyZDAyL3Jlc291cmNlR3JvdXBzL3BzaHRlc3RyZzY0NzcvcHJvdmlkZXJzL01pY3Jvc29mdC5LZXlWYXVsdC92YXVsdHMvb25lc2RrNTEyMj9hcGktdmVyc2lvbj0yMDE2LTEwLTAx",
-      "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]"
-  }
-}
+{"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]"}}