Skip to content

[PendingArmReview] Fixed Settings API #9227

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
akning-ms merged 8 commits into from
May 2, 2020
Merged

[PendingArmReview] Fixed Settings API #9227

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1116ffb
fixed settings api. changed the dataexportsetting parameter name and …
taklei1 Apr 26, 2020
705ec48
deleted propersties
taklei1 Apr 26, 2020
4d4aed8
ran prettier fix
taklei1 Apr 26, 2020
7ee1d54
fixed update test and added properties in Settings definition
taklei1 Apr 30, 2020
c89bd90
deleting additionalproperties because of autorest errors
taklei1 Apr 30, 2020
46412c4
adding back additionalProperties
taklei1 Apr 30, 2020
3e05a68
deleting a readonly property from the example
taklei1 May 2, 2020
d2f4ab0
deleting another readonly property from the example
taklei1 May 2, 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
2 changes: 1 addition & 1 deletion ...ce-manager/Microsoft.Security/stable/2019-01-01/examples/Settings/GetSetting_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"body": {
"id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/settings/MCAS",
"name": "MCAS",
"kind": "DataExportSetting",
"kind": "DataExportSettings",
"type": "Microsoft.Security/settings",
"properties": {
"enabled": true
Expand Down
4 changes: 2 additions & 2 deletions ...e-manager/Microsoft.Security/stable/2019-01-01/examples/Settings/GetSettings_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{
"id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/settings/MCAS",
"name": "MCAS",
"kind": "DataExportSetting",
"kind": "DataExportSettings",
"type": "Microsoft.Security/settings",
"properties": {
"enabled": true
Expand All @@ -19,7 +19,7 @@
{
"id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/settings/WDATP",
"name": "WDATP",
"kind": "DataExportSetting",
"kind": "DataExportSettings",
"type": "Microsoft.Security/settings",
"properties": {
"enabled": false
Expand Down
4 changes: 2 additions & 2 deletions ...manager/Microsoft.Security/stable/2019-01-01/examples/Settings/UpdateSetting_example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"setting": {
"id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/settings/MCAS",
"name": "MCAS",
"kind": "DataExportSetting",
"kind": "DataExportSettings",
"type": "Microsoft.Security/settings",
"properties": {
"enabled": true
Expand All @@ -18,7 +18,7 @@
"body": {
"id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Security/settings/MCAS",
"name": "MCAS",
"kind": "DataExportSetting",
"kind": "DataExportSettings",
"type": "Microsoft.Security/settings",
"properties": {
"enabled": true
Expand Down
15 changes: 7 additions & 8 deletions specification/security/resource-manager/Microsoft.Security/stable/2019-01-01/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,18 +175,15 @@
"Setting": {
"type": "object",
"description": "Represents a security setting in Azure Security Center.",
"discriminator": "kind",
"properties": {},
"allOf": [
{
"$ref": "#/definitions/SettingResource"
}
]
},
"DataExportSetting": {
"DataExportSettings": {
"type": "object",
"description": "Represents a data export setting",
"x-ms-discriminator-value": "DataExportSetting",
"properties": {
"properties": {
"x-ms-client-flatten": true,
Expand All @@ -198,25 +195,26 @@
{
"$ref": "#/definitions/Setting"
}
]
],
"x-ms-discriminator-value": "DataExportSettings"
},
"SettingResource": {
"type": "object",
"description": "The kind of the security setting",
"properties": {
"kind": {
"type": "string",
"description": "the kind of the settings string (DataExportSetting)",
"description": "the kind of the settings string (DataExportSettings)",
"enum": [
"DataExportSetting",
"DataExportSettings",
"AlertSuppressionSetting"
],
"x-ms-enum": {
"name": "SettingKind",
"modelAsString": true,
"values": [
{
"value": "DataExportSetting"
"value": "DataExportSettings"
},
{
"value": "AlertSuppressionSetting"
Expand All @@ -225,6 +223,7 @@
}
}
},
"discriminator": "kind",
"required": [
"kind"
],
Expand Down