Skip to content

Fix update activity log alert rule when using ObjectInput from the pipe #12111

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
VeryEarly merged 4 commits into from
Jun 11, 2020
Merged

Fix update activity log alert rule when using ObjectInput from the pipe #12111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca93c7b
remove duplication of action/conditions.
Avivskie Jun 10, 2020
607360e
correct fix - convert the type
Avivskie Jun 10, 2020
df427c2
Update ChangeLog.md
VeryEarly Jun 11, 2020
813e3a6
Merge branch 'master' into master
VeryEarly Jun 11, 2020
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
19 changes: 18 additions & 1 deletion src/Monitor/Monitor/ActivityLogAlert/SetAzureRmActivityLogAlertCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ protected override void ProcessRecordInternal()
resourceGroupName: out resourceGroupName,
activityLogAlertName: out activityLogAlertName);

requestBody = this.UpdateActivityLogAlertResource(this.InputObject);
requestBody = this.UpdateActivityLogAlertPsResource(this.InputObject);
}
else if (this.MyInvocation.BoundParameters.ContainsKey("ResourceId") || !string.IsNullOrWhiteSpace(this.ResourceId))
{
Expand Down Expand Up @@ -205,6 +205,23 @@ protected override void ProcessRecordInternal()
}
}

private ActivityLogAlertResource UpdateActivityLogAlertPsResource(PSActivityLogAlertResource inputObject)
{
var activityLogAlertResource = new ActivityLogAlertResource(
inputObject.Location,
inputObject.Scopes,
new ActivityLogAlertAllOfCondition(inputObject.Condition.AllOf.Select(e => new ActivityLogAlertLeafCondition(field: e.Field, equals: e.Equals)).ToList()),
new ActivityLogAlertActionList(inputObject.Actions.ActionGroups.Select(e => new ActivityLogAlertActionGroup(actionGroupId: e.ActionGroupId, webhookProperties: e.WebhookProperties)).ToList()),
inputObject.Id,
inputObject.Name,
inputObject.Type,
inputObject.Tags,
inputObject.Enabled,
inputObject.Description);

return UpdateActivityLogAlertResource(activityLogAlertResource);
}

private ActivityLogAlertResource UpdateActivityLogAlertResource(ActivityLogAlertResource requestBody)
{
// There was an ActivityLogAlert already there, just modify what can be modifed
Expand Down
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 input object parameter for `Set-AzActivityLogAlert`
* Fixed bug for `Set-AzActionGroup`

## Version 2.0.0
Expand Down