From 9995a7c061c20a758d75803bfbd69fee6c201ab0 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Mon, 4 Jan 2021 02:32:22 +0000 Subject: [PATCH] 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 --- .../Microsoft.Security.json | 2 +- .../Microsoft.Security.json | 2 +- schemas/2018-06-01/Microsoft.Security.json | 2 +- .../Microsoft.Security.json | 5 +- schemas/2019-01-01/Microsoft.Security.json | 2 +- schemas/2019-08-01/Microsoft.Security.json | 76 ++++++++++++++++++- .../Microsoft.Security.json | 2 +- schemas/2020-01-01/Microsoft.Security.json | 2 +- .../Microsoft.Security.json | 2 +- 9 files changed, 85 insertions(+), 10 deletions(-) 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 dd7c5f7429..940d02bc91 100644 --- 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 @@ ] } } -} \ 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 f3e81261a8..f402a437c3 100644 --- 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." } } -} \ 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..be2ace4df6 100644 --- 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." } } -} \ 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-08-06-preview/Microsoft.Security.json b/schemas/2020-08-06-preview/Microsoft.Security.json index 6313b67177..ff470abe1e 100644 --- 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" } } -} \ No newline at end of file +}