Removed confirm impact to use default for Undo* and added an alias and fixed test

pomortaz · pomortaz · commit f069037de740 · 2017-04-28T17:34:05.000-07:00
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementTests.cs b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementTests.cs
@@ -182,7 +182,7 @@ public void TestGetVaultByNameCapitalized()
                 );
         }
 
-        [Fact(Skip = "The current SynchronizationContext may not be used as a TaskScheduler.")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetUnknownVaultFails()
         {
@@ -196,7 +196,7 @@ public void TestGetUnknownVaultFails()
 
         }
 
-        [Fact(Skip = "The current SynchronizationContext may not be used as a TaskScheduler.")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetVaultFromUnknownResourceGroupFails()
         {
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/SessionRecords/Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestGetUnknownVaultFails.json b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/SessionRecords/Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestGetUnknownVaultFails.json
@@ -1,22 +1,25 @@
 {
   "Entries": [
     {
-      "RequestUri": "/subscriptions/4fbe2810-8ec4-4443-88f4-1d0a6a212d02/resourceGroups/pshtestrg4931/providers/Microsoft.KeyVault/vaults/onesdk5008?api-version=2015-06-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNGZiZTI4MTAtOGVjNC00NDQzLTg4ZjQtMWQwYTZhMjEyZDAyL3Jlc291cmNlR3JvdXBzL3BzaHRlc3RyZzQ5MzEvcHJvdmlkZXJzL01pY3Jvc29mdC5LZXlWYXVsdC92YXVsdHMvb25lc2RrNTAwOD9hcGktdmVyc2lvbj0yMDE1LTA2LTAx",
+      "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": [
-          "decac27c-6ea5-462e-a64c-5979bdb2d9df"
+          "6cf4b48d-2199-411e-9374-6da673ba17a6"
         ],
         "accept-language": [
           "en-US"
         ],
         "User-Agent": [
-          "Microsoft.Azure.Management.KeyVault.KeyVaultManagementClient/2.0.0-preview"
+          "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/onesdk5008' under resource group 'pshtestrg4931' was not found.\"\r\n  }\r\n}",
+      "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"
@@ -34,13 +37,13 @@
           "gateway"
         ],
         "x-ms-request-id": [
-          "a2383a58-d9d4-47b2-a797-70c17d174a9c"
+          "d5dd7dc9-cdbe-4399-8160-0fe653a251cc"
         ],
         "x-ms-correlation-request-id": [
-          "a2383a58-d9d4-47b2-a797-70c17d174a9c"
+          "d5dd7dc9-cdbe-4399-8160-0fe653a251cc"
         ],
         "x-ms-routing-request-id": [
-          "WESTUS:20160714T204530Z:a2383a58-d9d4-47b2-a797-70c17d174a9c"
+          "WESTUS2:20170429T002509Z:d5dd7dc9-cdbe-4399-8160-0fe653a251cc"
         ],
         "Strict-Transport-Security": [
           "max-age=31536000; includeSubDomains"
@@ -49,21 +52,21 @@
           "no-cache"
         ],
         "Date": [
-          "Thu, 14 Jul 2016 20:45:30 GMT"
+          "Sat, 29 Apr 2017 00:25:08 GMT"
         ]
       },
       "StatusCode": 404
     }
   ],
   "Names": {
     "Test-GetUnknownVaultFails": [
-      "onesdk5008"
+      "onesdk5122"
     ]
   },
   "Variables": {
-    "ResourceGroupName": "pshtestrg4931",
+    "ResourceGroupName": "pshtestrg6477",
     "Location": "northcentralus",
-    "PreCreatedVault": "pshtestvault7685",
+    "PreCreatedVault": "pshtestvault7903",
     "SubscriptionId": "4fbe2810-8ec4-4443-88f4-1d0a6a212d02",
     "TenantId": "dab60df3-eb31-470e-9aa7-0bb580c2624c",
     "Domain": "mstestkeyvaultoutlook.onmicrosoft.com",
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/SessionRecords/Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestGetVaultFromUnknownResourceGroupFails.json b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/SessionRecords/Microsoft.Azure.Commands.KeyVault.Test.ScenarioTests.KeyVaultManagementTests/TestGetVaultFromUnknownResourceGroupFails.json
@@ -1,22 +1,25 @@
 {
   "Entries": [
     {
-      "RequestUri": "/subscriptions/4fbe2810-8ec4-4443-88f4-1d0a6a212d02/resourceGroups/onesdk9650/providers/Microsoft.KeyVault/vaults/pshtestvault7685?api-version=2015-06-01",
-      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNGZiZTI4MTAtOGVjNC00NDQzLTg4ZjQtMWQwYTZhMjEyZDAyL3Jlc291cmNlR3JvdXBzL29uZXNkazk2NTAvcHJvdmlkZXJzL01pY3Jvc29mdC5LZXlWYXVsdC92YXVsdHMvcHNodGVzdHZhdWx0NzY4NT9hcGktdmVyc2lvbj0yMDE1LTA2LTAx",
+      "RequestUri": "/subscriptions/4fbe2810-8ec4-4443-88f4-1d0a6a212d02/resourceGroups/onesdk2230/providers/Microsoft.KeyVault/vaults/pshtestvault31?api-version=2016-10-01",
+      "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNGZiZTI4MTAtOGVjNC00NDQzLTg4ZjQtMWQwYTZhMjEyZDAyL3Jlc291cmNlR3JvdXBzL29uZXNkazIyMzAvcHJvdmlkZXJzL01pY3Jvc29mdC5LZXlWYXVsdC92YXVsdHMvcHNodGVzdHZhdWx0MzE/YXBpLXZlcnNpb249MjAxNi0xMC0wMQ==",
       "RequestMethod": "GET",
       "RequestBody": "",
       "RequestHeaders": {
         "x-ms-client-request-id": [
-          "29157c8d-f404-4d9f-b3eb-c90b15386ebd"
+          "3b976bc1-c1bb-45cc-8832-88e753b32629"
         ],
         "accept-language": [
           "en-US"
         ],
         "User-Agent": [
-          "Microsoft.Azure.Management.KeyVault.KeyVaultManagementClient/2.0.0-preview"
+          "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\": \"ResourceGroupNotFound\",\r\n    \"message\": \"Resource group 'onesdk9650' could not be found.\"\r\n  }\r\n}",
+      "ResponseBody": "{\r\n  \"error\": {\r\n    \"code\": \"ResourceGroupNotFound\",\r\n    \"message\": \"Resource group 'onesdk2230' could not be found.\"\r\n  }\r\n}",
       "ResponseHeaders": {
         "Content-Length": [
           "102"
@@ -34,13 +37,13 @@
           "gateway"
         ],
         "x-ms-request-id": [
-          "e1eef3e3-a3f1-45bf-bddb-14e296620356"
+          "68098da2-4d21-4e20-a1e4-4803978fd581"
         ],
         "x-ms-correlation-request-id": [
-          "e1eef3e3-a3f1-45bf-bddb-14e296620356"
+          "68098da2-4d21-4e20-a1e4-4803978fd581"
         ],
         "x-ms-routing-request-id": [
-          "WESTUS:20160714T204517Z:e1eef3e3-a3f1-45bf-bddb-14e296620356"
+          "WESTUS2:20170429T003017Z:68098da2-4d21-4e20-a1e4-4803978fd581"
         ],
         "Strict-Transport-Security": [
           "max-age=31536000; includeSubDomains"
@@ -49,21 +52,21 @@
           "no-cache"
         ],
         "Date": [
-          "Thu, 14 Jul 2016 20:45:17 GMT"
+          "Sat, 29 Apr 2017 00:30:16 GMT"
         ]
       },
       "StatusCode": 404
     }
   ],
   "Names": {
     "Test-GetVaultFromUnknownResourceGroupFails": [
-      "onesdk9650"
+      "onesdk2230"
     ]
   },
   "Variables": {
-    "ResourceGroupName": "pshtestrg4931",
+    "ResourceGroupName": "pshtestrg7446",
     "Location": "northcentralus",
-    "PreCreatedVault": "pshtestvault7685",
+    "PreCreatedVault": "pshtestvault31",
     "SubscriptionId": "4fbe2810-8ec4-4443-88f4-1d0a6a212d02",
     "TenantId": "dab60df3-eb31-470e-9aa7-0bb580c2624c",
     "Domain": "mstestkeyvaultoutlook.onmicrosoft.com",
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/Constants.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/Constants.cs
@@ -3,7 +3,8 @@ namespace Microsoft.Azure.Commands.KeyVault
 {
     public static class Constants
     {
-        public const string KeyVaultHelpUri = "https://msdn.microsoft.com/en-us/library/dn868052.aspx";                
+        public const string KeyVaultHelpUri = "https://msdn.microsoft.com/en-us/library/dn868052.aspx";
+        public const string Name = "Name";
         public const string KeyName = "KeyName";
         public const string SecretName = "SecretName";
         public const string CertificateName = "CertificateName";
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/GetAzureKeyVault.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/GetAzureKeyVault.cs
@@ -52,6 +52,7 @@ public class GetAzureKeyVault : KeyVaultManagementCmdletBase
             Position = 0,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = "Vault name. Cmdlet constructs the FQDN of a vault based on the name and currently selected environment.")]
+        [Alias(Constants.Name)]
         [ValidateNotNullOrEmpty]
         public string VaultName { get; set; }
 
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/UndoAzureKeyVaultKeyRemoval.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/UndoAzureKeyVaultKeyRemoval.cs
@@ -19,7 +19,6 @@ namespace Microsoft.Azure.Commands.KeyVault
 {
     [Cmdlet(VerbsCommon.Undo, "AzureKeyVaultKeyRemoval",
     SupportsShouldProcess = true,
-    ConfirmImpact = ConfirmImpact.Low,
     HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(KeyBundle))]
     public class UndoAzureKeyVaultKeyRemoval : KeyVaultCmdletBase
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/UndoAzureKeyVaultRemoval.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/UndoAzureKeyVaultRemoval.cs
@@ -21,7 +21,6 @@ namespace Microsoft.Azure.Commands.KeyVault
 {
     [Cmdlet(VerbsCommon.Undo, "AzureRmKeyVaultRemoval",
         SupportsShouldProcess = true,
-        ConfirmImpact = ConfirmImpact.Low,
         HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(PSKeyVaultModels.PSVault))]
     public class UndoAzureKeyVaultRemoval : KeyVaultManagementCmdletBase
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/UndoAzureKeyVaultSecretRemoval.cs b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands/UndoAzureKeyVaultSecretRemoval.cs
@@ -19,7 +19,6 @@ namespace Microsoft.Azure.Commands.KeyVault
 {
     [Cmdlet(VerbsCommon.Undo, "AzureKeyVaultSecretRemoval",
     SupportsShouldProcess = true,
-    ConfirmImpact = ConfirmImpact.Low,
     HelpUri = Constants.KeyVaultHelpUri)]
     [OutputType(typeof(Secret))]
     public class UndoAzureKeyVaultSecretRemoval : KeyVaultCmdletBase

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public void TestGetVaultByNameCapitalized()`
`182`	`182`	`);`
`183`	`183`	`}`
`184`	`184`
`185`		`- [Fact(Skip = "The current SynchronizationContext may not be used as a TaskScheduler.")]`
	`185`	`+ [Fact]`
`186`	`186`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`187`	`187`	`public void TestGetUnknownVaultFails()`
`188`	`188`	`{`
`@@ -196,7 +196,7 @@ public void TestGetUnknownVaultFails()`
`196`	`196`
`197`	`197`	`}`
`198`	`198`
`199`		`- [Fact(Skip = "The current SynchronizationContext may not be used as a TaskScheduler.")]`
	`199`	`+ [Fact]`
`200`	`200`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`201`	`201`	`public void TestGetVaultFromUnknownResourceGroupFails()`
`202`	`202`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@ namespace Microsoft.Azure.Commands.KeyVault`
`3`	`3`	`{`
`4`	`4`	`public static class Constants`
`5`	`5`	`{`
`6`		`- public const string KeyVaultHelpUri = "https://msdn.microsoft.com/en-us/library/dn868052.aspx";`
	`6`	`+ public const string KeyVaultHelpUri = "https://msdn.microsoft.com/en-us/library/dn868052.aspx";`
	`7`	`+ public const string Name = "Name";`
`7`	`8`	`public const string KeyName = "KeyName";`
`8`	`9`	`public const string SecretName = "SecretName";`
`9`	`10`	`public const string CertificateName = "CertificateName";`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ namespace Microsoft.Azure.Commands.KeyVault`
`19`	`19`	`{`
`20`	`20`	`[Cmdlet(VerbsCommon.Undo, "AzureKeyVaultKeyRemoval",`
`21`	`21`	`SupportsShouldProcess = true,`
`22`		`- ConfirmImpact = ConfirmImpact.Low,`
`23`	`22`	`HelpUri = Constants.KeyVaultHelpUri)]`
`24`	`23`	`[OutputType(typeof(KeyBundle))]`
`25`	`24`	`public class UndoAzureKeyVaultKeyRemoval : KeyVaultCmdletBase`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ namespace Microsoft.Azure.Commands.KeyVault`
`21`	`21`	`{`
`22`	`22`	`[Cmdlet(VerbsCommon.Undo, "AzureRmKeyVaultRemoval",`
`23`	`23`	`SupportsShouldProcess = true,`
`24`		`- ConfirmImpact = ConfirmImpact.Low,`
`25`	`24`	`HelpUri = Constants.KeyVaultHelpUri)]`
`26`	`25`	`[OutputType(typeof(PSKeyVaultModels.PSVault))]`
`27`	`26`	`public class UndoAzureKeyVaultRemoval : KeyVaultManagementCmdletBase`