Skip to content

Fixed null reference bug for Get-AzDiagnosticSetting when metrics or logs are null #12342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wyunchi-ms merged 1 commit into from
Jul 7, 2020
Merged

Fixed null reference bug for Get-AzDiagnosticSetting when metrics or logs are null #12342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Monitor/Monitor/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
-->

## Upcoming Release
* Fixed bug for `Get-AzDiagnosticSetting` when metrics or logs are null [#12272]

## Version 2.0.1
* Fixed input object parameter for `Set-AzActivityLogAlert`
Expand Down
19 changes: 13 additions & 6 deletions src/Monitor/Monitor/OutputClasses/PSServiceDiagnosticSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,23 @@ public PSServiceDiagnosticSettings(DiagnosticSettingsResource serviceDiagnosticS
this.EventHubName = serviceDiagnosticSettings.EventHubName;
this.ServiceBusRuleId = serviceDiagnosticSettings.ServiceBusRuleId;
this.EventHubAuthorizationRuleId = serviceDiagnosticSettings.EventHubAuthorizationRuleId;
this.Metrics = new List<Management.Monitor.Management.Models.MetricSettings>();
foreach (MetricSettings metricSettings in serviceDiagnosticSettings.Metrics)

if (serviceDiagnosticSettings.Metrics != null)
{
this.Metrics.Add(new PSMetricSettings(metricSettings));
this.Metrics = new List<Management.Monitor.Management.Models.MetricSettings>();
foreach (MetricSettings metricSettings in serviceDiagnosticSettings.Metrics)
{
this.Metrics.Add(new PSMetricSettings(metricSettings));
}
}

this.Logs = new List<Management.Monitor.Management.Models.LogSettings>();
foreach (LogSettings logSettings in serviceDiagnosticSettings.Logs)
if (serviceDiagnosticSettings.Logs != null)
{
this.Logs.Add(new PSLogSettings(logSettings));
this.Logs = new List<Management.Monitor.Management.Models.LogSettings>();
foreach (LogSettings logSettings in serviceDiagnosticSettings.Logs)
{
this.Logs.Add(new PSLogSettings(logSettings));
}
}

this.WorkspaceId = serviceDiagnosticSettings.WorkspaceId;
Expand Down