Skip to content

Commit 76bba32

Browse files
author
Mahak Jain
committed
Resolve PR comments
1 parent dda8042 commit 76bba32

File tree

9 files changed

+74
-216
lines changed

9 files changed

+74
-216
lines changed

src/AlertsManagement/AlertsManagement/ActionRuleCommands/GetAzureActionRule.cs

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ public class GetAzureActionRule : AlertsManagementBaseCmdlet
3131
private const string ResourceIdParameterSet = "ResourceId";
3232
private const string ListActionRulesParameterSet = "ListActionRules";
3333
private const string ListActionRulesByTargetResourceIdParameterSet = "ListActionRulesByTargetResourceId";
34-
private const string ListActionRulesByTargetResourceGroupParameterSet = "ListActionRulesByTargetResourceGroup";
3534
private const string ActionRuleByNameParameterSet = "ActionRuleByName";
3635

3736
#endregion
@@ -59,9 +58,6 @@ public class GetAzureActionRule : AlertsManagementBaseCmdlet
5958
[Parameter(Mandatory = false,
6059
ParameterSetName = ListActionRulesByTargetResourceIdParameterSet,
6160
HelpMessage = "Filter on Name of action rule.")]
62-
[Parameter(Mandatory = false,
63-
ParameterSetName = ListActionRulesByTargetResourceGroupParameterSet,
64-
HelpMessage = "Filter on Name of action rule.")]
6561
public string Name { get; set; }
6662

6763
/// <summary>
@@ -76,9 +72,6 @@ public class GetAzureActionRule : AlertsManagementBaseCmdlet
7672
[Parameter(Mandatory = false,
7773
ParameterSetName = ListActionRulesByTargetResourceIdParameterSet,
7874
HelpMessage = "Filter on Resource Group Name in which action rule resides.")]
79-
[Parameter(Mandatory = false,
80-
ParameterSetName = ListActionRulesByTargetResourceGroupParameterSet,
81-
HelpMessage = "Filter on Resource Group Name in which action rule resides.")]
8275
public string ResourceGroupName { get; set; }
8376

8477
/// <summary>
@@ -95,17 +88,14 @@ public class GetAzureActionRule : AlertsManagementBaseCmdlet
9588
[Parameter(Mandatory = false,
9689
ParameterSetName = ListActionRulesParameterSet,
9790
HelpMessage = "Filter on Resource type of the target resource of alert.")]
98-
[Parameter(Mandatory = false,
99-
ParameterSetName = ListActionRulesByTargetResourceGroupParameterSet,
100-
HelpMessage = "Filter on Resource type of the target resource of alert.")]
10191
[ResourceTypeCompleter]
10292
public string TargetResourceType { get; set; }
10393

10494
/// <summary>
10595
/// Resource Group Name
10696
/// </summary>
10797
[Parameter(Mandatory = false,
108-
ParameterSetName = ListActionRulesByTargetResourceGroupParameterSet,
98+
ParameterSetName = ListActionRulesParameterSet,
10999
HelpMessage = "Filter on Resource group name of the target resource of alert.")]
110100
[ResourceGroupCompleter]
111101
public string TargetResourceGroup { get; set; }
@@ -119,9 +109,6 @@ public class GetAzureActionRule : AlertsManagementBaseCmdlet
119109
[Parameter(Mandatory = false,
120110
ParameterSetName = ListActionRulesByTargetResourceIdParameterSet,
121111
HelpMessage = "Filter on Moniter Service")]
122-
[Parameter(Mandatory = false,
123-
ParameterSetName = ListActionRulesByTargetResourceGroupParameterSet,
124-
HelpMessage = "Filter on Moniter Service")]
125112
[PSArgumentCompleter("Platform", "Log Analytics", "SCOM", "Activity Log")]
126113
public string MonitorService { get; set; }
127114

@@ -131,9 +118,6 @@ public class GetAzureActionRule : AlertsManagementBaseCmdlet
131118
[Parameter(Mandatory = false,
132119
ParameterSetName = ListActionRulesParameterSet,
133120
HelpMessage = "Filter on Severity of alert")]
134-
[Parameter(Mandatory = false,
135-
ParameterSetName = ListActionRulesByTargetResourceGroupParameterSet,
136-
HelpMessage = "Filter on Severity of alert")]
137121
[Parameter(Mandatory = false,
138122
ParameterSetName = ListActionRulesByTargetResourceIdParameterSet,
139123
HelpMessage = "Filter on Severity of alert")]
@@ -149,9 +133,6 @@ public class GetAzureActionRule : AlertsManagementBaseCmdlet
149133
[Parameter(Mandatory = false,
150134
ParameterSetName = ListActionRulesByTargetResourceIdParameterSet,
151135
HelpMessage = "Filter on Impacted scope")]
152-
[Parameter(Mandatory = false,
153-
ParameterSetName = ListActionRulesByTargetResourceGroupParameterSet,
154-
HelpMessage = "Filter on Impacted scope")]
155136
public string ImpactedScope { get; set; }
156137

157138
/// <summary>
@@ -163,9 +144,6 @@ public class GetAzureActionRule : AlertsManagementBaseCmdlet
163144
[Parameter(Mandatory = false,
164145
ParameterSetName = ListActionRulesByTargetResourceIdParameterSet,
165146
HelpMessage = "Filter on Alert Rule Id")]
166-
[Parameter(Mandatory = false,
167-
ParameterSetName = ListActionRulesByTargetResourceGroupParameterSet,
168-
HelpMessage = "Filter on Alert Rule Id")]
169147
public string AlertRuleId { get; set; }
170148

171149
/// <summary>
@@ -177,9 +155,6 @@ public class GetAzureActionRule : AlertsManagementBaseCmdlet
177155
[Parameter(Mandatory = false,
178156
ParameterSetName = ListActionRulesByTargetResourceIdParameterSet,
179157
HelpMessage = "Filter all the alerts having the Smart Group Id")]
180-
[Parameter(Mandatory = false,
181-
ParameterSetName = ListActionRulesByTargetResourceGroupParameterSet,
182-
HelpMessage = "Filter all the alerts having the Smart Group Id")]
183158
public string Description { get; set; }
184159

185160
/// <summary>
@@ -191,9 +166,6 @@ public class GetAzureActionRule : AlertsManagementBaseCmdlet
191166
[Parameter(Mandatory = false,
192167
ParameterSetName = ListActionRulesByTargetResourceIdParameterSet,
193168
HelpMessage = "Action group")]
194-
[Parameter(Mandatory = false,
195-
ParameterSetName = ListActionRulesByTargetResourceGroupParameterSet,
196-
HelpMessage = "Action group")]
197169
public string ActionGroup { get; set; }
198170

199171
#endregion
@@ -204,7 +176,6 @@ protected override void ProcessRecordInternal()
204176
{
205177
case ListActionRulesParameterSet:
206178
case ListActionRulesByTargetResourceIdParameterSet:
207-
case ListActionRulesByTargetResourceGroupParameterSet:
208179
IPage<ActionRule> pageResult = new Page<ActionRule>();
209180
List<ActionRule> resultList = new List<ActionRule>();
210181
bool listByResourceGroup = false;

src/AlertsManagement/AlertsManagement/ActionRuleCommands/SetAzureActionRule.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -405,19 +405,19 @@ protected override void ProcessRecordInternal()
405405

406406
case "Suppression":
407407
PSSuppressionActionRule suppressionInputObject = (PSSuppressionActionRule)InputObject;
408-
SuppressionConfig configFromInputObject = new SuppressionConfig(recurrenceType: suppressionInputObject.SuppressionConfig.RecurrenceType);
409-
if (suppressionInputObject.SuppressionConfig.RecurrenceType != "Always")
408+
SuppressionConfig configFromInputObject = new SuppressionConfig(recurrenceType: suppressionInputObject.RecurrenceType);
409+
if (suppressionInputObject.RecurrenceType != "Always")
410410
{
411411
configFromInputObject.Schedule = new SuppressionSchedule(
412-
startDate: suppressionInputObject.SuppressionConfig.StartDate,
413-
endDate: suppressionInputObject.SuppressionConfig.EndDate,
414-
startTime: suppressionInputObject.SuppressionConfig.StartTime,
415-
endTime: suppressionInputObject.SuppressionConfig.EndTime
412+
startDate: suppressionInputObject.StartDate,
413+
endDate: suppressionInputObject.EndDate,
414+
startTime: suppressionInputObject.StartTime,
415+
endTime: suppressionInputObject.EndTime
416416
);
417417

418418
if (ReccurentValue.Length > 0)
419419
{
420-
configFromInputObject.Schedule.RecurrenceValues = suppressionInputObject.SuppressionConfig.RecurrenceValues;
420+
configFromInputObject.Schedule.RecurrenceValues = suppressionInputObject.RecurrenceValues;
421421
}
422422
}
423423

0 commit comments

Comments
 (0)