diff --git a/schemas/2015-06-01-preview/Microsoft.Security.json b/schemas/2015-06-01-preview/Microsoft.Security.json index adc017f32a..c33a60dcba 100644 --- 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" } } -} \ No newline at end of file +} diff --git a/schemas/2017-08-01-preview/Microsoft.Security.json b/schemas/2017-08-01-preview/Microsoft.Security.json index 365e17bd67..fd4de89029 100644 --- 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" } } -} \ No newline at end of file +} diff --git a/schemas/2018-06-01/Microsoft.Security.json b/schemas/2018-06-01/Microsoft.Security.json index 614eded030..09ed3e2ec3 100644 --- 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" } } -} \ No newline at end of file +} diff --git a/schemas/2019-01-01-preview/Microsoft.Security.json b/schemas/2019-01-01-preview/Microsoft.Security.json index efb9868cc1..f48064a4f5 100644 --- a/schemas/2019-01-01-preview/Microsoft.Security.json +++ b/schemas/2019-01-01-preview/Microsoft.Security.json @@ -899,4 +899,4 @@ ] } } -} \ No newline at end of file +} diff --git a/schemas/2019-01-01/Microsoft.Security.json b/schemas/2019-01-01/Microsoft.Security.json index 2b7498a9e3..354a3291ab 100644 --- 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" } } -} \ No newline at end of file +} diff --git a/schemas/2019-08-01/Microsoft.Security.json b/schemas/2019-08-01/Microsoft.Security.json index 43f54f4196..f402a437c3 100644 --- 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." } } -} \ No newline at end of file +} diff --git a/schemas/2020-01-01-preview/Microsoft.Security.json b/schemas/2020-01-01-preview/Microsoft.Security.json index 51bf650198..212ab76a7c 100644 --- 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." } } -} \ No newline at end of file +} diff --git a/schemas/2020-01-01/Microsoft.Security.json b/schemas/2020-01-01/Microsoft.Security.json index 116df6202b..6e08cf7f32 100644 --- 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" } } -} \ No newline at end of file +} diff --git a/schemas/2020-07-01-preview/Microsoft.Security.json b/schemas/2020-07-01-preview/Microsoft.Security.json new file mode 100644 index 0000000000..1f6adb1dd3 --- /dev/null +++ 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 index 6313b67177..7a5dc65163 100644 --- 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" } } -} \ No newline at end of file +}