[PendingArmReview] Fixed Settings API (Azure#9227)

* fixed settings api. changed the dataexportsetting parameter name and the discriminator place * deleted propersties * ran prettier fix * fixed update test and added properties in Settings definition * deleting additionalproperties because of autorest errors * adding back additionalProperties * deleting a readonly property from the example * deleting another readonly property from the example
00Kai0 · Oct 12, 2020 · 971b53c · 971b53c
1 parent b57516e
commit 971b53c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/...ce-manager/Microsoft.Security/stable/2019-01-01/examples/Settings/GetSetting_example.json b/...ce-manager/Microsoft.Security/stable/2019-01-01/examples/Settings/GetSetting_example.json
@@ -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

diff --git a/...e-manager/Microsoft.Security/stable/2019-01-01/examples/Settings/GetSettings_example.json b/...e-manager/Microsoft.Security/stable/2019-01-01/examples/Settings/GetSettings_example.json
@@ -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
@@ -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

diff --git a/...manager/Microsoft.Security/stable/2019-01-01/examples/Settings/UpdateSetting_example.json b/...manager/Microsoft.Security/stable/2019-01-01/examples/Settings/UpdateSetting_example.json
@@ -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",
+      "kind": "DataExportSettings",
       "properties": {
         "enabled": true
       }
@@ -18,7 +15,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

diff --git a/specification/security/resource-manager/Microsoft.Security/stable/2019-01-01/settings.json b/specification/security/resource-manager/Microsoft.Security/stable/2019-01-01/settings.json
@@ -175,18 +175,16 @@
     "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,
@@ -198,25 +196,27 @@
         {
           "$ref": "#/definitions/Setting"
         }
-      ]
+      ],
+      "x-ms-discriminator-value": "DataExportSettings"
     },
     "SettingResource": {
       "type": "object",
       "description": "The kind of the security setting",
+      "additionalProperties": true,
       "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"
@@ -225,6 +225,7 @@
           }
         }
       },
+      "discriminator": "kind",
       "required": [
         "kind"
       ],