Skip to content

Fix threat intelligence syntactic issues #18195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 14, 2022
Merged

Fix threat intelligence syntactic issues #18195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66bcfa8
Fix THreatIntelligneceInformation multiple allOfs and add "x-ms-ident…
anat-gilenson Mar 13, 2022
3efbfd6
Add "x-ms-identifiers" in EntityTypes
anat-gilenson Mar 13, 2022
b08c47a
Fix double 'allOf' in latest stable
anat-gilenson Mar 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 54 additions & 63 deletions ...rce-manager/Microsoft.SecurityInsights/preview/2022-01-01-preview/ThreatIntelligence.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@
"name": "ThreatIntelligenceProperties",
"required": true,
"schema": {
"$ref": "#/definitions/ThreatIntelligenceIndicatorModelForRequestBody"
"$ref": "#/definitions/ThreatIntelligenceIndicatorModel"
},
"x-ms-parameter-location": "method"
},
Expand All @@ -491,7 +491,7 @@
"name": "ThreatIntelligenceReplaceTags",
"required": true,
"schema": {
"$ref": "#/definitions/ThreatIntelligenceIndicatorModelForRequestBody"
"$ref": "#/definitions/ThreatIntelligenceIndicatorModel"
},
"x-ms-parameter-location": "method"
},
Expand Down Expand Up @@ -538,7 +538,8 @@
"items": {
"$ref": "#/definitions/ThreatIntelligenceInformation"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
}
},
"type": "object",
Expand All @@ -550,12 +551,15 @@
"allOf": [
{
"$ref": "../../../common/2.0/types.json#/definitions/ResourceWithEtag"
},
{
"$ref": "#/definitions/ThreatIntelligenceResourceKind"
}
],
"description": "Threat intelligence information object.",
"properties": {
"kind": {
"$ref": "#/definitions/ThreatIntelligenceResourceInnerKind",
"description": "The kind of the entity."
}
},
"discriminator": "kind",
"type": "object",
"required": [
Expand All @@ -579,41 +583,6 @@
"type": "object",
"x-ms-discriminator-value": "indicator"
},
"ThreatIntelligenceIndicatorModelForRequestBody": {
"allOf": [
{
"$ref": "#/definitions/ThreatIntelligenceResourceKind"
}
],
"description": "Threat intelligence indicator entity used in request body.",
"properties": {
"etag": {
"description": "Etag of the azure resource",
"type": "string"
},
"properties": {
"$ref": "#/definitions/ThreatIntelligenceIndicatorProperties",
"description": "Threat Intelligence Entity properties",
"x-ms-client-flatten": true
}
},
"type": "object",
"x-ms-discriminator-value": "indicator"
},
"ThreatIntelligenceResourceKind": {
"description": "Describes an entity with kind.",
"properties": {
"kind": {
"$ref": "#/definitions/ThreatIntelligenceResourceInnerKind",
"description": "The kind of the entity."
}
},
"discriminator": "kind",
"required": [
"kind"
],
"type": "object"
},
"ThreatIntelligenceResourceInnerKind": {
"description": "The kind of the threat intelligence entity",
"enum": [
Expand Down Expand Up @@ -645,7 +614,8 @@
"description": "tag",
"type": "string"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"lastUpdatedTimeUtc": {
"description": "Last updated time in UTC",
Expand All @@ -669,7 +639,8 @@
"description": "Indicator type of a threat intelligence entity",
"type": "string"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"pattern": {
"description": "Pattern of a threat intelligence entity",
Expand All @@ -689,15 +660,17 @@
"description": "Kill chain phase",
"$ref": "#/definitions/ThreatIntelligenceKillChainPhase"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"parsedPattern": {
"description": "Parsed patterns",
"items": {
"description": "Parsed pattern",
"$ref": "#/definitions/ThreatIntelligenceParsedPattern"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"externalId": {
"description": "External ID of threat intelligence entity",
Expand All @@ -721,23 +694,26 @@
"description": "external_reference",
"$ref": "#/definitions/ThreatIntelligenceExternalReference"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"granularMarkings": {
"description": "Granular Markings",
"items": {
"description": "Granular marking",
"$ref": "#/definitions/ThreatIntelligenceGranularMarkingModel"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"labels": {
"description": "Labels of threat intelligence entity",
"items": {
"description": "label",
"type": "string"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"revoked": {
"description": "Is threat intelligence entity revoked",
Expand All @@ -754,7 +730,8 @@
"description": "Threat intelligence entity object marking reference",
"type": "string"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"language": {
"description": "Language of threat intelligence entity",
Expand All @@ -766,7 +743,8 @@
"description": "Threat type",
"type": "string"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"validFrom": {
"description": "Valid from",
Expand Down Expand Up @@ -819,7 +797,8 @@
"description": "Pattern type key",
"$ref": "#/definitions/ThreatIntelligenceParsedPatternTypeValue"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
}
},
"type": "object"
Expand Down Expand Up @@ -856,7 +835,8 @@
"description": "granular marking model selector",
"type": "string"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
}
},
"type": "object"
Expand Down Expand Up @@ -926,47 +906,53 @@
"description": "Sort By",
"$ref": "#/definitions/ThreatIntelligenceSortingCriteria"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"sources": {
"description": "Sources of threat intelligence indicators",
"items": {
"description": "Source",
"type": "string"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"patternTypes": {
"description": "Pattern types",
"items": {
"description": "Pattern type",
"type": "string"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"threatTypes": {
"description": "Threat types of threat intelligence indicators",
"items": {
"description": "Threat type of a threat intelligence indicator",
"type": "string"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"ids": {
"description": "Ids of threat intelligence indicators",
"items": {
"description": "Id of a threat intelligence indicator",
"type": "string"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"keywords": {
"description": "Keywords for searching threat intelligence indicators",
"items": {
"description": "keyword for searching threat intelligence indicators",
"type": "string"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"skipToken": {
"description": "Skip token.",
Expand Down Expand Up @@ -1022,7 +1008,8 @@
"description": "parameter",
"type": "string"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
}
},
"type": "object"
Expand All @@ -1035,7 +1022,8 @@
"items": {
"$ref": "#/definitions/ThreatIntelligenceMetrics"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
}
},
"required": [
Expand Down Expand Up @@ -1066,23 +1054,26 @@
"description": "parameter",
"$ref": "#/definitions/ThreatIntelligenceMetricEntity"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"patternTypeMetrics": {
"description": "Pattern type metrics",
"items": {
"description": "parameter",
"$ref": "#/definitions/ThreatIntelligenceMetricEntity"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
},
"sourceMetrics": {
"description": "Source metrics",
"items": {
"description": "parameter",
"$ref": "#/definitions/ThreatIntelligenceMetricEntity"
},
"type": "array"
"type": "array",
"x-ms-identifiers": []
}
},
"type": "object"
Expand Down
Loading