Merge pull request Azure#1274 from seanbamsft/dev

Update Key Vault manual tests to handle Azure PowerShell 1.0 changes

Author: markcowl

src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/PSHCommon/Common.ps1

@@ -250,15 +250,6 @@ function Test-BinaryFile
 }
 
 
-<#
-.SYNOPSIS
-Removes all current subscriptions.
-#>
-function Remove-AllSubscriptions
-{
-    Get-AzureRmSubscription | Remove-AzureRmSubscription -Force
-}
-
 <#
 .SYNOPSIS
 Waits on the specified job with the given timeout.

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

@@ -97,7 +97,7 @@ function Test_DeleteUnknownVaultFails
 #------------------------------Set-AzureRmKeyVaultAccessPolicy--------------------------
 function Test_SetRemoveAccessPolicyByUPN
 {
-    $user = (Get-AzureRmSubscription -Current).DefaultAccount 
+    $user = (Get-AzureRmContext).Account.Id 
     Reset-PreCreatedVault
     Test-SetRemoveAccessPolicyByUPN $global:precreatedVaultName $global:resourceGroupName $user
 }
@@ -125,23 +125,23 @@ function Test_SetRemoveAccessPolicyBySPN
 
 function Test_SetRemoveAccessPolicyByObjectId
 {
-    $user = (Get-AzureRmSubscription -Current).DefaultAccount 
+    $user = (Get-AzureRmContext).Account.Id 
     Reset-PreCreatedVault
     Test-SetRemoveAccessPolicyByObjectId $global:precreatedVaultName $global:resourceGroupName $user
 }
 
 
 function Test_SetRemoveAccessPolicyByCompoundId
 {
-    $user = (Get-AzureRmSubscription -Current).DefaultAccount 
+    $user = (Get-AzureRmContext).Account.Id 
     $appId = [System.Guid]::NewGuid()
     Reset-PreCreatedVault
     Test-SetRemoveAccessPolicyByCompoundId $global:precreatedVaultName $global:resourceGroupName $user $appId
 }
 
 function Test_RemoveAccessPolicyWithCompoundIdPolicies
 {
-    $user = (Get-AzureRmSubscription -Current).DefaultAccount 
+    $user = (Get-AzureRmContext).Account.Id 
     $appId1 = [System.Guid]::NewGuid()
     $appId2 = [System.Guid]::NewGuid()
     Reset-PreCreatedVault
@@ -150,51 +150,51 @@ function Test_RemoveAccessPolicyWithCompoundIdPolicies
 
 function Test_SetCompoundIdAccessPolicy
 {
-    $user = (Get-AzureRmSubscription -Current).DefaultAccount 
+    $user = (Get-AzureRmContext).Account.Id 
     $appId = [System.Guid]::NewGuid()
     Reset-PreCreatedVault
     Test-SetCompoundIdAccessPolicy $global:precreatedVaultName $global:resourceGroupName $user $appId
 }
 
 function Test_ModifyAccessPolicy
 {
-    $user = (Get-AzureRmSubscription -Current).DefaultAccount 
+    $user = (Get-AzureRmContext).Account.Id 
     Reset-PreCreatedVault
     Test-ModifyAccessPolicy $global:precreatedVaultName $global:resourceGroupName $user
 }
 
 function Test_ModifyAccessPolicyEnabledForDeployment
 {
-    $user = (Get-AzureRmSubscription -Current).DefaultAccount 
+    $user = (Get-AzureRmContext).Account.Id 
     Reset-PreCreatedVault
     Test-ModifyAccessPolicyEnabledForDeployment $global:precreatedVaultName $global:resourceGroupName $user
 }
 
 function Test_ModifyAccessPolicyEnabledForTemplateDeployment
 {
-    $user = (Get-AzureRmSubscription -Current).DefaultAccount 
+    $user = (Get-AzureRmContext).Account.Id 
     Reset-PreCreatedVault
     Test-ModifyAccessPolicyEnabledForTemplateDeployment $global:precreatedVaultName $global:resourceGroupName $user
 }
 
 function Test_ModifyAccessPolicyEnabledForDiskEncryption
 {
-    $user = (Get-AzureRmSubscription -Current).DefaultAccount 
+    $user = (Get-AzureRmContext).Account.Id 
     Reset-PreCreatedVault
     Test-ModifyAccessPolicyEnabledForDiskEncryption $global:precreatedVaultName $global:resourceGroupName $user
 }
 
 function Test_ModifyAccessPolicyNegativeCases
 {
-    $user = (Get-AzureRmSubscription -Current).DefaultAccount 
+    $user = (Get-AzureRmContext).Account.Id 
     Reset-PreCreatedVault
     Test-ModifyAccessPolicyNegativeCases $global:precreatedVaultName $global:resourceGroupName $user
 }
 
 
 function Test_RemoveNonExistentAccessPolicyDoesNotThrow
 {
-    $user = (Get-AzureRmSubscription -Current).DefaultAccount 
+    $user = (Get-AzureRmContext).Account.Id 
     Reset-PreCreatedVault
     Test-RemoveNonExistentAccessPolicyDoesNotThrow $global:precreatedVaultName $global:resourceGroupName $user
 }
@@ -261,7 +261,7 @@ function Initialize-VaultTest
     }
     #create a vault using ARM    
     $vaultName = Get-VaultName $suffix
-    $tenantId = (Get-AzureRmSubscription -Current).TenantId
+    $tenantId = (Get-AzureRmContext).Tenant.TenantId
     $tagName = "testtag"
     $tagValue = "testvalue"
     $vaultId = @{
@@ -305,7 +305,7 @@ function Reset-PreCreatedVault
 { 
     $tagName = "testtag"
     $tagValue = "testvalue"
-    $tenantId = (Get-AzureRmSubscription -Current).TenantId
+    $tenantId = (Get-AzureRmContext).Tenant.TenantId
     $vaultProperties = @{
         "enabledForDeployment" = $false;
         "tenantId" = $tenantId;

src/ResourceManager/KeyVault/Commands.KeyVault/Properties/Resources.Designer.cs

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="ADObjectNotFound" xml:space="preserve">
-    <value>Cannot find the Active Directory object '{0}' in tenant '{1}'. Please make sure that the user or application service principal you are authorizing is registered in the current subscription's Azure Active directory. The TenantID displayed by the cmdlet 'get-AzureRmSubscription -current' is the current subscription's Azure Active directory.</value>
+    <value>Cannot find the Active Directory object '{0}' in tenant '{1}'. Please make sure that the user or application service principal you are authorizing is registered in the current subscription's Azure Active directory. The TenantID displayed by the cmdlet 'Get-AzureRmContext' is the current subscription's Azure Active directory.</value>
   </data>
   <data name="BackupKeyFileAlreadyExists" xml:space="preserve">
     <value>The backup key file '{0}' already exists.</value>
@@ -139,7 +139,7 @@
     <value>Invalid AzureEnvironment.</value>
   </data>
   <data name="InvalidCurrentSubscription" xml:space="preserve">
-    <value>No current subscription has been designated. Use Select-AzureRmSubscription -Current &lt;subscriptionName&gt; to set the current subscription.</value>
+    <value>No current subscription has been designated. Use Set-AzureRmContext -SubscriptionName &lt;subscriptionName&gt; to set the current subscription.</value>
   </data>
   <data name="InvalidKeyAttributes" xml:space="preserve">
     <value>Invalid key attributes</value>
@@ -175,7 +175,7 @@
     <value>Invalid secret uri '{0}'.</value>
   </data>
   <data name="InvalidSelectedSubscription" xml:space="preserve">
-    <value>No subscription is currently selected. Use Select-Subscription to activate a subscription.</value>
+    <value>No subscription is currently selected. Use Set-AzureRmContext to activate a subscription.</value>
   </data>
   <data name="InvalidSubscriptionState" xml:space="preserve">
     <value>Your Azure credentials have not been set up or have expired, please run Add-AzureRmAccount to set up your Azure credentials.</value>