From d9477147ee94446804efb7df1f94e10d6df5cb20 Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Sun, 22 Dec 2019 02:54:52 +0200 Subject: [PATCH 01/17] added requirements check --- .../2019-01-01-preview/SecurityInsights.json | 258 ++++++++++++++++++ ...CheckRequirementsAzureActiveDirectory.json | 23 ++ .../CheckRequirementsAzureSecurityCenter.json | 23 ++ .../CheckRequirementsMdatp.json | 23 ++ ...RequirementsMicrosoftCloudAppSecurity.json | 23 ++ .../CheckRequirementsOffice365.json | 23 ++ .../CheckRequirementsThreatIntelligence.json | 23 ++ 7 files changed, 396 insertions(+) create mode 100644 specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json create mode 100644 specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json create mode 100644 specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json create mode 100644 specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json create mode 100644 specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsOffice365.json create mode 100644 specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json index e7d8ee703546..4365ee88014a 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json @@ -1819,6 +1819,69 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{operationalInsightsResourceProvider}/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/dataConnectorsCheckRequirements": { + "post": { + "x-ms-examples": { + "Check requirements for TI.": { + "$ref": "./examples/dataConnectors/CheckRequirementsThreatIntelligence.json" + }, + "Check requirements for AAD.": { + "$ref": "./examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json" + }, + "Check requirements for ASC.": { + "$ref": "./examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json" + }, + "Check requirements for Mcas.": { + "$ref": "./examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json" + }, + "Check requirements for Office.": { + "$ref": "./examples/dataConnectors/CheckRequirementsOffice365.json" + }, + "Check requirements for Mdatp.": { + "$ref": "./examples/dataConnectors/CheckRequirementsMdatp.json" + } + }, + "tags": [ + "Check Data Connector Requirements" + ], + "description": "Get requirements state for a data connector type.", + "operationId": "DataConnectorRequirements_list", + "parameters": [ + { + "$ref": "#/parameters/ApiVersion" + }, + { + "$ref": "#/parameters/SubscriptionId" + }, + { + "$ref": "#/parameters/ResourceGroupName" + }, + { + "$ref": "#/parameters/WorkspaceName" + }, + { + "$ref": "#/parameters/OperationalInsightsResourceProvider" + }, + { + "$ref": "#/parameters/DataConnectorsCheckRequirementsBody" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/DataConnectorRequirementsState" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{operationalInsightsResourceProvider}/workspaces/{workspaceName}/providers/Microsoft.SecurityInsights/entities": { "get": { "x-ms-examples": { @@ -2425,6 +2488,18 @@ "description": "AAD (Azure Active Directory) data connector properties.", "type": "object" }, + "AADCheckRequirements": { + "allOf": [ + { + "$ref": "#/definitions/DataConnectorsCheckRequirements" + }, + { + "$ref": "#/definitions/DataConnectorTenantId" + } + ], + "description": "AAD (Azure Active Directory) requirements check properties.", + "type": "object" + }, "AATPDataConnector": { "allOf": [ { @@ -2454,6 +2529,18 @@ "description": "AATP (Azure Advanced Threat Protection) data connector properties.", "type": "object" }, + "AATPCheckRequirements": { + "allOf": [ + { + "$ref": "#/definitions/DataConnectorsCheckRequirements" + }, + { + "$ref": "#/definitions/DataConnectorTenantId" + } + ], + "description": "AATP (Azure Advanced Threat Protection) requirements check properties.", + "type": "object" + }, "ASCDataConnector": { "allOf": [ { @@ -2486,6 +2573,21 @@ }, "type": "object" }, + "ASCCheckRequirements": { + "description": "ASC (Azure Security Center) requirements check properties.", + "allOf": [ + { + "$ref": "#/definitions/DataConnectorsCheckRequirements" + } + ], + "properties": { + "subscriptionId": { + "description": "The subscription id to connect to, and get the data from.", + "type": "string" + } + }, + "type": "object" + }, "AccountEntity": { "allOf": [ { @@ -2966,6 +3068,15 @@ }, "type": "object" }, + "AwsCloudTrailCheckRequirements": { + "allOf": [ + { + "$ref": "#/definitions/DataConnectorsCheckRequirements" + } + ], + "description": "Amazon Web Services CloudTrail requirements check properties.", + "type": "object" + }, "AzureResourceEntity": { "allOf": [ { @@ -3797,6 +3908,78 @@ "discriminator": "kind", "type": "object" }, + "DataConnectorsCheckRequirements": { + "allOf": [ + { + "$ref": "#/definitions/DataConnectorKind" + } + ], + "description": "Data connector requirements properties." + }, + "DataConnectorAuthorizationState": { + "description": "Describes the state of user's authorization for a connector kind.", + "enum": [ + "Valid", + "Invalid" + ], + "type": "string", + "x-ms-enum": { + "modelAsString": true, + "name": "DataConnectorAuthorizationState", + "values": [ + { + "value": "Valid" + }, + { + "value": "Invalid" + } + ] + } + }, + "DataConnectorLicenseState": { + "description": "Describes the state of user's license for a connector kind.", + "enum": [ + "Valid", + "Unknown", + "SubscriptionStandardTierLicenseRequired", + "AADP1OrP2LicenseRequired", + "MicrosoftCloudAppSecurityLicenseRequired", + "AzureAdvancedThreatProtectionLicenseRequired", + "AzureInformationProtectionLicenseRequired", + "MicrosoftDefenderAdvancedThreatProtectionEnableRequired" + ], + "type": "string", + "x-ms-enum": { + "modelAsString": true, + "name": "DataConnectorLicenseState", + "values": [ + { + "value": "Valid" + }, + { + "value": "Unknown" + }, + { + "value": "SubscriptionStandardTierLicenseRequired" + }, + { + "value": "AADP1OrP2LicenseRequired" + }, + { + "value": "MicrosoftCloudAppSecurityLicenseRequired" + }, + { + "value": "AzureAdvancedThreatProtectionLicenseRequired" + }, + { + "value": "AzureInformationProtectionLicenseRequired" + }, + { + "value": "MicrosoftDefenderAdvancedThreatProtectionEnableRequired" + } + ] + } + }, "DataConnectorDataTypeCommon": { "description": "Common field for data type in data connectors.", "properties": { @@ -3910,6 +4093,23 @@ }, "type": "object" }, + "DataConnectorRequirementsState": { + "description": "Data connector requirements status.", + "properties": { + "authorizationState": { + "description": "The state of the user's authorization for this connector.", + "$ref": "#/definitions/DataConnectorAuthorizationState" + }, + "licenseState": { + "description": "A list indicating the user's license state for this connector.", + "items": { + "$ref": "#/definitions/DataConnectorLicenseState" + }, + "type": "array" + } + }, + "type": "object" + }, "DataConnectorTenantId": { "description": "Properties data connector on tenant level.", "properties": { @@ -4853,6 +5053,18 @@ }, "type": "object" }, + "MCASCheckRequirements": { + "allOf": [ + { + "$ref": "#/definitions/DataConnectorsCheckRequirements" + }, + { + "$ref": "#/definitions/DataConnectorTenantId" + } + ], + "description": "MCAS (Microsoft Cloud App Security) requirements check properties.", + "type": "object" + }, "MDATPDataConnector": { "allOf": [ { @@ -4882,6 +5094,18 @@ "description": "MDATP (Microsoft Defender Advanced Threat Protection) data connector properties.", "type": "object" }, + "MDATPCheckRequirements": { + "allOf": [ + { + "$ref": "#/definitions/DataConnectorsCheckRequirements" + }, + { + "$ref": "#/definitions/DataConnectorTenantId" + } + ], + "description": "MDATP (Microsoft Defender Advanced Threat Protection) requirements check properties.", + "type": "object" + }, "MalwareEntity": { "allOf": [ { @@ -5177,6 +5401,18 @@ }, "type": "object" }, + "OfficeCheckRequirements": { + "allOf": [ + { + "$ref": "#/definitions/DataConnectorsCheckRequirements" + }, + { + "$ref": "#/definitions/DataConnectorTenantId" + } + ], + "description": "Office data requirements check properties.", + "type": "object" + }, "Operation": { "description": "Operation provided by provider", "properties": { @@ -6147,6 +6383,18 @@ }, "type": "object" }, + "TICheckRequirements": { + "allOf": [ + { + "$ref": "#/definitions/DataConnectorsCheckRequirements" + }, + { + "$ref": "#/definitions/DataConnectorTenantId" + } + ], + "description": "TI (Threat Intelligence) requirements check properties.", + "type": "object" + }, "ThreatIntelligence": { "description": "ThreatIntelligence property bag.", "properties": { @@ -6537,6 +6785,16 @@ "type": "string", "x-ms-parameter-location": "method" }, + "DataConnectorsCheckRequirementsBody": { + "description": "The parameters for requirements check message", + "in": "body", + "name": "DataConnectorsCheckRequirements", + "required": true, + "schema": { + "$ref": "#/definitions/DataConnectorsCheckRequirements" + }, + "x-ms-parameter-location": "method" + }, "EntityExpandRequestBody": { "description": "The parameters required to execute an expand operation on the given entity.", "in": "body", diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json new file mode 100644 index 000000000000..5925d8ea2c30 --- /dev/null +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "api-version": "2019-01-01-preview", + "subscriptionId": "d0cfe6b2-9ac0-4464-9919-dccaee2e48c0", + "resourceGroupName": "myRg", + "workspaceName": "myWorkspace", + "operationalInsightsResourceProvider": "Microsoft.OperationalIinsights", + "DataConnectorsCheckRequirements": { + "kind": "AzureActiveDirectory", + "properties": { + "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" + } + } + }, + "responses": { + "200": { + "body": { + "authorizationState": "Valid", + "licenseState": ["Valid"] + } + } + } +} diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json new file mode 100644 index 000000000000..67b694e6fbcb --- /dev/null +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "api-version": "2019-01-01-preview", + "subscriptionId": "d0cfe6b2-9ac0-4464-9919-dccaee2e48c0", + "resourceGroupName": "myRg", + "workspaceName": "myWorkspace", + "operationalInsightsResourceProvider": "Microsoft.OperationalIinsights", + "DataConnectorsCheckRequirements": { + "kind": "AzureSecurityCenter", + "properties": { + "subscriptionId": "c0688291-89d7-4bed-87a2-a7b1bff43f4c" + } + } + }, + "responses": { + "200": { + "body": { + "authorizationState": "Valid", + "licenseState": ["Valid"] + } + } + } +} diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json new file mode 100644 index 000000000000..0078c04b38d0 --- /dev/null +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "api-version": "2019-01-01-preview", + "subscriptionId": "d0cfe6b2-9ac0-4464-9919-dccaee2e48c0", + "resourceGroupName": "myRg", + "workspaceName": "myWorkspace", + "operationalInsightsResourceProvider": "Microsoft.OperationalIinsights", + "DataConnectorsCheckRequirements": { + "kind": "MicrosoftCloudAppSecurity", + "properties": { + "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" + } + } + }, + "responses": { + "200": { + "body": { + "authorizationState": "Valid", + "licenseState": ["Valid"] + } + } + } +} diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json new file mode 100644 index 000000000000..d755030ee1fd --- /dev/null +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "api-version": "2019-01-01-preview", + "subscriptionId": "d0cfe6b2-9ac0-4464-9919-dccaee2e48c0", + "resourceGroupName": "myRg", + "workspaceName": "myWorkspace", + "operationalInsightsResourceProvider": "Microsoft.OperationalIinsights", + "DataConnectorsCheckRequirements": { + "kind": "MicrosoftCloudAppSecurity", + "properties": { + "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" + } + } + }, + "responses": { + "200": { + "body": { + "authorizationState": "Valid", + "licenseState": ["Valid"] + } + } + } +} diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsOffice365.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsOffice365.json new file mode 100644 index 000000000000..6b69dd890f5c --- /dev/null +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsOffice365.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "api-version": "2019-01-01-preview", + "subscriptionId": "d0cfe6b2-9ac0-4464-9919-dccaee2e48c0", + "resourceGroupName": "myRg", + "workspaceName": "myWorkspace", + "operationalInsightsResourceProvider": "Microsoft.OperationalIinsights", + "DataConnectorsCheckRequirements": { + "kind": "Office365", + "properties": { + "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" + } + } + }, + "responses": { + "200": { + "body": { + "authorizationState": "Valid", + "licenseState": ["Valid"] + } + } + } +} diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json new file mode 100644 index 000000000000..92ea977b20d7 --- /dev/null +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "api-version": "2019-01-01-preview", + "subscriptionId": "d0cfe6b2-9ac0-4464-9919-dccaee2e48c0", + "resourceGroupName": "myRg", + "workspaceName": "myWorkspace", + "operationalInsightsResourceProvider": "Microsoft.OperationalIinsights", + "DataConnectorsCheckRequirements": { + "kind": "ThreatIntelligence", + "properties": { + "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" + } + } + }, + "responses": { + "200": { + "body": { + "authorizationState": "Valid", + "licenseState": ["Valid"] + } + } + } +} From fae516453e865d4b85f342798d009c838739c959 Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Sun, 22 Dec 2019 03:15:05 +0200 Subject: [PATCH 02/17] ran prettier check --- ...CheckRequirementsAzureActiveDirectory.json | 14 +++++++------ .../CheckRequirementsAzureSecurityCenter.json | 14 +++++++------ .../CheckRequirementsMdatp.json | 20 ++++++++++--------- ...RequirementsMicrosoftCloudAppSecurity.json | 14 +++++++------ .../CheckRequirementsOffice365.json | 20 ++++++++++--------- .../CheckRequirementsThreatIntelligence.json | 20 ++++++++++--------- 6 files changed, 57 insertions(+), 45 deletions(-) diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json index 5925d8ea2c30..7392a8af7f81 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json @@ -5,18 +5,20 @@ "resourceGroupName": "myRg", "workspaceName": "myWorkspace", "operationalInsightsResourceProvider": "Microsoft.OperationalIinsights", - "DataConnectorsCheckRequirements": { - "kind": "AzureActiveDirectory", - "properties": { - "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" - } + "DataConnectorsCheckRequirements": { + "kind": "AzureActiveDirectory", + "properties": { + "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" } + } }, "responses": { "200": { "body": { "authorizationState": "Valid", - "licenseState": ["Valid"] + "licenseState": [ + "Valid" + ] } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json index 67b694e6fbcb..4646d013557b 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json @@ -5,18 +5,20 @@ "resourceGroupName": "myRg", "workspaceName": "myWorkspace", "operationalInsightsResourceProvider": "Microsoft.OperationalIinsights", - "DataConnectorsCheckRequirements": { - "kind": "AzureSecurityCenter", - "properties": { - "subscriptionId": "c0688291-89d7-4bed-87a2-a7b1bff43f4c" - } + "DataConnectorsCheckRequirements": { + "kind": "AzureSecurityCenter", + "properties": { + "subscriptionId": "c0688291-89d7-4bed-87a2-a7b1bff43f4c" } + } }, "responses": { "200": { "body": { "authorizationState": "Valid", - "licenseState": ["Valid"] + "licenseState": [ + "Valid" + ] } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json index 0078c04b38d0..4d341d401421 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json @@ -5,19 +5,21 @@ "resourceGroupName": "myRg", "workspaceName": "myWorkspace", "operationalInsightsResourceProvider": "Microsoft.OperationalIinsights", - "DataConnectorsCheckRequirements": { - "kind": "MicrosoftCloudAppSecurity", - "properties": { - "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" - } + "DataConnectorsCheckRequirements": { + "kind": "MicrosoftCloudAppSecurity", + "properties": { + "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" } + } }, "responses": { "200": { - "body": { - "authorizationState": "Valid", - "licenseState": ["Valid"] - } + "body": { + "authorizationState": "Valid", + "licenseState": [ + "Valid" + ] + } } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json index d755030ee1fd..4d341d401421 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json @@ -5,18 +5,20 @@ "resourceGroupName": "myRg", "workspaceName": "myWorkspace", "operationalInsightsResourceProvider": "Microsoft.OperationalIinsights", - "DataConnectorsCheckRequirements": { - "kind": "MicrosoftCloudAppSecurity", - "properties": { - "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" - } + "DataConnectorsCheckRequirements": { + "kind": "MicrosoftCloudAppSecurity", + "properties": { + "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" } + } }, "responses": { "200": { "body": { "authorizationState": "Valid", - "licenseState": ["Valid"] + "licenseState": [ + "Valid" + ] } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsOffice365.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsOffice365.json index 6b69dd890f5c..4a8ba9c62e4b 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsOffice365.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsOffice365.json @@ -5,19 +5,21 @@ "resourceGroupName": "myRg", "workspaceName": "myWorkspace", "operationalInsightsResourceProvider": "Microsoft.OperationalIinsights", - "DataConnectorsCheckRequirements": { - "kind": "Office365", - "properties": { - "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" - } + "DataConnectorsCheckRequirements": { + "kind": "Office365", + "properties": { + "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" } + } }, "responses": { "200": { - "body": { - "authorizationState": "Valid", - "licenseState": ["Valid"] - } + "body": { + "authorizationState": "Valid", + "licenseState": [ + "Valid" + ] + } } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json index 92ea977b20d7..88df7ee55982 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json @@ -5,19 +5,21 @@ "resourceGroupName": "myRg", "workspaceName": "myWorkspace", "operationalInsightsResourceProvider": "Microsoft.OperationalIinsights", - "DataConnectorsCheckRequirements": { - "kind": "ThreatIntelligence", - "properties": { - "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" - } + "DataConnectorsCheckRequirements": { + "kind": "ThreatIntelligence", + "properties": { + "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" } + } }, "responses": { "200": { - "body": { - "authorizationState": "Valid", - "licenseState": ["Valid"] - } + "body": { + "authorizationState": "Valid", + "licenseState": [ + "Valid" + ] + } } } } From eaed0c53620d0e1c269b4f05c56865c0b1c5d1ef Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Sun, 22 Dec 2019 03:24:15 +0200 Subject: [PATCH 03/17] added required for discriminators, for semantic check to pass --- .../2019-01-01-preview/SecurityInsights.json | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json index 4365ee88014a..319f15593bce 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json @@ -2759,7 +2759,10 @@ ], "description": "The aggregation.", "discriminator": "kind", - "type": "object" + "type": "object", + "required": [ + "kind" + ] }, "AggregationsKind": { "description": "Describes an Azure resource with kind.", @@ -2789,7 +2792,10 @@ ], "description": "Alert rule.", "discriminator": "kind", - "type": "object" + "type": "object", + "required": [ + "kind" + ] }, "AlertRuleKind": { "description": "Describes an Azure resource with kind.", @@ -2832,7 +2838,10 @@ ], "description": "Alert rule template.", "discriminator": "kind", - "type": "object" + "type": "object", + "required": [ + "kind" + ] }, "AlertRuleTemplatePropertiesBase": { "description": "Base alert rule template property bag.", @@ -3906,7 +3915,10 @@ ], "description": "Data connector.", "discriminator": "kind", - "type": "object" + "type": "object", + "required": [ + "kind" + ] }, "DataConnectorsCheckRequirements": { "allOf": [ @@ -4193,7 +4205,10 @@ ], "description": "Specific entity.", "discriminator": "kind", - "type": "object" + "type": "object", + "required": [ + "kind" + ] }, "EntityCommonProperties": { "description": "Entity common property bag.", @@ -6316,7 +6331,10 @@ ], "description": "The Setting.", "discriminator": "kind", - "type": "object" + "type": "object", + "required": [ + "kind" + ] }, "SettingsKind": { "description": "Describes an Azure resource with kind.", From d86d3997e3c95e54d078d67bdd6e38309625856b Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Sat, 4 Jan 2020 00:55:27 +0200 Subject: [PATCH 04/17] updated api --- .../2019-01-01-preview/SecurityInsights.json | 110 +++++++++++++++--- ...CheckRequirementsAzureActiveDirectory.json | 12 +- ...tsAzureActiveDirectoryNoAuthorization.json | 29 +++++ ...irementsAzureActiveDirectoryNoLicense.json | 29 +++++ .../CheckRequirementsAzureSecurityCenter.json | 12 +- .../CheckRequirementsMdatp.json | 12 +- ...RequirementsMicrosoftCloudAppSecurity.json | 12 +- .../CheckRequirementsOffice365.json | 12 +- .../CheckRequirementsThreatIntelligence.json | 12 +- 9 files changed, 200 insertions(+), 40 deletions(-) create mode 100644 specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json create mode 100644 specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json index 319f15593bce..c0aa81098da4 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json @@ -1828,6 +1828,12 @@ "Check requirements for AAD.": { "$ref": "./examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json" }, + "Check requirements for AAD - no license.": { + "$ref": "./examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json" + }, + "Check requirements for AAD - no authorization.": { + "$ref": "./examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json" + }, "Check requirements for ASC.": { "$ref": "./examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json" }, @@ -3928,6 +3934,22 @@ ], "description": "Data connector requirements properties." }, + "DataConnectorAuthorizationModel": { + "description": "A model describing the authorization state and requirements missing (if there are any) for this connector", + "properties": { + "state": { + "description": "Describes the state of user's authorization for a connector kind.", + "$ref": "#/definitions/DataConnectorAuthorizationState" + }, + "requiresAny": { + "description": "A list indicating which authorizations are needed for this connector (at least one), if there's no proper authorization.", + "items": { + "$ref": "#/definitions/DataConnectorAuthorizationType" + }, + "type": "array" + } + } + }, "DataConnectorAuthorizationState": { "description": "Describes the state of user's authorization for a connector kind.", "enum": [ @@ -3948,22 +3970,81 @@ ] } }, + "DataConnectorAuthorizationType": { + "description": "Describes the types of user's authorizations.", + "enum": [ + "GlobalAdmin", + "SecurityAdmin", + "TenantOnboardedToWorkspace" + ], + "type": "string", + "x-ms-enum": { + "modelAsString": true, + "name": "DataConnectorAuthorizationType", + "values": [ + { + "value": "GlobalAdmin" + }, + { + "value": "SecurityAdmin" + }, + { + "value": "TenantOnboardedToWorkspace" + } + ] + } + }, + "DataConnectorLicenseModel": { + "description": "A model describing the license state and requirements missing (if there are any) for this connector", + "properties": { + "state": { + "description": "Describes the state of user's authorization for a connector kind.", + "$ref": "#/definitions/DataConnectorAuthorizationState" + }, + "requiresAll": { + "description": "A list indicating which licenses are missing for this connector if any. All licenses are required.", + "items": { + "$ref": "#/definitions/DataConnectorLicenseType" + }, + "type": "array" + } + } + }, "DataConnectorLicenseState": { "description": "Describes the state of user's license for a connector kind.", "enum": [ "Valid", - "Unknown", - "SubscriptionStandardTierLicenseRequired", - "AADP1OrP2LicenseRequired", - "MicrosoftCloudAppSecurityLicenseRequired", - "AzureAdvancedThreatProtectionLicenseRequired", - "AzureInformationProtectionLicenseRequired", - "MicrosoftDefenderAdvancedThreatProtectionEnableRequired" + "Invalid", + "Unknown" ], "type": "string", "x-ms-enum": { "modelAsString": true, "name": "DataConnectorLicenseState", + "values": [ + { + "value": "Valid" + }, + { + "value": "Invalid" + } + ] + } + }, + "DataConnectorLicenseType": { + "description": "Describes the state of user's license for a connector kind.", + "enum": [ + "SubscriptionStandardTierLicense", + "AADP1OrP2License", + "MicrosoftCloudAppSecurityLicense", + "AzureAdvancedThreatProtectionLicense", + "AzureInformationProtectionLicense", + "MicrosoftDefenderAdvancedThreatProtectionEnable" + ], + "type": "string", + "x-ms-enum": { + "modelAsString": true, + "name": "DataConnectorLicenseType", "values": [ { "value": "Valid" @@ -4108,16 +4189,13 @@ "DataConnectorRequirementsState": { "description": "Data connector requirements status.", "properties": { - "authorizationState": { - "description": "The state of the user's authorization for this connector.", - "$ref": "#/definitions/DataConnectorAuthorizationState" + "authorization": { + "description": "A model describing the authorization state and requirements missing (if there are any) for this connector", + "$ref": "#/definitions/DataConnectorAuthorizationModel" }, - "licenseState": { - "description": "A list indicating the user's license state for this connector.", - "items": { - "$ref": "#/definitions/DataConnectorLicenseState" - }, - "type": "array" + "license": { + "description": "A model describing the license state and requirements missing (if there are any) for this connector", + "$ref": "#/definitions/DataConnectorLicenseModel" } }, "type": "object" diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json index 7392a8af7f81..bf913d0bf89e 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json @@ -15,10 +15,14 @@ "responses": { "200": { "body": { - "authorizationState": "Valid", - "licenseState": [ - "Valid" - ] + "authorization":{ + "state": "Valid", + "requiresAny":[] + }, + "license":{ + "state": "Valid", + "requiresAll":[] + } } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json new file mode 100644 index 000000000000..e519bdb0676a --- /dev/null +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "api-version": "2019-01-01-preview", + "subscriptionId": "d0cfe6b2-9ac0-4464-9919-dccaee2e48c0", + "resourceGroupName": "myRg", + "workspaceName": "myWorkspace", + "operationalInsightsResourceProvider": "Microsoft.OperationalIinsights", + "DataConnectorsCheckRequirements": { + "kind": "AzureActiveDirectory", + "properties": { + "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" + } + } + }, + "responses": { + "200": { + "body": { + "authorization":{ + "state": "Invalid", + "requiresAny":["GlobalAdmin","SecurityAdmin"] + }, + "license":{ + "state": "Unknown", + "requiresAll":[] + } + } + } + } +} diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json new file mode 100644 index 000000000000..9b16c13ff2e1 --- /dev/null +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "api-version": "2019-01-01-preview", + "subscriptionId": "d0cfe6b2-9ac0-4464-9919-dccaee2e48c0", + "resourceGroupName": "myRg", + "workspaceName": "myWorkspace", + "operationalInsightsResourceProvider": "Microsoft.OperationalIinsights", + "DataConnectorsCheckRequirements": { + "kind": "AzureActiveDirectory", + "properties": { + "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" + } + } + }, + "responses": { + "200": { + "body": { + "authorization":{ + "state": "Valid", + "requiresAny":[] + }, + "license":{ + "state": "Invalid", + "requiresAll":["AADP1OrP2LicenseRequired"] + } + } + } + } +} diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json index 4646d013557b..df58515099c0 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json @@ -15,10 +15,14 @@ "responses": { "200": { "body": { - "authorizationState": "Valid", - "licenseState": [ - "Valid" - ] + "authorization":{ + "state": "Valid", + "requiresAny":[] + }, + "license":{ + "state": "Valid", + "requiresAll":[] + } } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json index 4d341d401421..3dcf746e95be 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json @@ -15,10 +15,14 @@ "responses": { "200": { "body": { - "authorizationState": "Valid", - "licenseState": [ - "Valid" - ] + "authorization":{ + "state": "Valid", + "requiresAny":[] + }, + "license":{ + "state": "Valid", + "requiresAll":[] + } } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json index 4d341d401421..3dcf746e95be 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json @@ -15,10 +15,14 @@ "responses": { "200": { "body": { - "authorizationState": "Valid", - "licenseState": [ - "Valid" - ] + "authorization":{ + "state": "Valid", + "requiresAny":[] + }, + "license":{ + "state": "Valid", + "requiresAll":[] + } } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsOffice365.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsOffice365.json index 4a8ba9c62e4b..21c2dd52098c 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsOffice365.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsOffice365.json @@ -15,10 +15,14 @@ "responses": { "200": { "body": { - "authorizationState": "Valid", - "licenseState": [ - "Valid" - ] + "authorization":{ + "state": "Valid", + "requiresAny":[] + }, + "license":{ + "state": "Valid", + "requiresAll":[] + } } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json index 88df7ee55982..1d4651bb366e 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json @@ -15,10 +15,14 @@ "responses": { "200": { "body": { - "authorizationState": "Valid", - "licenseState": [ - "Valid" - ] + "authorization":{ + "state": "Valid", + "requiresAny":[] + }, + "license":{ + "state": "Valid", + "requiresAll":[] + } } } } From 1f9cb21aa44e9de7148a05b77e78c12fdc83999d Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Wed, 8 Jan 2020 11:28:13 +0200 Subject: [PATCH 05/17] added discriminators --- .../2019-01-01-preview/SecurityInsights.json | 48 +++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json index c0aa81098da4..5af0f5cec472 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json @@ -2504,7 +2504,11 @@ } ], "description": "AAD (Azure Active Directory) requirements check properties.", - "type": "object" + "type": "object", + "discriminator": "kind", + "required": [ + "kind" + ] }, "AATPDataConnector": { "allOf": [ @@ -2545,7 +2549,11 @@ } ], "description": "AATP (Azure Advanced Threat Protection) requirements check properties.", - "type": "object" + "type": "object", + "discriminator": "kind", + "required": [ + "kind" + ] }, "ASCDataConnector": { "allOf": [ @@ -2592,7 +2600,11 @@ "type": "string" } }, - "type": "object" + "type": "object", + "discriminator": "kind", + "required": [ + "kind" + ] }, "AccountEntity": { "allOf": [ @@ -3090,7 +3102,11 @@ } ], "description": "Amazon Web Services CloudTrail requirements check properties.", - "type": "object" + "type": "object", + "discriminator": "kind", + "required": [ + "kind" + ] }, "AzureResourceEntity": { "allOf": [ @@ -5156,7 +5172,11 @@ } ], "description": "MCAS (Microsoft Cloud App Security) requirements check properties.", - "type": "object" + "type": "object", + "discriminator": "kind", + "required": [ + "kind" + ] }, "MDATPDataConnector": { "allOf": [ @@ -5197,7 +5217,11 @@ } ], "description": "MDATP (Microsoft Defender Advanced Threat Protection) requirements check properties.", - "type": "object" + "type": "object", + "discriminator": "kind", + "required": [ + "kind" + ] }, "MalwareEntity": { "allOf": [ @@ -5504,7 +5528,11 @@ } ], "description": "Office data requirements check properties.", - "type": "object" + "type": "object", + "discriminator": "kind", + "required": [ + "kind" + ] }, "Operation": { "description": "Operation provided by provider", @@ -6489,7 +6517,11 @@ } ], "description": "TI (Threat Intelligence) requirements check properties.", - "type": "object" + "type": "object", + "discriminator": "kind", + "required": [ + "kind" + ] }, "ThreatIntelligence": { "description": "ThreatIntelligence property bag.", From 0a69eefdd5d66ce6ab9a0cc08d24a77afd348b32 Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Wed, 8 Jan 2020 14:11:32 +0200 Subject: [PATCH 06/17] updates --- .../2019-01-01-preview/SecurityInsights.json | 37 ++++--------------- ...irementsAzureActiveDirectoryNoLicense.json | 2 +- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json index 5af0f5cec472..6ee9d5f013d8 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json @@ -1840,9 +1840,6 @@ "Check requirements for Mcas.": { "$ref": "./examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json" }, - "Check requirements for Office.": { - "$ref": "./examples/dataConnectors/CheckRequirementsOffice365.json" - }, "Check requirements for Mdatp.": { "$ref": "./examples/dataConnectors/CheckRequirementsMdatp.json" } @@ -3991,7 +3988,8 @@ "enum": [ "GlobalAdmin", "SecurityAdmin", - "TenantOnboardedToWorkspace" + "TenantOnboardedToWorkspace", + "SecurityReader" ], "type": "string", "x-ms-enum": { @@ -4003,9 +4001,6 @@ }, { "value": "SecurityAdmin" - }, - { - "value": "TenantOnboardedToWorkspace" } ] } @@ -4069,22 +4064,22 @@ "value": "Unknown" }, { - "value": "SubscriptionStandardTierLicenseRequired" + "value": "SubscriptionStandardTierLicense" }, { - "value": "AADP1OrP2LicenseRequired" + "value": "AADP1OrP2License" }, { - "value": "MicrosoftCloudAppSecurityLicenseRequired" + "value": "MicrosoftCloudAppSecurityLicense" }, { - "value": "AzureAdvancedThreatProtectionLicenseRequired" + "value": "AzureAdvancedThreatProtectionLicense" }, { - "value": "AzureInformationProtectionLicenseRequired" + "value": "AzureInformationProtectionLicense" }, { - "value": "MicrosoftDefenderAdvancedThreatProtectionEnableRequired" + "value": "MicrosoftDefenderAdvancedThreatProtectionEnable" } ] } @@ -5518,22 +5513,6 @@ }, "type": "object" }, - "OfficeCheckRequirements": { - "allOf": [ - { - "$ref": "#/definitions/DataConnectorsCheckRequirements" - }, - { - "$ref": "#/definitions/DataConnectorTenantId" - } - ], - "description": "Office data requirements check properties.", - "type": "object", - "discriminator": "kind", - "required": [ - "kind" - ] - }, "Operation": { "description": "Operation provided by provider", "properties": { diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json index 9b16c13ff2e1..a9721a3d9bcf 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json @@ -21,7 +21,7 @@ }, "license":{ "state": "Invalid", - "requiresAll":["AADP1OrP2LicenseRequired"] + "requiresAll":["AADP1OrP2License"] } } } From 6b02c9ad6fe4a786d66f470bc25af9ccd017733c Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Wed, 15 Jan 2020 00:02:29 +0200 Subject: [PATCH 07/17] removed unused example json file --- .../CheckRequirementsOffice365.json | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsOffice365.json diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsOffice365.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsOffice365.json deleted file mode 100644 index 21c2dd52098c..000000000000 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsOffice365.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parameters": { - "api-version": "2019-01-01-preview", - "subscriptionId": "d0cfe6b2-9ac0-4464-9919-dccaee2e48c0", - "resourceGroupName": "myRg", - "workspaceName": "myWorkspace", - "operationalInsightsResourceProvider": "Microsoft.OperationalIinsights", - "DataConnectorsCheckRequirements": { - "kind": "Office365", - "properties": { - "tenantId": "2070ecc9-b4d5-4ae4-adaa-936fa1954fa8" - } - } - }, - "responses": { - "200": { - "body": { - "authorization":{ - "state": "Valid", - "requiresAny":[] - }, - "license":{ - "state": "Valid", - "requiresAll":[] - } - } - } - } -} From 3037c2f97b0f405b62c24d4ddc6babffbe5da254 Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Tue, 21 Jan 2020 22:44:35 +0200 Subject: [PATCH 08/17] changes according to comments --- .../preview/2019-01-01-preview/SecurityInsights.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json index 6ee9d5f013d8..343f4b2e0b55 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json @@ -1848,7 +1848,7 @@ "Check Data Connector Requirements" ], "description": "Get requirements state for a data connector type.", - "operationId": "DataConnectorRequirements_list", + "operationId": "listDataConnectorRequirements", "parameters": [ { "$ref": "#/parameters/ApiVersion" @@ -3989,7 +3989,8 @@ "GlobalAdmin", "SecurityAdmin", "TenantOnboardedToWorkspace", - "SecurityReader" + "SecurityReader", + "ReadSubscriptionSecurityData" ], "type": "string", "x-ms-enum": { From cd59e71924ddb34bc74563097b1b893ff2f85bf4 Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Tue, 21 Jan 2020 22:54:49 +0200 Subject: [PATCH 09/17] changed tab to spaces --- .../preview/2019-01-01-preview/SecurityInsights.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json index 343f4b2e0b55..f16b64169839 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json @@ -3990,7 +3990,7 @@ "SecurityAdmin", "TenantOnboardedToWorkspace", "SecurityReader", - "ReadSubscriptionSecurityData" + "ReadSubscriptionSecurityData" ], "type": "string", "x-ms-enum": { From 879a0e0e2b53660f75a36ec483a0268be775903c Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Tue, 21 Jan 2020 23:10:51 +0200 Subject: [PATCH 10/17] ran prettier --- ...CheckRequirementsAzureActiveDirectory.json | 16 ++++++++-------- ...tsAzureActiveDirectoryNoAuthorization.json | 19 +++++++++++-------- ...irementsAzureActiveDirectoryNoLicense.json | 18 ++++++++++-------- .../CheckRequirementsAzureSecurityCenter.json | 16 ++++++++-------- .../CheckRequirementsMdatp.json | 16 ++++++++-------- ...RequirementsMicrosoftCloudAppSecurity.json | 16 ++++++++-------- .../CheckRequirementsThreatIntelligence.json | 16 ++++++++-------- 7 files changed, 61 insertions(+), 56 deletions(-) diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json index bf913d0bf89e..35bfeb456de2 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json @@ -15,14 +15,14 @@ "responses": { "200": { "body": { - "authorization":{ - "state": "Valid", - "requiresAny":[] - }, - "license":{ - "state": "Valid", - "requiresAll":[] - } + "authorization": { + "state": "Valid", + "requiresAny": [] + }, + "license": { + "state": "Valid", + "requiresAll": [] + } } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json index e519bdb0676a..1d1a82b93ad1 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json @@ -15,14 +15,17 @@ "responses": { "200": { "body": { - "authorization":{ - "state": "Invalid", - "requiresAny":["GlobalAdmin","SecurityAdmin"] - }, - "license":{ - "state": "Unknown", - "requiresAll":[] - } + "authorization": { + "state": "Invalid", + "requiresAny": [ + "GlobalAdmin", + "SecurityAdmin" + ] + }, + "license": { + "state": "Unknown", + "requiresAll": [] + } } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json index a9721a3d9bcf..3c6f94d923ce 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json @@ -15,14 +15,16 @@ "responses": { "200": { "body": { - "authorization":{ - "state": "Valid", - "requiresAny":[] - }, - "license":{ - "state": "Invalid", - "requiresAll":["AADP1OrP2License"] - } + "authorization": { + "state": "Valid", + "requiresAny": [] + }, + "license": { + "state": "Invalid", + "requiresAll": [ + "AADP1OrP2License" + ] + } } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json index df58515099c0..e7d26610918f 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json @@ -15,14 +15,14 @@ "responses": { "200": { "body": { - "authorization":{ - "state": "Valid", - "requiresAny":[] - }, - "license":{ - "state": "Valid", - "requiresAll":[] - } + "authorization": { + "state": "Valid", + "requiresAny": [] + }, + "license": { + "state": "Valid", + "requiresAll": [] + } } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json index 3dcf746e95be..ef2ea0f08a21 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json @@ -15,14 +15,14 @@ "responses": { "200": { "body": { - "authorization":{ - "state": "Valid", - "requiresAny":[] - }, - "license":{ - "state": "Valid", - "requiresAll":[] - } + "authorization": { + "state": "Valid", + "requiresAny": [] + }, + "license": { + "state": "Valid", + "requiresAll": [] + } } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json index 3dcf746e95be..ef2ea0f08a21 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json @@ -15,14 +15,14 @@ "responses": { "200": { "body": { - "authorization":{ - "state": "Valid", - "requiresAny":[] - }, - "license":{ - "state": "Valid", - "requiresAll":[] - } + "authorization": { + "state": "Valid", + "requiresAny": [] + }, + "license": { + "state": "Valid", + "requiresAll": [] + } } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json index 1d4651bb366e..890354717082 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json @@ -15,14 +15,14 @@ "responses": { "200": { "body": { - "authorization":{ - "state": "Valid", - "requiresAny":[] - }, - "license":{ - "state": "Valid", - "requiresAll":[] - } + "authorization": { + "state": "Valid", + "requiresAny": [] + }, + "license": { + "state": "Valid", + "requiresAll": [] + } } } } From dffb6ded091380e213886b927dc34dc534fb8781 Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Wed, 22 Jan 2020 10:30:12 +0200 Subject: [PATCH 11/17] fixed enum --- .../preview/2019-01-01-preview/SecurityInsights.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json index f16b64169839..2eabe00051b1 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json @@ -4002,6 +4002,15 @@ }, { "value": "SecurityAdmin" + }, + { + "value": "TenantOnboardedToWorkspace" + }, + { + "value": "SecurityReader" + }, + { + "value": "ReadSubscriptionSecurityData" } ] } From bc77d4ddca72f0882a3387e6ea5202189e56368e Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Wed, 22 Jan 2020 10:34:57 +0200 Subject: [PATCH 12/17] changed requires to missing --- .../preview/2019-01-01-preview/SecurityInsights.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json index 2eabe00051b1..b5dd34af8bbd 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json @@ -3954,7 +3954,7 @@ "description": "Describes the state of user's authorization for a connector kind.", "$ref": "#/definitions/DataConnectorAuthorizationState" }, - "requiresAny": { + "missing": { "description": "A list indicating which authorizations are needed for this connector (at least one), if there's no proper authorization.", "items": { "$ref": "#/definitions/DataConnectorAuthorizationType" @@ -4022,7 +4022,7 @@ "description": "Describes the state of user's authorization for a connector kind.", "$ref": "#/definitions/DataConnectorAuthorizationState" }, - "requiresAll": { + "missing": { "description": "A list indicating which licenses are missing for this connector if any. All licenses are required.", "items": { "$ref": "#/definitions/DataConnectorLicenseType" From dd09f0b04e47f1dbea837788d0155a19360e99c4 Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Wed, 22 Jan 2020 10:39:52 +0200 Subject: [PATCH 13/17] updated examples` --- .../dataConnectors/CheckRequirementsAzureActiveDirectory.json | 4 ++-- .../CheckRequirementsAzureActiveDirectoryNoAuthorization.json | 4 ++-- .../CheckRequirementsAzureActiveDirectoryNoLicense.json | 4 ++-- .../dataConnectors/CheckRequirementsAzureSecurityCenter.json | 4 ++-- .../examples/dataConnectors/CheckRequirementsMdatp.json | 4 ++-- .../CheckRequirementsMicrosoftCloudAppSecurity.json | 4 ++-- .../dataConnectors/CheckRequirementsThreatIntelligence.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json index 35bfeb456de2..eb287dae3c12 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json @@ -17,11 +17,11 @@ "body": { "authorization": { "state": "Valid", - "requiresAny": [] + "missing": [] }, "license": { "state": "Valid", - "requiresAll": [] + "missing": [] } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json index 1d1a82b93ad1..9223e4669fda 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json @@ -17,14 +17,14 @@ "body": { "authorization": { "state": "Invalid", - "requiresAny": [ + "missing": [ "GlobalAdmin", "SecurityAdmin" ] }, "license": { "state": "Unknown", - "requiresAll": [] + "missing": [] } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json index 3c6f94d923ce..bfc35e63ecb5 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json @@ -17,11 +17,11 @@ "body": { "authorization": { "state": "Valid", - "requiresAny": [] + "missing": [] }, "license": { "state": "Invalid", - "requiresAll": [ + "missing": [ "AADP1OrP2License" ] } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json index e7d26610918f..1bf386e63f64 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json @@ -17,11 +17,11 @@ "body": { "authorization": { "state": "Valid", - "requiresAny": [] + "missing": [] }, "license": { "state": "Valid", - "requiresAll": [] + "missing": [] } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json index ef2ea0f08a21..b20b1c17f91a 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json @@ -17,11 +17,11 @@ "body": { "authorization": { "state": "Valid", - "requiresAny": [] + "missing": [] }, "license": { "state": "Valid", - "requiresAll": [] + "missing": [] } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json index ef2ea0f08a21..b20b1c17f91a 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json @@ -17,11 +17,11 @@ "body": { "authorization": { "state": "Valid", - "requiresAny": [] + "missing": [] }, "license": { "state": "Valid", - "requiresAll": [] + "missing": [] } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json index 890354717082..ef269e816993 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json @@ -17,11 +17,11 @@ "body": { "authorization": { "state": "Valid", - "requiresAny": [] + "missing": [] }, "license": { "state": "Valid", - "requiresAll": [] + "missing": [] } } } From 1608d84b07cd05eeed801c8cfae7e18831a08fb9 Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Wed, 22 Jan 2020 14:46:50 +0200 Subject: [PATCH 14/17] fixed for tests --- .../2019-01-01-preview/SecurityInsights.json | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json index b5dd34af8bbd..a4e908d924f4 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json @@ -4056,7 +4056,8 @@ "description": "Describes the state of user's license for a connector kind.", "enum": [ "SubscriptionStandardTierLicense", - "AADP1OrP2License", + "AADP1License", + "AADP2License", "MicrosoftCloudAppSecurityLicense", "AzureAdvancedThreatProtectionLicense", "AzureInformationProtectionLicense", @@ -4067,18 +4068,9 @@ "modelAsString": true, "name": "DataConnectorLicenseType", "values": [ - { - "value": "Valid" - }, - { - "value": "Unknown" - }, { "value": "SubscriptionStandardTierLicense" }, - { - "value": "AADP1OrP2License" - }, { "value": "MicrosoftCloudAppSecurityLicense" }, @@ -4090,6 +4082,12 @@ }, { "value": "MicrosoftDefenderAdvancedThreatProtectionEnable" + }, + { + "value": "AADP1License" + }, + { + "value": "AADP2License" } ] } From 0db2d6be72a3fc05f6ebe7735f1835939e2b2a3f Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Wed, 22 Jan 2020 16:53:10 +0200 Subject: [PATCH 15/17] changes --- .../2019-01-01-preview/SecurityInsights.json | 116 +----------------- ...CheckRequirementsAzureActiveDirectory.json | 10 +- ...tsAzureActiveDirectoryNoAuthorization.json | 13 +- ...irementsAzureActiveDirectoryNoLicense.json | 12 +- .../CheckRequirementsAzureSecurityCenter.json | 10 +- .../CheckRequirementsMdatp.json | 10 +- ...RequirementsMicrosoftCloudAppSecurity.json | 12 +- .../CheckRequirementsThreatIntelligence.json | 10 +- 8 files changed, 21 insertions(+), 172 deletions(-) diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json index a4e908d924f4..ac46bf49425f 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json @@ -3947,22 +3947,6 @@ ], "description": "Data connector requirements properties." }, - "DataConnectorAuthorizationModel": { - "description": "A model describing the authorization state and requirements missing (if there are any) for this connector", - "properties": { - "state": { - "description": "Describes the state of user's authorization for a connector kind.", - "$ref": "#/definitions/DataConnectorAuthorizationState" - }, - "missing": { - "description": "A list indicating which authorizations are needed for this connector (at least one), if there's no proper authorization.", - "items": { - "$ref": "#/definitions/DataConnectorAuthorizationType" - }, - "type": "array" - } - } - }, "DataConnectorAuthorizationState": { "description": "Describes the state of user's authorization for a connector kind.", "enum": [ @@ -3983,54 +3967,6 @@ ] } }, - "DataConnectorAuthorizationType": { - "description": "Describes the types of user's authorizations.", - "enum": [ - "GlobalAdmin", - "SecurityAdmin", - "TenantOnboardedToWorkspace", - "SecurityReader", - "ReadSubscriptionSecurityData" - ], - "type": "string", - "x-ms-enum": { - "modelAsString": true, - "name": "DataConnectorAuthorizationType", - "values": [ - { - "value": "GlobalAdmin" - }, - { - "value": "SecurityAdmin" - }, - { - "value": "TenantOnboardedToWorkspace" - }, - { - "value": "SecurityReader" - }, - { - "value": "ReadSubscriptionSecurityData" - } - ] - } - }, - "DataConnectorLicenseModel": { - "description": "A model describing the license state and requirements missing (if there are any) for this connector", - "properties": { - "state": { - "description": "Describes the state of user's authorization for a connector kind.", - "$ref": "#/definitions/DataConnectorAuthorizationState" - }, - "missing": { - "description": "A list indicating which licenses are missing for this connector if any. All licenses are required.", - "items": { - "$ref": "#/definitions/DataConnectorLicenseType" - }, - "type": "array" - } - } - }, "DataConnectorLicenseState": { "description": "Describes the state of user's license for a connector kind.", "enum": [ @@ -4052,46 +3988,6 @@ ] } }, - "DataConnectorLicenseType": { - "description": "Describes the state of user's license for a connector kind.", - "enum": [ - "SubscriptionStandardTierLicense", - "AADP1License", - "AADP2License", - "MicrosoftCloudAppSecurityLicense", - "AzureAdvancedThreatProtectionLicense", - "AzureInformationProtectionLicense", - "MicrosoftDefenderAdvancedThreatProtectionEnable" - ], - "type": "string", - "x-ms-enum": { - "modelAsString": true, - "name": "DataConnectorLicenseType", - "values": [ - { - "value": "SubscriptionStandardTierLicense" - }, - { - "value": "MicrosoftCloudAppSecurityLicense" - }, - { - "value": "AzureAdvancedThreatProtectionLicense" - }, - { - "value": "AzureInformationProtectionLicense" - }, - { - "value": "MicrosoftDefenderAdvancedThreatProtectionEnable" - }, - { - "value": "AADP1License" - }, - { - "value": "AADP2License" - } - ] - } - }, "DataConnectorDataTypeCommon": { "description": "Common field for data type in data connectors.", "properties": { @@ -4208,13 +4104,13 @@ "DataConnectorRequirementsState": { "description": "Data connector requirements status.", "properties": { - "authorization": { - "description": "A model describing the authorization state and requirements missing (if there are any) for this connector", - "$ref": "#/definitions/DataConnectorAuthorizationModel" + "authorizationState": { + "description": "Authorization state for this connector", + "$ref": "#/definitions/DataConnectorAuthorizationState" }, - "license": { - "description": "A model describing the license state and requirements missing (if there are any) for this connector", - "$ref": "#/definitions/DataConnectorLicenseModel" + "licenseState": { + "description": "License state for this connector", + "$ref": "#/definitions/DataConnectorLicenseState" } }, "type": "object" diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json index eb287dae3c12..129bb958e66a 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json @@ -15,14 +15,8 @@ "responses": { "200": { "body": { - "authorization": { - "state": "Valid", - "missing": [] - }, - "license": { - "state": "Valid", - "missing": [] - } + "authorizationState": "Valid", + "licenseState": "Valid" } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json index 9223e4669fda..129bb958e66a 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json @@ -15,17 +15,8 @@ "responses": { "200": { "body": { - "authorization": { - "state": "Invalid", - "missing": [ - "GlobalAdmin", - "SecurityAdmin" - ] - }, - "license": { - "state": "Unknown", - "missing": [] - } + "authorizationState": "Valid", + "licenseState": "Valid" } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json index bfc35e63ecb5..129bb958e66a 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json @@ -15,16 +15,8 @@ "responses": { "200": { "body": { - "authorization": { - "state": "Valid", - "missing": [] - }, - "license": { - "state": "Invalid", - "missing": [ - "AADP1OrP2License" - ] - } + "authorizationState": "Valid", + "licenseState": "Valid" } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json index 1bf386e63f64..1de4ced8b2a7 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json @@ -15,14 +15,8 @@ "responses": { "200": { "body": { - "authorization": { - "state": "Valid", - "missing": [] - }, - "license": { - "state": "Valid", - "missing": [] - } + "authorizationState": "Valid", + "licenseState": "Valid" } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json index b20b1c17f91a..b724d061a3be 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json @@ -15,14 +15,8 @@ "responses": { "200": { "body": { - "authorization": { - "state": "Valid", - "missing": [] - }, - "license": { - "state": "Valid", - "missing": [] - } + "authorizationState": "Valid", + "licenseState": "Valid" } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json index b20b1c17f91a..a03a4d48f64a 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json @@ -15,15 +15,9 @@ "responses": { "200": { "body": { - "authorization": { - "state": "Valid", - "missing": [] - }, - "license": { - "state": "Valid", - "missing": [] - } - } + "authorizationState": "Valid", + "licenseState": "Valid" + } } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json index ef269e816993..dfc367efe8ed 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json @@ -15,14 +15,8 @@ "responses": { "200": { "body": { - "authorization": { - "state": "Valid", - "missing": [] - }, - "license": { - "state": "Valid", - "missing": [] - } + "authorizationState": "Valid", + "licenseState": "Valid" } } } From cbcb88b74c6b6b465e32de4d62b6ba08ab389509 Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Wed, 22 Jan 2020 17:02:50 +0200 Subject: [PATCH 16/17] ran prettier --- .../CheckRequirementsAzureActiveDirectory.json | 4 ++-- ...heckRequirementsAzureActiveDirectoryNoAuthorization.json | 4 ++-- .../CheckRequirementsAzureActiveDirectoryNoLicense.json | 4 ++-- .../CheckRequirementsAzureSecurityCenter.json | 4 ++-- .../examples/dataConnectors/CheckRequirementsMdatp.json | 4 ++-- .../CheckRequirementsMicrosoftCloudAppSecurity.json | 6 +++--- .../dataConnectors/CheckRequirementsThreatIntelligence.json | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json index 129bb958e66a..1537ba3e8a72 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectory.json @@ -15,8 +15,8 @@ "responses": { "200": { "body": { - "authorizationState": "Valid", - "licenseState": "Valid" + "authorizationState": "Valid", + "licenseState": "Valid" } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json index 129bb958e66a..1537ba3e8a72 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoAuthorization.json @@ -15,8 +15,8 @@ "responses": { "200": { "body": { - "authorizationState": "Valid", - "licenseState": "Valid" + "authorizationState": "Valid", + "licenseState": "Valid" } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json index 129bb958e66a..1537ba3e8a72 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureActiveDirectoryNoLicense.json @@ -15,8 +15,8 @@ "responses": { "200": { "body": { - "authorizationState": "Valid", - "licenseState": "Valid" + "authorizationState": "Valid", + "licenseState": "Valid" } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json index 1de4ced8b2a7..7e6c5db280a4 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsAzureSecurityCenter.json @@ -15,8 +15,8 @@ "responses": { "200": { "body": { - "authorizationState": "Valid", - "licenseState": "Valid" + "authorizationState": "Valid", + "licenseState": "Valid" } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json index b724d061a3be..9bafdafddb32 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMdatp.json @@ -15,8 +15,8 @@ "responses": { "200": { "body": { - "authorizationState": "Valid", - "licenseState": "Valid" + "authorizationState": "Valid", + "licenseState": "Valid" } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json index a03a4d48f64a..9bafdafddb32 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsMicrosoftCloudAppSecurity.json @@ -15,9 +15,9 @@ "responses": { "200": { "body": { - "authorizationState": "Valid", - "licenseState": "Valid" - } + "authorizationState": "Valid", + "licenseState": "Valid" + } } } } diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json index dfc367efe8ed..e5021e1ecbd9 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/examples/dataConnectors/CheckRequirementsThreatIntelligence.json @@ -15,8 +15,8 @@ "responses": { "200": { "body": { - "authorizationState": "Valid", - "licenseState": "Valid" + "authorizationState": "Valid", + "licenseState": "Valid" } } } From 803a75e791105219d7a6d01451d983692c9cc6bd Mon Sep 17 00:00:00 2001 From: Hadas Orgad Date: Wed, 22 Jan 2020 18:31:08 +0200 Subject: [PATCH 17/17] fixed enum --- .../preview/2019-01-01-preview/SecurityInsights.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json index ac46bf49425f..39623f0307f3 100644 --- a/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json +++ b/specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2019-01-01-preview/SecurityInsights.json @@ -3984,6 +3984,9 @@ }, { "value": "Invalid" + }, + { + "value": "Unknown" } ] }