Skip to content

Commit

Permalink
Resolve merge conflicts in 2022-12-01-preview (#21772)
Browse files Browse the repository at this point in the history
* Adds base for updating Microsoft.SecurityInsights from version preview/2022-11-01-preview to version 2022-12-01-preview

* Updates readme

* Updates API version in new specs and examples

* Add tasks API to incidents and tasks action to automationRules (#21542)

* Use generated incidents swagger instead of manual

* try to fix prettier

* try to fix prettier

* try to fix prettier

* fix example casing

* fix example casing

* fix example path and body

* fix alignment with previous swagger

* Add tasks to incidents API

* add task action to automationrules API

* prettier

* fix lint - missing workspaceName pattern

* fix lint - missing workspaceName pattern

* Update entity additional properties to match new oav example validation

* Delete redundant examples

Co-authored-by: ityankel <47292630+ityankel@users.noreply.github.com>
  • Loading branch information
anat-gilenson and ityankel authored Dec 12, 2022
1 parent e7990fd commit ee53747
Show file tree
Hide file tree
Showing 24 changed files with 1,131 additions and 630 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,8 @@
"description": "The type of the automation rule action.",
"enum": [
"ModifyProperties",
"RunPlaybook"
"RunPlaybook",
"AddIncidentTask"
],
"type": "string",
"example": "ModifyProperties",
Expand All @@ -299,10 +300,30 @@
{
"value": "RunPlaybook",
"description": "Run a playbook on an object"
},
{
"value": "AddIncidentTask",
"description": "Add a task to an incident object"
}
]
}
},
"AddIncidentTaskActionProperties": {
"required": [
"title"
],
"type": "object",
"properties": {
"title": {
"description": "The title of the task.",
"type": "string"
},
"description": {
"description": "The description of the task.",
"type": "string"
}
}
},
"AutomationRule": {
"required": [
"properties"
Expand Down Expand Up @@ -339,6 +360,23 @@
},
"discriminator": "actionType"
},
"AutomationRuleAddIncidentTaskAction": {
"description": "Describes an automation rule action to add a task to an incident",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/AutomationRuleAction"
}
],
"properties": {
"actionConfiguration": {
"type": "object",
"$ref": "#/definitions/AddIncidentTaskActionProperties"
}
},
"x-ms-discriminator-value": "AddIncidentTask",
"x-ms-client-flatten": true
},
"AutomationRuleBooleanCondition": {
"type": "object",
"properties": {
Expand Down
Loading

0 comments on commit ee53747

Please sign in to comment.