From eb6ffbba31da34f21bc3b065b99eb90616d6c7c5 Mon Sep 17 00:00:00 2001 From: Yabo Hu Date: Mon, 17 Jul 2023 17:20:12 +0800 Subject: [PATCH] bug fix --- .../ActionRuleCommands/SetAzureAlertProcessingRule.cs | 11 +++++++++-- src/AlertsManagement/AlertsManagement/ChangeLog.md | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/AlertsManagement/AlertsManagement/ActionRuleCommands/SetAzureAlertProcessingRule.cs b/src/AlertsManagement/AlertsManagement/ActionRuleCommands/SetAzureAlertProcessingRule.cs index da3df651ede4..b5c357a978ae 100644 --- a/src/AlertsManagement/AlertsManagement/ActionRuleCommands/SetAzureAlertProcessingRule.cs +++ b/src/AlertsManagement/AlertsManagement/ActionRuleCommands/SetAzureAlertProcessingRule.cs @@ -646,13 +646,20 @@ private Schedule ValidateParseSchedule() recurrences.Add(new MonthlyRecurrence(daysOfMonth, ScheduleReccurence2StartTime, ScheduleReccurence2EndTime)); } } - - schedule = new Schedule( + if (string.IsNullOrEmpty(ScheduleEndDateTime)) { + schedule = new Schedule( + effectiveFrom: ScheduleStartDateTime.Split(' ')[0] + "T" + ScheduleStartDateTime.Split(' ')[1], + timeZone: ScheduleTimeZone == null ? "UTC" : ScheduleTimeZone, + recurrences: recurrences + ); + } else { + schedule = new Schedule( effectiveFrom: ScheduleStartDateTime.Split(' ')[0] + "T" + ScheduleStartDateTime.Split(' ')[1], effectiveUntil: ScheduleEndDateTime.Split(' ')[0] + "T" + ScheduleEndDateTime.Split(' ')[1], timeZone: ScheduleTimeZone == null ? "UTC" : ScheduleTimeZone, recurrences: recurrences ); + } } return schedule; diff --git a/src/AlertsManagement/AlertsManagement/ChangeLog.md b/src/AlertsManagement/AlertsManagement/ChangeLog.md index bb1b24d76090..708f43c42f36 100644 --- a/src/AlertsManagement/AlertsManagement/ChangeLog.md +++ b/src/AlertsManagement/AlertsManagement/ChangeLog.md @@ -18,6 +18,7 @@ - Additional information about change #1 --> ## Upcoming Release +* Fixed null reference bug when 'ScheduleEndDateTime' was not provided ## Version 0.6.0 * Added cmdlets for Prometheus rule group