Skip to content

Commit

Permalink
Fix problematic inheritance structure in security (Azure#11156)
Browse files Browse the repository at this point in the history
* Fix problematic inherintance structure

* Add back the missing discriminator

* Fix examples

* rename model
  • Loading branch information
ArcturusZhang authored and giromm2ms committed Dec 20, 2020
1 parent 98a60f1 commit 95685f8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
"subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23",
"settingName": "MCAS",
"setting": {
"id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/settings/MCAS",
"name": "MCAS",
"kind": "DataExportSetting",
"type": "Microsoft.Security/settings",
"properties": {
"enabled": true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,17 +172,6 @@
}
}
},
"Setting": {
"type": "object",
"description": "Represents a security setting in Azure Security Center.",
"discriminator": "kind",
"properties": {},
"allOf": [
{
"$ref": "#/definitions/SettingResource"
}
]
},
"DataExportSetting": {
"type": "object",
"description": "Represents a data export setting",
Expand All @@ -200,7 +189,7 @@
}
]
},
"SettingResource": {
"Setting": {
"type": "object",
"description": "The kind of the security setting",
"properties": {
Expand All @@ -225,6 +214,7 @@
}
}
},
"discriminator": "kind",
"required": [
"kind"
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,16 +172,6 @@
}
}
},
"Setting": {
"type": "object",
"description": "Represents a security setting in Azure Security Center.",
"properties": {},
"allOf": [
{
"$ref": "#/definitions/SettingResource"
}
]
},
"DataExportSettings": {
"type": "object",
"description": "Represents a data export setting",
Expand All @@ -199,7 +189,7 @@
],
"x-ms-discriminator-value": "DataExportSettings"
},
"SettingResource": {
"Setting": {
"type": "object",
"description": "The kind of the security setting",
"properties": {
Expand Down

0 comments on commit 95685f8

Please sign in to comment.