Addressing feedback from PR. Re-enabling the single skipped test case.

gucalder · gucalder · commit 74d362ac4a52 · 2017-04-28T19:49:10.000-07:00
diff --git a/src/ResourceManager/Insights/Commands.Insights.Test/ScenarioTests/MetricsTests.cs b/src/ResourceManager/Insights/Commands.Insights.Test/ScenarioTests/MetricsTests.cs
@@ -25,7 +25,7 @@ public MetricsTests(Xunit.Abstractions.ITestOutputHelper output)
             ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));
         }
 
-        [Fact(Skip = "This is not failing locally, but it is failing in the build. Disabling temporarily.")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetMetrics()
         {
diff --git a/src/ResourceManager/Insights/Commands.Insights.Test/SessionRecords/Microsoft.Azure.Commands.Insights.Test.ScenarioTests.MetricsTests/TestGetMetrics.json b/src/ResourceManager/Insights/Commands.Insights.Test/SessionRecords/Microsoft.Azure.Commands.Insights.Test.ScenarioTests.MetricsTests/TestGetMetrics.json
@@ -28,8 +28,8 @@
             "StatusCode": 200
         },
         {
-            "RequestUri": "/subscriptions/a93fb07c-6c93-40be-bf3b-4f0deba10f4b/resourceGroups/Default-Web-EastUS/providers/microsoft.web/sites/myWeb1/providers/microsoft.insights/metrics?$filter=(name.value%20eq%20'CPU'%20or%20name.value%20eq%20'Requests')%20and%20timeGrain%20eq%20duration'PT1M'%20and%20startTime%20eq%202015-03-23T22:00:00.0000000+00:00%20and%20endTime%20eq%202015-03-23T22:30:00.0000000+00:00%20and%20aggregationType%20eq%20'Count'&api-version=2016-09-01",
-            "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYTkzZmIwN2MtNmM5My00MGJlLWJmM2ItNGYwZGViYTEwZjRiL3Jlc291cmNlR3JvdXBzL0RlZmF1bHQtV2ViLUVhc3RVUy9wcm92aWRlcnMvbWljcm9zb2Z0LndlYi9zaXRlcy9teVdlYjEvcHJvdmlkZXJzL21pY3Jvc29mdC5pbnNpZ2h0cy9tZXRyaWNzPyRmaWx0ZXI9KG5hbWUudmFsdWUlMjBlcSUyMCdDUFUnJTIwb3IlMjBuYW1lLnZhbHVlJTIwZXElMjAnUmVxdWVzdHMnKSUyMGFuZCUyMHRpbWVHcmFpbiUyMGVxJTIwZHVyYXRpb24nUFQxTSclMjBhbmQlMjBzdGFydFRpbWUlMjBlcSUyMDIwMTUtMDMtMjNUMTU6MDA6MDAuMDAwMDAwMC0wNzowMCUyMGFuZCUyMGVuZFRpbWUlMjBlcSUyMDIwMTUtMDMtMjNUMTU6MzA6MDAuMDAwMDAwMC0wNzowMCUyMGFuZCUyMGFnZ3JlZ2F0aW9uVHlwZSUyMGVxJTIwJ0NvdW50JyZhcGktdmVyc2lvbj0yMDE2LTA5LTAx",
+            "RequestUri": "/subscriptions/a93fb07c-6c93-40be-bf3b-4f0deba10f4b/resourceGroups/Default-Web-EastUS/providers/microsoft.web/sites/myWeb1/providers/microsoft.insights/metrics?$filter=(name.value%20eq%20'CPU'%20or%20name.value%20eq%20'Requests')%20and%20timeGrain%20eq%20duration'PT1M'%20and%20startTime%20eq%202015-03-23T22:00:00.0000000Z%20and%20endTime%20eq%202015-03-23T22:30:00.0000000Z%20and%20aggregationType%20eq%20'Count'&api-version=2016-09-01",
+            "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvYTkzZmIwN2MtNmM5My00MGJlLWJmM2ItNGYwZGViYTEwZjRiL3Jlc291cmNlR3JvdXBzL0RlZmF1bHQtV2ViLUVhc3RVUy9wcm92aWRlcnMvbWljcm9zb2Z0LndlYi9zaXRlcy9teVdlYjEvcHJvdmlkZXJzL21pY3Jvc29mdC5pbnNpZ2h0cy9tZXRyaWNzPyRmaWx0ZXI9KG5hbWUudmFsdWUlMjBlcSUyMCdDUFUnJTIwb3IlMjBuYW1lLnZhbHVlJTIwZXElMjAnUmVxdWVzdHMnKSUyMGFuZCUyMHRpbWVHcmFpbiUyMGVxJTIwZHVyYXRpb24nUFQxTSclMjBhbmQlMjBzdGFydFRpbWUlMjBlcSUyMDIwMTUtMDMtMjNUMjI6MDA6MDAuMDAwMDAwMFolMjBhbmQlMjBlbmRUaW1lJTIwZXElMjAyMDE1LTAzLTIzVDIyOjMwOjAwLjAwMDAwMDBaJTIwYW5kJTIwYWdncmVnYXRpb25UeXBlJTIwZXElMjAnQ291bnQnJmFwaS12ZXJzaW9uPTIwMTYtMDktMDE=",
             "RequestMethod": "GET",
             "RequestBody": "",
             "RequestHeaders": {
diff --git a/src/ResourceManager/Insights/Commands.Insights/Alerts/AddAzureRmLogAlertRuleCommand.cs b/src/ResourceManager/Insights/Commands.Insights/Alerts/AddAzureRmLogAlertRuleCommand.cs
@@ -89,7 +89,7 @@ private RuleCondition CreateRuleCondition()
 
         protected override AlertRuleResource CreateSdkCallParameters()
         {
-            WriteWarning("*** Add-AzureRMLogAlertRule cmdlet will be deprecated in future releases.");
+            WriteWarning("*** Add-AzureRMLogAlertRule cmdlet will be deprecated in a future release.");
 
             RuleCondition condition = this.CreateRuleCondition();
 
diff --git a/src/ResourceManager/Insights/Commands.Insights/Alerts/GetAzureRmAlertRuleCommand.cs b/src/ResourceManager/Insights/Commands.Insights/Alerts/GetAzureRmAlertRuleCommand.cs
@@ -106,7 +106,7 @@ private static string ExtractTargetResourceId(AlertRuleResource alertRuleResourc
         /// </summary>
         protected override void ProcessRecordInternal()
         {
-            WriteWarning("The output of this cmdlet will be flattened, i.e. elimination of the properties field, in future releases to improve the user experience.");
+            WriteWarning("The output of this cmdlet will be flattened, i.e. elimination of the properties field, in a future release to improve the user experience.");
             if (string.IsNullOrWhiteSpace(this.Name))
             {
                 // Retrieve all the AlertRules for a ResourceGroup
diff --git a/src/ResourceManager/Insights/Commands.Insights/Alerts/RemoveAzureRmAlertRuleCommand.cs b/src/ResourceManager/Insights/Commands.Insights/Alerts/RemoveAzureRmAlertRuleCommand.cs
@@ -49,7 +49,7 @@ public class RemoveAzureRmAlertRuleCommand : ManagementCmdletBase
         /// </summary>
         protected override void ProcessRecordInternal()
         {
-            WriteWarning("The type of the output will change in future releases to become a single object, not a list.");
+            WriteWarning("The type of the output will change in a future release to become a single object, not a list.");
             var result = this.MonitorManagementClient.AlertRules.DeleteWithHttpMessagesAsync(resourceGroupName: this.ResourceGroup, ruleName: this.Name).Result;
 
             // Keep this response for backwards compatibility.
diff --git a/src/ResourceManager/Insights/Commands.Insights/Autoscale/GetAzureRmAutoscaleSettingCommand.cs b/src/ResourceManager/Insights/Commands.Insights/Autoscale/GetAzureRmAutoscaleSettingCommand.cs
@@ -59,7 +59,7 @@ public class GetAzureRmAutoscaleSettingCommand : ManagementCmdletBase
         /// </summary>
         protected override void ProcessRecordInternal()
         {
-            WriteWarning("The AutoscaleSettingResourceName field will be deprecated in future versions since it always equals the Name field. In this version is optional.");
+            WriteWarning("The AutoscaleSettingResourceName field will be deprecated in a future release since it always equals the Name field. In this version is optional.");
             if (string.IsNullOrWhiteSpace(this.Name))
             {
                 // Retrieve all the Autoscale settings for a resource group
diff --git a/src/ResourceManager/Insights/Commands.Insights/LogProfiles/RemoveAzureRmLogProfileCommand.cs b/src/ResourceManager/Insights/Commands.Insights/LogProfiles/RemoveAzureRmLogProfileCommand.cs
@@ -33,11 +33,14 @@ public class RemoveAzureRmLogProfileCommand : ManagementCmdletBase
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
+        [Parameter(Mandatory = false)] 
+        public SwitchParameter PassThru { get; set; }
+
         #endregion
 
         protected override void ProcessRecordInternal()
         {
-            WriteWarning("The type of the output will change to follow the pattern from other similar operations.");
+            WriteWarning("The type of the output will change to return a single object containing the request Id and the status code.");
             Rest.Azure.AzureOperationResponse result = this.MonitorManagementClient.LogProfiles.DeleteWithHttpMessagesAsync(logProfileName: this.Name, cancellationToken: CancellationToken.None).Result;
 
             /*
@@ -49,7 +52,10 @@ protected override void ProcessRecordInternal()
             };
 			*/
 
-            WriteObject(true);
+            if (this.PassThru)
+            {
+                WriteObject(true);
+            }
         }
     }
 }
diff --git a/src/ResourceManager/Insights/Commands.Insights/LogsCmdletBase.cs b/src/ResourceManager/Insights/Commands.Insights/LogsCmdletBase.cs
@@ -172,7 +172,7 @@ protected string ProcessParameters()
         {
             string queryFilter = this.ProcessGeneralParameters();
             var result = this.ProcessParticularParameters(queryFilter);
-            WriteWarning("Deprecation: The field EventChannels from the EventData object is being deprecated since it is meaningless now. The value currently returned is constant.");
+            WriteWarning("Deprecation: The field EventChannels from the EventData object is being deprecated since it now returns a constant value (Admin,Operation)");
             return result;
         }
 
diff --git a/src/ResourceManager/Insights/Commands.Insights/Metrics/GetAzureRmMetricCommand.cs b/src/ResourceManager/Insights/Commands.Insights/Metrics/GetAzureRmMetricCommand.cs
@@ -112,7 +112,7 @@ protected string ProcessParameters()
                 // EndTime defaults to Now
                 if (this.EndTime == default(DateTime))
                 {
-                    this.EndTime = DateTime.Now;
+                    this.EndTime = DateTime.UtcNow;
                 }
 
                 // StartTime defaults to EndTime - DefaultTimeRange  (NOTE: EndTime defaults to Now)
@@ -122,9 +122,9 @@ protected string ProcessParameters()
                 }
 
                 buffer.Append(" and startTime eq ");
-                buffer.Append(this.StartTime.ToString("O"));
+                buffer.Append(this.StartTime.ToUniversalTime().ToString("O"));
                 buffer.Append(" and endTime eq ");
-                buffer.Append(this.EndTime.ToString("O"));
+                buffer.Append(this.EndTime.ToUniversalTime().ToString("O"));
 
                 if (this.AggregationType != null)
                 {
@@ -148,8 +148,6 @@ protected string ProcessParameters()
         /// </summary>
         protected override void ProcessRecordInternal()
         {
-            WriteWarning("**** This cmdlet has changed from the previous release: the call pattern and the output are different.");
- 
             string queryFilter = this.ProcessParameters();
             bool fullDetails = this.DetailedOutput.IsPresent;
 
diff --git a/src/ResourceManager/Insights/Commands.Insights/Metrics/GetAzureRmMetricDefinitionCommand.cs b/src/ResourceManager/Insights/Commands.Insights/Metrics/GetAzureRmMetricDefinitionCommand.cs
@@ -72,8 +72,6 @@ protected string ProcessParameters()
         /// </summary>
         protected override void ProcessRecordInternal()
         {
-            WriteWarning("*** This cmdlet has changed from the previous release: the call pattern and the output might be different.");
-
             string queryFilter = this.ProcessParameters();
             bool fullDetails = this.DetailedOutput.IsPresent;
 
diff --git a/src/ResourceManager/Insights/Commands.Insights/UsageMetrics/GetAzureRmUsageCommand.cs b/src/ResourceManager/Insights/Commands.Insights/UsageMetrics/GetAzureRmUsageCommand.cs
@@ -136,7 +136,7 @@ private static IEnumerable<PSUsageMetric> ExtractCollectionFromResult(IEnumerato
         /// </summary>
         protected override void ProcessRecordInternal()
         {
-            WriteWarning("Get-AzureRmUsage will be deprecated in future releases.");
+            WriteWarning("Get-AzureRmUsage will be deprecated in a future release.");
 
             var queryFilter = new ODataQuery<UsageMetric>(this.ProcessParameters());
             string apiVersion = this.ApiVersion ?? DefaultApiVersion;

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public MetricsTests(Xunit.Abstractions.ITestOutputHelper output)`
`25`	`25`	`ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output));`
`26`	`26`	`}`
`27`	`27`
`28`		`- [Fact(Skip = "This is not failing locally, but it is failing in the build. Disabling temporarily.")]`
	`28`	`+ [Fact]`
`29`	`29`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`30`	`30`	`public void TestGetMetrics()`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ private RuleCondition CreateRuleCondition()`
`89`	`89`
`90`	`90`	`protected override AlertRuleResource CreateSdkCallParameters()`
`91`	`91`	`{`
`92`		`- WriteWarning("*** Add-AzureRMLogAlertRule cmdlet will be deprecated in future releases.");`
	`92`	`+ WriteWarning("*** Add-AzureRMLogAlertRule cmdlet will be deprecated in a future release.");`
`93`	`93`
`94`	`94`	`RuleCondition condition = this.CreateRuleCondition();`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ private static string ExtractTargetResourceId(AlertRuleResource alertRuleResourc`
`106`	`106`	`/// </summary>`
`107`	`107`	`protected override void ProcessRecordInternal()`
`108`	`108`	`{`
`109`		`- WriteWarning("The output of this cmdlet will be flattened, i.e. elimination of the properties field, in future releases to improve the user experience.");`
	`109`	`+ WriteWarning("The output of this cmdlet will be flattened, i.e. elimination of the properties field, in a future release to improve the user experience.");`
`110`	`110`	`if (string.IsNullOrWhiteSpace(this.Name))`
`111`	`111`	`{`
`112`	`112`	`// Retrieve all the AlertRules for a ResourceGroup`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public class RemoveAzureRmAlertRuleCommand : ManagementCmdletBase`
`49`	`49`	`/// </summary>`
`50`	`50`	`protected override void ProcessRecordInternal()`
`51`	`51`	`{`
`52`		`- WriteWarning("The type of the output will change in future releases to become a single object, not a list.");`
	`52`	`+ WriteWarning("The type of the output will change in a future release to become a single object, not a list.");`
`53`	`53`	`var result = this.MonitorManagementClient.AlertRules.DeleteWithHttpMessagesAsync(resourceGroupName: this.ResourceGroup, ruleName: this.Name).Result;`
`54`	`54`
`55`	`55`	`// Keep this response for backwards compatibility.`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public class GetAzureRmAutoscaleSettingCommand : ManagementCmdletBase`
`59`	`59`	`/// </summary>`
`60`	`60`	`protected override void ProcessRecordInternal()`
`61`	`61`	`{`
`62`		`- WriteWarning("The AutoscaleSettingResourceName field will be deprecated in future versions since it always equals the Name field. In this version is optional.");`
	`62`	`+ WriteWarning("The AutoscaleSettingResourceName field will be deprecated in a future release since it always equals the Name field. In this version is optional.");`
`63`	`63`	`if (string.IsNullOrWhiteSpace(this.Name))`
`64`	`64`	`{`
`65`	`65`	`// Retrieve all the Autoscale settings for a resource group`
Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,14 @@ public class RemoveAzureRmLogProfileCommand : ManagementCmdletBase`
`33`	`33`	`[ValidateNotNullOrEmpty]`
`34`	`34`	`public string Name { get; set; }`
`35`	`35`
	`36`	`+ [Parameter(Mandatory = false)]`
	`37`	`+ public SwitchParameter PassThru { get; set; }`
	`38`	`+`
`36`	`39`	`#endregion`
`37`	`40`
`38`	`41`	`protected override void ProcessRecordInternal()`
`39`	`42`	`{`
`40`		`- WriteWarning("The type of the output will change to follow the pattern from other similar operations.");`
	`43`	`+ WriteWarning("The type of the output will change to return a single object containing the request Id and the status code.");`
`41`	`44`	`Rest.Azure.AzureOperationResponse result = this.MonitorManagementClient.LogProfiles.DeleteWithHttpMessagesAsync(logProfileName: this.Name, cancellationToken: CancellationToken.None).Result;`
`42`	`45`
`43`	`46`	`/*`
`@@ -49,7 +52,10 @@ protected override void ProcessRecordInternal()`
`49`	`52`	`};`
`50`	`53`	`*/`
`51`	`54`
`52`		`- WriteObject(true);`
	`55`	`+ if (this.PassThru)`
	`56`	`+ {`
	`57`	`+ WriteObject(true);`
	`58`	`+ }`
`53`	`59`	`}`
`54`	`60`	`}`
`55`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ protected string ProcessParameters()`
`172`	`172`	`{`
`173`	`173`	`string queryFilter = this.ProcessGeneralParameters();`
`174`	`174`	`var result = this.ProcessParticularParameters(queryFilter);`
`175`		`- WriteWarning("Deprecation: The field EventChannels from the EventData object is being deprecated since it is meaningless now. The value currently returned is constant.");`
	`175`	`+ WriteWarning("Deprecation: The field EventChannels from the EventData object is being deprecated since it now returns a constant value (Admin,Operation)");`
`176`	`176`	`return result;`
`177`	`177`	`}`
`178`	`178`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ protected string ProcessParameters()`
`112`	`112`	`// EndTime defaults to Now`
`113`	`113`	`if (this.EndTime == default(DateTime))`
`114`	`114`	`{`
`115`		`- this.EndTime = DateTime.Now;`
	`115`	`+ this.EndTime = DateTime.UtcNow;`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`// StartTime defaults to EndTime - DefaultTimeRange (NOTE: EndTime defaults to Now)`
`@@ -122,9 +122,9 @@ protected string ProcessParameters()`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`buffer.Append(" and startTime eq ");`
`125`		`- buffer.Append(this.StartTime.ToString("O"));`
	`125`	`+ buffer.Append(this.StartTime.ToUniversalTime().ToString("O"));`
`126`	`126`	`buffer.Append(" and endTime eq ");`
`127`		`- buffer.Append(this.EndTime.ToString("O"));`
	`127`	`+ buffer.Append(this.EndTime.ToUniversalTime().ToString("O"));`
`128`	`128`
`129`	`129`	`if (this.AggregationType != null)`
`130`	`130`	`{`
`@@ -148,8 +148,6 @@ protected string ProcessParameters()`
`148`	`148`	`/// </summary>`
`149`	`149`	`protected override void ProcessRecordInternal()`
`150`	`150`	`{`
`151`		`- WriteWarning("**** This cmdlet has changed from the previous release: the call pattern and the output are different.");`
`152`		`-`
`153`	`151`	`string queryFilter = this.ProcessParameters();`
`154`	`152`	`bool fullDetails = this.DetailedOutput.IsPresent;`
`155`	`153`
Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,6 @@ protected string ProcessParameters()`
`72`	`72`	`/// </summary>`
`73`	`73`	`protected override void ProcessRecordInternal()`
`74`	`74`	`{`
`75`		`- WriteWarning("*** This cmdlet has changed from the previous release: the call pattern and the output might be different.");`
`76`		`-`
`77`	`75`	`string queryFilter = this.ProcessParameters();`
`78`	`76`	`bool fullDetails = this.DetailedOutput.IsPresent;`
`79`	`77`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ private static IEnumerable<PSUsageMetric> ExtractCollectionFromResult(IEnumerato`
`136`	`136`	`/// </summary>`
`137`	`137`	`protected override void ProcessRecordInternal()`
`138`	`138`	`{`
`139`		`- WriteWarning("Get-AzureRmUsage will be deprecated in future releases.");`
	`139`	`+ WriteWarning("Get-AzureRmUsage will be deprecated in a future release.");`
`140`	`140`
`141`	`141`	`var queryFilter = new ODataQuery<UsageMetric>(this.ProcessParameters());`
`142`	`142`	`string apiVersion = this.ApiVersion ?? DefaultApiVersion;`