Skip to content

Commit 96da969

Browse files
anat-gilensonanat-gilenson
authored
Fix threat intelligence syntactic issues (#18195)
* Fix THreatIntelligneceInformation multiple allOfs and add "x-ms-identifiers" to all arrays * Add "x-ms-identifiers" in EntityTypes * Fix double 'allOf' in latest stable
1 parent 17429b0 commit 96da969

File tree

3 files changed

+100
-122
lines changed

3 files changed

+100
-122
lines changed

‎specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2022-01-01-preview/ThreatIntelligence.json‎

Lines changed: 54 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@
481481
"name": "ThreatIntelligenceProperties",
482482
"required": true,
483483
"schema": {
484-
"$ref": "#/definitions/ThreatIntelligenceIndicatorModelForRequestBody"
484+
"$ref": "#/definitions/ThreatIntelligenceIndicatorModel"
485485
},
486486
"x-ms-parameter-location": "method"
487487
},
@@ -491,7 +491,7 @@
491491
"name": "ThreatIntelligenceReplaceTags",
492492
"required": true,
493493
"schema": {
494-
"$ref": "#/definitions/ThreatIntelligenceIndicatorModelForRequestBody"
494+
"$ref": "#/definitions/ThreatIntelligenceIndicatorModel"
495495
},
496496
"x-ms-parameter-location": "method"
497497
},
@@ -538,7 +538,8 @@
538538
"items": {
539539
"$ref": "#/definitions/ThreatIntelligenceInformation"
540540
},
541-
"type": "array"
541+
"type": "array",
542+
"x-ms-identifiers": []
542543
}
543544
},
544545
"type": "object",
@@ -550,12 +551,15 @@
550551
"allOf": [
551552
{
552553
"$ref": "../../../common/2.0/types.json#/definitions/ResourceWithEtag"
553-
},
554-
{
555-
"$ref": "#/definitions/ThreatIntelligenceResourceKind"
556554
}
557555
],
558556
"description": "Threat intelligence information object.",
557+
"properties": {
558+
"kind": {
559+
"$ref": "#/definitions/ThreatIntelligenceResourceInnerKind",
560+
"description": "The kind of the entity."
561+
}
562+
},
559563
"discriminator": "kind",
560564
"type": "object",
561565
"required": [
@@ -579,41 +583,6 @@
579583
"type": "object",
580584
"x-ms-discriminator-value": "indicator"
581585
},
582-
"ThreatIntelligenceIndicatorModelForRequestBody": {
583-
"allOf": [
584-
{
585-
"$ref": "#/definitions/ThreatIntelligenceResourceKind"
586-
}
587-
],
588-
"description": "Threat intelligence indicator entity used in request body.",
589-
"properties": {
590-
"etag": {
591-
"description": "Etag of the azure resource",
592-
"type": "string"
593-
},
594-
"properties": {
595-
"$ref": "#/definitions/ThreatIntelligenceIndicatorProperties",
596-
"description": "Threat Intelligence Entity properties",
597-
"x-ms-client-flatten": true
598-
}
599-
},
600-
"type": "object",
601-
"x-ms-discriminator-value": "indicator"
602-
},
603-
"ThreatIntelligenceResourceKind": {
604-
"description": "Describes an entity with kind.",
605-
"properties": {
606-
"kind": {
607-
"$ref": "#/definitions/ThreatIntelligenceResourceInnerKind",
608-
"description": "The kind of the entity."
609-
}
610-
},
611-
"discriminator": "kind",
612-
"required": [
613-
"kind"
614-
],
615-
"type": "object"
616-
},
617586
"ThreatIntelligenceResourceInnerKind": {
618587
"description": "The kind of the threat intelligence entity",
619588
"enum": [
@@ -645,7 +614,8 @@
645614
"description": "tag",
646615
"type": "string"
647616
},
648-
"type": "array"
617+
"type": "array",
618+
"x-ms-identifiers": []
649619
},
650620
"lastUpdatedTimeUtc": {
651621
"description": "Last updated time in UTC",
@@ -669,7 +639,8 @@
669639
"description": "Indicator type of a threat intelligence entity",
670640
"type": "string"
671641
},
672-
"type": "array"
642+
"type": "array",
643+
"x-ms-identifiers": []
673644
},
674645
"pattern": {
675646
"description": "Pattern of a threat intelligence entity",
@@ -689,15 +660,17 @@
689660
"description": "Kill chain phase",
690661
"$ref": "#/definitions/ThreatIntelligenceKillChainPhase"
691662
},
692-
"type": "array"
663+
"type": "array",
664+
"x-ms-identifiers": []
693665
},
694666
"parsedPattern": {
695667
"description": "Parsed patterns",
696668
"items": {
697669
"description": "Parsed pattern",
698670
"$ref": "#/definitions/ThreatIntelligenceParsedPattern"
699671
},
700-
"type": "array"
672+
"type": "array",
673+
"x-ms-identifiers": []
701674
},
702675
"externalId": {
703676
"description": "External ID of threat intelligence entity",
@@ -721,23 +694,26 @@
721694
"description": "external_reference",
722695
"$ref": "#/definitions/ThreatIntelligenceExternalReference"
723696
},
724-
"type": "array"
697+
"type": "array",
698+
"x-ms-identifiers": []
725699
},
726700
"granularMarkings": {
727701
"description": "Granular Markings",
728702
"items": {
729703
"description": "Granular marking",
730704
"$ref": "#/definitions/ThreatIntelligenceGranularMarkingModel"
731705
},
732-
"type": "array"
706+
"type": "array",
707+
"x-ms-identifiers": []
733708
},
734709
"labels": {
735710
"description": "Labels of threat intelligence entity",
736711
"items": {
737712
"description": "label",
738713
"type": "string"
739714
},
740-
"type": "array"
715+
"type": "array",
716+
"x-ms-identifiers": []
741717
},
742718
"revoked": {
743719
"description": "Is threat intelligence entity revoked",
@@ -754,7 +730,8 @@
754730
"description": "Threat intelligence entity object marking reference",
755731
"type": "string"
756732
},
757-
"type": "array"
733+
"type": "array",
734+
"x-ms-identifiers": []
758735
},
759736
"language": {
760737
"description": "Language of threat intelligence entity",
@@ -766,7 +743,8 @@
766743
"description": "Threat type",
767744
"type": "string"
768745
},
769-
"type": "array"
746+
"type": "array",
747+
"x-ms-identifiers": []
770748
},
771749
"validFrom": {
772750
"description": "Valid from",
@@ -819,7 +797,8 @@
819797
"description": "Pattern type key",
820798
"$ref": "#/definitions/ThreatIntelligenceParsedPatternTypeValue"
821799
},
822-
"type": "array"
800+
"type": "array",
801+
"x-ms-identifiers": []
823802
}
824803
},
825804
"type": "object"
@@ -856,7 +835,8 @@
856835
"description": "granular marking model selector",
857836
"type": "string"
858837
},
859-
"type": "array"
838+
"type": "array",
839+
"x-ms-identifiers": []
860840
}
861841
},
862842
"type": "object"
@@ -926,47 +906,53 @@
926906
"description": "Sort By",
927907
"$ref": "#/definitions/ThreatIntelligenceSortingCriteria"
928908
},
929-
"type": "array"
909+
"type": "array",
910+
"x-ms-identifiers": []
930911
},
931912
"sources": {
932913
"description": "Sources of threat intelligence indicators",
933914
"items": {
934915
"description": "Source",
935916
"type": "string"
936917
},
937-
"type": "array"
918+
"type": "array",
919+
"x-ms-identifiers": []
938920
},
939921
"patternTypes": {
940922
"description": "Pattern types",
941923
"items": {
942924
"description": "Pattern type",
943925
"type": "string"
944926
},
945-
"type": "array"
927+
"type": "array",
928+
"x-ms-identifiers": []
946929
},
947930
"threatTypes": {
948931
"description": "Threat types of threat intelligence indicators",
949932
"items": {
950933
"description": "Threat type of a threat intelligence indicator",
951934
"type": "string"
952935
},
953-
"type": "array"
936+
"type": "array",
937+
"x-ms-identifiers": []
954938
},
955939
"ids": {
956940
"description": "Ids of threat intelligence indicators",
957941
"items": {
958942
"description": "Id of a threat intelligence indicator",
959943
"type": "string"
960944
},
961-
"type": "array"
945+
"type": "array",
946+
"x-ms-identifiers": []
962947
},
963948
"keywords": {
964949
"description": "Keywords for searching threat intelligence indicators",
965950
"items": {
966951
"description": "keyword for searching threat intelligence indicators",
967952
"type": "string"
968953
},
969-
"type": "array"
954+
"type": "array",
955+
"x-ms-identifiers": []
970956
},
971957
"skipToken": {
972958
"description": "Skip token.",
@@ -1022,7 +1008,8 @@
10221008
"description": "parameter",
10231009
"type": "string"
10241010
},
1025-
"type": "array"
1011+
"type": "array",
1012+
"x-ms-identifiers": []
10261013
}
10271014
},
10281015
"type": "object"
@@ -1035,7 +1022,8 @@
10351022
"items": {
10361023
"$ref": "#/definitions/ThreatIntelligenceMetrics"
10371024
},
1038-
"type": "array"
1025+
"type": "array",
1026+
"x-ms-identifiers": []
10391027
}
10401028
},
10411029
"required": [
@@ -1066,23 +1054,26 @@
10661054
"description": "parameter",
10671055
"$ref": "#/definitions/ThreatIntelligenceMetricEntity"
10681056
},
1069-
"type": "array"
1057+
"type": "array",
1058+
"x-ms-identifiers": []
10701059
},
10711060
"patternTypeMetrics": {
10721061
"description": "Pattern type metrics",
10731062
"items": {
10741063
"description": "parameter",
10751064
"$ref": "#/definitions/ThreatIntelligenceMetricEntity"
10761065
},
1077-
"type": "array"
1066+
"type": "array",
1067+
"x-ms-identifiers": []
10781068
},
10791069
"sourceMetrics": {
10801070
"description": "Source metrics",
10811071
"items": {
10821072
"description": "parameter",
10831073
"$ref": "#/definitions/ThreatIntelligenceMetricEntity"
10841074
},
1085-
"type": "array"
1075+
"type": "array",
1076+
"x-ms-identifiers": []
10861077
}
10871078
},
10881079
"type": "object"

0 commit comments

Comments
 (0)