CodeGen from PR 12246 in Azure/azure-rest-api-specs

Fix swagger correctness errors (#12246) * Fix swagger correctness issues in Security for Iot service * changed int format from 32 to 64 * Add systemData to iotSecuritySolutions Co-authored-by: Liran Chen <lirche@microsoft.com>
Azure · Jan 4, 2021 · 9995a7c · 9995a7c
1 parent 9cd73d3
commit 9995a7c
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 10 deletions.
diff --git a/schemas/2015-06-01-preview/Microsoft.Security.json b/schemas/2015-06-01-preview/Microsoft.Security.json
@@ -703,4 +703,4 @@
       "description": "Represents a machine that is part of a VM/server group"
     }
   }
-}
+}
diff --git a/schemas/2017-08-01-preview/Microsoft.Security.json b/schemas/2017-08-01-preview/Microsoft.Security.json
@@ -1557,4 +1557,4 @@
       "description": "Workspace setting data"
     }
   }
-}
+}
diff --git a/schemas/2018-06-01/Microsoft.Security.json b/schemas/2018-06-01/Microsoft.Security.json
@@ -71,4 +71,4 @@
       "description": "Pricing properties for the relevant scope"
     }
   }
-}
+}
diff --git a/schemas/2019-01-01-preview/Microsoft.Security.json b/schemas/2019-01-01-preview/Microsoft.Security.json
@@ -475,7 +475,8 @@
                 "SubAssessments",
                 "Alerts",
                 "SecureScores",
-                "SecureScoreControls"
+                "SecureScoreControls",
+                "RegulatoryComplianceAssessment"
               ]
             },
             {
@@ -895,4 +896,4 @@
       ]
     }
   }
-}
+}
diff --git a/schemas/2019-01-01/Microsoft.Security.json b/schemas/2019-01-01/Microsoft.Security.json
@@ -155,4 +155,4 @@
       "description": "Represents a data export setting"
     }
   }
-}
+}
diff --git a/schemas/2019-08-01/Microsoft.Security.json b/schemas/2019-08-01/Microsoft.Security.json
@@ -120,12 +120,57 @@
       ],
       "description": "Number of active connections is not in allowed range."
     },
+    "AdditionalWorkspacesProperties": {
+      "type": "object",
+      "properties": {
+        "dataTypes": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "Alerts",
+                  "RawEvents"
+                ]
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "List of data types sent to workspace"
+        },
+        "type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Sentinel"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Workspace type."
+        },
+        "workspace": {
+          "type": "string",
+          "description": "Workspace resource id"
+        }
+      },
+      "description": "Properties of the additional workspaces."
+    },
     "AllowlistCustomAlertRule": {
       "type": "object",
       "oneOf": [
         {
           "$ref": "#/definitions/ConnectionToIpNotAllowed"
         },
+        {
+          "$ref": "#/definitions/ConnectionFromIpNotAllowed"
+        },
         {
           "$ref": "#/definitions/LocalUserNotAllowed"
         },
@@ -211,6 +256,21 @@
       ],
       "description": "Number of device to cloud messages (AMQP protocol) is not in allowed range."
     },
+    "ConnectionFromIpNotAllowed": {
+      "type": "object",
+      "properties": {
+        "ruleType": {
+          "type": "string",
+          "enum": [
+            "ConnectionFromIpNotAllowed"
+          ]
+        }
+      },
+      "required": [
+        "ruleType"
+      ],
+      "description": "Inbound connection from an ip that isn't allowed. Allow list consists of ipv4 or ipv6 range in CIDR notation."
+    },
     "ConnectionToIpNotAllowed": {
       "type": "object",
       "properties": {
@@ -416,6 +476,20 @@
     "IoTSecuritySolutionProperties": {
       "type": "object",
       "properties": {
+        "additionalWorkspaces": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/AdditionalWorkspacesProperties"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "List of additional workspaces"
+        },
         "disabledDataSources": {
           "oneOf": [
             {
@@ -857,4 +931,4 @@
       "description": "Properties of the IoT Security solution's user defined resources."
     }
   }
-}
+}
diff --git a/schemas/2020-01-01-preview/Microsoft.Security.json b/schemas/2020-01-01-preview/Microsoft.Security.json
@@ -320,4 +320,4 @@
       "description": "Details of the service principal."
     }
   }
-}
+}
diff --git a/schemas/2020-01-01/Microsoft.Security.json b/schemas/2020-01-01/Microsoft.Security.json
@@ -1236,4 +1236,4 @@
       "description": "Represents a machine that is part of a machine group"
     }
   }
-}
+}
diff --git a/schemas/2020-08-06-preview/Microsoft.Security.json b/schemas/2020-08-06-preview/Microsoft.Security.json
@@ -147,4 +147,4 @@
       "description": "IoT sensor properties"
     }
   }
-}
+}