Skip to content

Commit 6a249f4

Browse files
author
Mahak Jain
committed
Display ActionRule based on Type
1 parent 1e54d3b commit 6a249f4

File tree

8 files changed

+324
-63
lines changed

8 files changed

+324
-63
lines changed

src/AlertsManagement/AlertsManagement/ActionRuleCommands/GetAzureActionRule.cs

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -294,20 +294,37 @@ protected override void ProcessRecordInternal()
294294

295295
} while (!string.IsNullOrEmpty(nextPageLink) && currentCount < lastCount);
296296

297-
WriteObject(resultList.Select((r) => new PSActionRule(r)), enumerateCollection: true);
297+
WriteObject(resultList.Select((r) => TransformOutput(r)), enumerateCollection: true);
298298
break;
299299

300300
case ActionRuleByNameParameterSet:
301-
PSActionRule rulebyName = new PSActionRule(this.AlertsManagementClient.ActionRules.GetByNameWithHttpMessagesAsync(ResourceGroupName, Name).Result.Body);
302-
WriteObject(sendToPipeline: rulebyName);
301+
var rulebyName = this.AlertsManagementClient.ActionRules.GetByNameWithHttpMessagesAsync(ResourceGroupName, Name).Result.Body;
302+
WriteObject(sendToPipeline: TransformOutput(rulebyName));
303303
break;
304304

305305
case ResourceIdParameterSet:
306306
ExtractedInfo info = CommonUtils.ExtractFromActionRuleResourceId(ResourceId);
307-
PSActionRule ruleById = new PSActionRule(this.AlertsManagementClient.ActionRules.GetByNameWithHttpMessagesAsync(info.ResourceGroupName, info.Resource).Result.Body);
308-
WriteObject(sendToPipeline: ruleById);
307+
var ruleById = this.AlertsManagementClient.ActionRules.GetByNameWithHttpMessagesAsync(info.ResourceGroupName, info.Resource).Result.Body;
308+
WriteObject(sendToPipeline: TransformOutput(ruleById));
309309
break;
310310
}
311311
}
312+
313+
private PSActionRule TransformOutput(ActionRule input)
314+
{
315+
string actionRuleType = input.Properties.GetType().Name;
316+
317+
switch (actionRuleType)
318+
{
319+
case "Suppression":
320+
return new PSSuppressionActionRule(input);
321+
case "ActionGroup":
322+
return new PSActionGroupActionRule(input);
323+
case "Diagnostics":
324+
return new PSDiagnosticsActionRule(input);
325+
default:
326+
return new PSActionRule(input);
327+
}
328+
}
312329
}
313330
}

src/AlertsManagement/AlertsManagement/ActionRuleCommands/SetAzureActionRule.cs

Lines changed: 54 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ public class SetAzureActionRule : AlertsManagementBaseCmdlet
288288

289289
protected override void ProcessRecordInternal()
290290
{
291-
PSActionRule actionRule = new PSActionRule();
291+
ActionRule result = new ActionRule();
292292
if (ShouldProcess(
293293
target: string.Format(Resources.TargetWithRG, this.Name, this.ResourceGroupName),
294294
action: Resources.CreateOrUpdateActionRule_Action))
@@ -314,8 +314,8 @@ protected override void ProcessRecordInternal()
314314
)
315315
);
316316

317-
actionRule = new PSActionRule(this.AlertsManagementClient.ActionRules.CreateUpdateWithHttpMessagesAsync(
318-
resourceGroupName: ResourceGroupName, actionRuleName: Name, actionRule: actionGroupAR).Result.Body);
317+
result = this.AlertsManagementClient.ActionRules.CreateUpdateWithHttpMessagesAsync(
318+
resourceGroupName: ResourceGroupName, actionRuleName: Name, actionRule: actionGroupAR).Result.Body;
319319
break;
320320

321321
case BySimplifiedFormatSuppressionActionRuleParameterSet:
@@ -354,8 +354,8 @@ protected override void ProcessRecordInternal()
354354
)
355355
);
356356

357-
actionRule = new PSActionRule(this.AlertsManagementClient.ActionRules.CreateUpdateWithHttpMessagesAsync(
358-
resourceGroupName: ResourceGroupName, actionRuleName: Name, actionRule: suppressionAR).Result.Body);
357+
result = this.AlertsManagementClient.ActionRules.CreateUpdateWithHttpMessagesAsync(
358+
resourceGroupName: ResourceGroupName, actionRuleName: Name, actionRule: suppressionAR).Result.Body;
359359
break;
360360

361361
case BySimplifiedFormatDiagnosticsActionRuleParameterSet:
@@ -376,8 +376,8 @@ protected override void ProcessRecordInternal()
376376
)
377377
);
378378

379-
actionRule = new PSActionRule(this.AlertsManagementClient.ActionRules.CreateUpdateWithHttpMessagesAsync(
380-
resourceGroupName: ResourceGroupName, actionRuleName: Name, actionRule: diagnosticsAR).Result.Body);
379+
result = this.AlertsManagementClient.ActionRules.CreateUpdateWithHttpMessagesAsync(
380+
resourceGroupName: ResourceGroupName, actionRuleName: Name, actionRule: diagnosticsAR).Result.Body;
381381

382382
break;
383383
case ByInputObjectParameterSet:
@@ -386,36 +386,38 @@ protected override void ProcessRecordInternal()
386386
{
387387
case "ActionGroup":
388388
// Create Action Rule
389+
PSActionGroupActionRule actionGroupInputObject = (PSActionGroupActionRule)InputObject;
389390
ActionRule actionGroupARFromInputObject = new ActionRule(
390391
location: "Global",
391392
tags: new Dictionary<string, string>(),
392393
properties: new ActionGroup(
393-
scope: JsonConvert.DeserializeObject<Scope>(InputObject.Scope),
394-
conditions: JsonConvert.DeserializeObject<Conditions>(InputObject.Conditions),
395-
actionGroupId: InputObject.ActionGroupId,
396-
description: InputObject.Description,
397-
status: InputObject.Status
394+
scope: JsonConvert.DeserializeObject<Scope>(actionGroupInputObject.Scope),
395+
conditions: JsonConvert.DeserializeObject<Conditions>(actionGroupInputObject.Conditions),
396+
actionGroupId: actionGroupInputObject.ActionGroupId,
397+
description: actionGroupInputObject.Description,
398+
status: actionGroupInputObject.Status
398399
)
399400
);
400401

401-
actionRule = new PSActionRule(this.AlertsManagementClient.ActionRules.CreateUpdateWithHttpMessagesAsync(
402-
resourceGroupName: info.ResourceGroupName, actionRuleName: info.Resource, actionRule: actionGroupARFromInputObject).Result.Body);
402+
result = this.AlertsManagementClient.ActionRules.CreateUpdateWithHttpMessagesAsync(
403+
resourceGroupName: info.ResourceGroupName, actionRuleName: info.Resource, actionRule: actionGroupARFromInputObject).Result.Body;
403404
break;
404405

405406
case "Suppression":
406-
SuppressionConfig configFromInputObject = new SuppressionConfig(recurrenceType: InputObject.SuppressionConfig.RecurrenceType);
407-
if (InputObject.SuppressionConfig.RecurrenceType != "Always")
407+
PSSuppressionActionRule suppressionInputObject = (PSSuppressionActionRule)InputObject;
408+
SuppressionConfig configFromInputObject = new SuppressionConfig(recurrenceType: suppressionInputObject.SuppressionConfig.RecurrenceType);
409+
if (suppressionInputObject.SuppressionConfig.RecurrenceType != "Always")
408410
{
409411
configFromInputObject.Schedule = new SuppressionSchedule(
410-
startDate: InputObject.SuppressionConfig.StartDate,
411-
endDate: InputObject.SuppressionConfig.EndDate,
412-
startTime: InputObject.SuppressionConfig.StartTime,
413-
endTime: InputObject.SuppressionConfig.EndTime
412+
startDate: suppressionInputObject.SuppressionConfig.StartDate,
413+
endDate: suppressionInputObject.SuppressionConfig.EndDate,
414+
startTime: suppressionInputObject.SuppressionConfig.StartTime,
415+
endTime: suppressionInputObject.SuppressionConfig.EndTime
414416
);
415417

416418
if (ReccurentValue.Length > 0)
417419
{
418-
configFromInputObject.Schedule.RecurrenceValues = InputObject.SuppressionConfig.RecurrenceValues;
420+
configFromInputObject.Schedule.RecurrenceValues = suppressionInputObject.SuppressionConfig.RecurrenceValues;
419421
}
420422
}
421423

@@ -424,39 +426,40 @@ protected override void ProcessRecordInternal()
424426
location: "Global",
425427
tags: new Dictionary<string, string>(),
426428
properties: new Suppression(
427-
scope: JsonConvert.DeserializeObject<Scope>(InputObject.Scope),
428-
conditions: JsonConvert.DeserializeObject<Conditions>(InputObject.Conditions),
429-
description: InputObject.Description,
430-
status: InputObject.Status,
429+
scope: JsonConvert.DeserializeObject<Scope>(suppressionInputObject.Scope),
430+
conditions: JsonConvert.DeserializeObject<Conditions>(suppressionInputObject.Conditions),
431+
description: suppressionInputObject.Description,
432+
status: suppressionInputObject.Status,
431433
suppressionConfig: configFromInputObject
432434
)
433435
);
434436

435-
actionRule = new PSActionRule(this.AlertsManagementClient.ActionRules.CreateUpdateWithHttpMessagesAsync(
436-
resourceGroupName: info.ResourceGroupName, actionRuleName: info.Resource, actionRule: suppressionARFromInputObject).Result.Body);
437+
result = this.AlertsManagementClient.ActionRules.CreateUpdateWithHttpMessagesAsync(
438+
resourceGroupName: info.ResourceGroupName, actionRuleName: info.Resource, actionRule: suppressionARFromInputObject).Result.Body;
437439
break;
438440

439441
case "Diagnostics":
440442
// Create Action Rule
443+
PSDiagnosticsActionRule diagnosticsInputObject = (PSDiagnosticsActionRule)InputObject;
441444
ActionRule diagnosticsARFromInputObject = new ActionRule(
442445
location: "Global",
443446
tags: new Dictionary<string, string>(),
444447
properties: new Diagnostics(
445-
scope: JsonConvert.DeserializeObject<Scope>(InputObject.Scope),
446-
conditions: JsonConvert.DeserializeObject<Conditions>(InputObject.Conditions),
447-
description: InputObject.Description,
448-
status: InputObject.Status
448+
scope: JsonConvert.DeserializeObject<Scope>(diagnosticsInputObject.Scope),
449+
conditions: JsonConvert.DeserializeObject<Conditions>(diagnosticsInputObject.Conditions),
450+
description: diagnosticsInputObject.Description,
451+
status: diagnosticsInputObject.Status
449452
)
450453
);
451454

452-
actionRule = new PSActionRule(this.AlertsManagementClient.ActionRules.CreateUpdateWithHttpMessagesAsync(
453-
resourceGroupName: info.ResourceGroupName, actionRuleName: info.Resource, actionRule: diagnosticsARFromInputObject).Result.Body);
455+
result = this.AlertsManagementClient.ActionRules.CreateUpdateWithHttpMessagesAsync(
456+
resourceGroupName: info.ResourceGroupName, actionRuleName: info.Resource, actionRule: diagnosticsARFromInputObject).Result.Body;
454457
break;
455458
}
456459
break;
457460
}
458461

459-
WriteObject(sendToPipeline: actionRule);
462+
WriteObject(sendToPipeline: TransformOutput(result));
460463
}
461464
}
462465

@@ -565,5 +568,22 @@ private string DetermineScopeType(string value)
565568
throw new PSInvalidOperationException(string.Format(Resources.InvalidScopeType_Exception));
566569
}
567570
}
571+
572+
private PSActionRule TransformOutput(ActionRule input)
573+
{
574+
string actionRuleType = input.Properties.GetType().Name;
575+
576+
switch (actionRuleType)
577+
{
578+
case "Suppression":
579+
return new PSSuppressionActionRule(input);
580+
case "ActionGroup":
581+
return new PSActionGroupActionRule(input);
582+
case "Diagnostics":
583+
return new PSDiagnosticsActionRule(input);
584+
default:
585+
return new PSActionRule(input);
586+
}
587+
}
568588
}
569589
}
Binary file not shown.
Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
#
2+
# Module manifest for module 'Az.Cdn'
3+
#
4+
# Generated by: Microsoft Corporation
5+
#
6+
# Generated on: 5/29/2019
7+
#
8+
9+
@{
10+
11+
# Script module or binary module file associated with this manifest.
12+
# RootModule = ''
13+
14+
# Version number of this module.
15+
ModuleVersion = '1.3.0'
16+
17+
# Supported PSEditions
18+
CompatiblePSEditions = 'Core', 'Desktop'
19+
20+
# ID used to uniquely identify this module
21+
GUID = '91832aaa-dc11-4583-8239-bce5fd531604'
22+
23+
# Author of this module
24+
Author = 'Microsoft Corporation'
25+
26+
# Company or vendor of this module
27+
CompanyName = 'Microsoft Corporation'
28+
29+
# Copyright statement for this module
30+
Copyright = 'Microsoft Corporation. All rights reserved.'
31+
32+
# Description of the functionality provided by this module
33+
Description = 'Microsoft Azure PowerShell - CDN service cmdlets for Azure Resource Manager in Windows PowerShell and PowerShell Core.
34+
35+
For more information on Cdn, please visit the following: https://docs.microsoft.com/azure/cdn/'
36+
37+
# Minimum version of the PowerShell engine required by this module
38+
PowerShellVersion = '5.1'
39+
40+
# Name of the PowerShell host required by this module
41+
# PowerShellHostName = ''
42+
43+
# Minimum version of the PowerShell host required by this module
44+
# PowerShellHostVersion = ''
45+
46+
# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
47+
DotNetFrameworkVersion = '4.7.2'
48+
49+
# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
50+
# CLRVersion = ''
51+
52+
# Processor architecture (None, X86, Amd64) required by this module
53+
# ProcessorArchitecture = ''
54+
55+
# Modules that must be imported into the global environment prior to importing this module
56+
RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.6.0'; })
57+
58+
# Assemblies that must be loaded prior to importing this module
59+
RequiredAssemblies = '.\Microsoft.Azure.Management.Cdn.dll'
60+
61+
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
62+
# ScriptsToProcess = @()
63+
64+
# Type files (.ps1xml) to be loaded when importing this module
65+
# TypesToProcess = @()
66+
67+
# Format files (.ps1xml) to be loaded when importing this module
68+
# FormatsToProcess = @()
69+
70+
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
71+
NestedModules = @('.\Microsoft.Azure.PowerShell.Cmdlets.Cdn.dll')
72+
73+
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
74+
FunctionsToExport = @()
75+
76+
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
77+
CmdletsToExport = 'Get-AzCdnProfile', 'Get-AzCdnProfileSsoUrl', 'New-AzCdnProfile',
78+
'Remove-AzCdnProfile', 'Set-AzCdnProfile', 'Get-AzCdnOrigin',
79+
'Set-AzCdnOrigin', 'Get-AzCdnEndpointNameAvailability',
80+
'Get-AzCdnEndpoint', 'Publish-AzCdnEndpointContent',
81+
'New-AzCdnEndpoint', 'Unpublish-AzCdnEndpointContent',
82+
'Remove-AzCdnEndpoint', 'Set-AzCdnEndpoint', 'Start-AzCdnEndpoint',
83+
'Stop-AzCdnEndpoint', 'Test-AzCdnCustomDomain',
84+
'Get-AzCdnCustomDomain', 'New-AzCdnCustomDomain',
85+
'Remove-AzCdnCustomDomain', 'Enable-AzCdnCustomDomain',
86+
'Disable-AzCdnCustomDomain', 'Enable-AzCdnCustomDomainHttps',
87+
'Disable-AzCdnCustomDomainHttps', 'Get-AzCdnProfileResourceUsage',
88+
'Confirm-AzCdnEndpointProbeUrl', 'Get-AzCdnEndpointResourceUsage',
89+
'Get-AzCdnProfileSupportedOptimizationType',
90+
'Get-AzCdnSubscriptionResourceUsage', 'Get-AzCdnEdgeNode',
91+
'New-AzCdnDeliveryRule', 'New-AzCdnDeliveryRuleCondition',
92+
'New-AzCdnDeliveryRuleAction', 'New-AzCdnDeliveryPolicy'
93+
94+
# Variables to export from this module
95+
# VariablesToExport = @()
96+
97+
# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
98+
AliasesToExport = 'Validate-AzCdnCustomDomain', 'Get-AzCdnEdgeNodes'
99+
100+
# DSC resources to export from this module
101+
# DscResourcesToExport = @()
102+
103+
# List of all modules packaged with this module
104+
# ModuleList = @()
105+
106+
# List of all files packaged with this module
107+
# FileList = @()
108+
109+
# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
110+
PrivateData = @{
111+
112+
PSData = @{
113+
114+
# Tags applied to this module. These help with module discovery in online galleries.
115+
Tags = 'Azure','ResourceManager','ARM','CDN'
116+
117+
# A URL to the license for this module.
118+
LicenseUri = 'https://aka.ms/azps-license'
119+
120+
# A URL to the main website for this project.
121+
ProjectUri = 'https://github.com/Azure/azure-powershell'
122+
123+
# A URL to an icon representing this module.
124+
# IconUri = ''
125+
126+
# ReleaseNotes of this module
127+
ReleaseNotes = '* Updated cmdlets to support rulesEngine feature based on API version 2019-04-15.'
128+
129+
# Prerelease string of this module
130+
# Prerelease = ''
131+
132+
# Flag to indicate whether the module requires explicit user acceptance for install/update/save
133+
# RequireLicenseAcceptance = $false
134+
135+
# External dependent modules of this module
136+
# ExternalModuleDependencies = @()
137+
138+
} # End of PSData hashtable
139+
140+
} # End of PrivateData hashtable
141+
142+
# HelpInfo URI of this module
143+
# HelpInfoURI = ''
144+
145+
# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
146+
# DefaultCommandPrefix = ''
147+
148+
}
149+

0 commit comments

Comments
 (0)