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

Merge 2076afbc133e15f29d0bbe126d6984464573a99d into d4f163e41ce4860d5496e83454fc052ef6fe640d
AzureSDKAutomation · Feb 22, 2021 · fe72dc8 · fe72dc8
1 parent bc2fb4a
commit fe72dc8
Show file tree

Hide file tree

Showing 10 changed files with 170 additions and 36 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
@@ -899,4 +899,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
@@ -931,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
@@ -43,33 +43,6 @@
         "type"
       ],
       "description": "Microsoft.Security/connectors"
-    },
-    "securityContacts": {
-      "type": "object",
-      "properties": {
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2020-01-01-preview"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "Name of the security contact object"
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Security/securityContacts"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "type"
-      ],
-      "description": "Microsoft.Security/securityContacts"
     }
   },
   "definitions": {
@@ -320,4 +293,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-07-01-preview/Microsoft.Security.json b/schemas/2020-07-01-preview/Microsoft.Security.json
@@ -0,0 +1,65 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Security.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.Security",
+  "description": "Microsoft Security Resource Types",
+  "resourceDefinitions": {},
+  "unknown_resourceDefinitions": {
+    "sqlVulnerabilityAssessments_baselineRules": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-07-01-preview"
+          ]
+        },
+        "latestScan": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Take results from latest scan."
+        },
+        "name": {
+          "type": "string",
+          "description": "The rule Id."
+        },
+        "results": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Expected results to be inserted into the baseline.\r\nLeave this field empty it LatestScan == true."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Security/sqlVulnerabilityAssessments/baselineRules"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "type"
+      ],
+      "description": "Microsoft.Security/sqlVulnerabilityAssessments/baselineRules"
+    }
+  },
+  "definitions": {}
+}
diff --git a/schemas/2020-08-06-preview/Microsoft.Security.json b/schemas/2020-08-06-preview/Microsoft.Security.json
@@ -45,6 +45,33 @@
         "type"
       ],
       "description": "Microsoft.Security/iotDefenderSettings"
+    },
+    "onPremiseIotSensors": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-06-preview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "Name of the on-premise IoT sensor"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Security/onPremiseIotSensors"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "type"
+      ],
+      "description": "Microsoft.Security/onPremiseIotSensors"
     }
   },
   "unknown_resourceDefinitions": {
@@ -86,6 +113,47 @@
         "type"
       ],
       "description": "Microsoft.Security/iotSensors"
+    },
+    "iotSites": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-08-06-preview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "enum": [
+            "default"
+          ]
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/IotSiteProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "IoT site properties"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Security/iotSites"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Security/iotSites"
     }
   },
   "definitions": {
@@ -145,6 +213,34 @@
         }
       },
       "description": "IoT sensor properties"
+    },
+    "IotSiteProperties": {
+      "type": "object",
+      "properties": {
+        "displayName": {
+          "type": "string",
+          "description": "Display name of the IoT site"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Tags of the IoT site"
+        }
+      },
+      "required": [
+        "displayName"
+      ],
+      "description": "IoT site properties"
     }
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -703,4 +703,4 @@ @@
           "description": "Represents a machine that is part of a VM/server group"
         }
       }
-    }
+    }