Skip to content

Commit 7a84e8c

Browse files
committed
Bump to 2.1.0 final
1 parent bed886c commit 7a84e8c

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ Generation
2727

2828
The classes in this module were generated from the `SARIF JSON schema <https://docs.oasis-open.org/sarif/sarif/v2.1.0/cs01/schemas/sarif-schema-2.1.0.json>`_
2929
by the `jschema-to-python <https://github.com/microsoft/jschema-to-python>`_ code generator,
30-
using the final SARIF standard JSON schema file ``sarif-2.1.0-rtm.5.json`` and the code generation hints file ``code-gen-hints.json``
30+
using the final SARIF standard JSON schema file ``sarif-schema-2.1.0.json`` and the code generation hints file ``code-gen-hints.json``
3131
at the root of the GitHub repo, with the following command line::
3232

3333
pip install jschema-to-python
3434

3535
py -m jschema_to_python
36-
--schema-path sarif-2.1.0-rtm.5.json
36+
--schema-path sarif-schema-2.1.0.json
3737
--module-name sarif_om
3838
--output-directory sarif_om
3939
--root-class-name SarifLog

sarif-2.1.0-rtm.5.json renamed to sarif-schema-2.1.0.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"title": "Static Analysis Results Format (SARIF) Version 2.1.0-rtm.5 JSON Schema",
4-
"id": "https://raw.githubusercontent.com/schemastore/schemastore/master/src/schemas/json/sarif-2.1.0-rtm.5.json",
5-
"description": "Static Analysis Results Format (SARIF) Version 2.1.0-rtm.5 JSON Schema: a standard format for the output of static analysis tools.",
2+
"$schema": "http://json-schema.org/draft-07/schema#",
3+
"title": "Static Analysis Results Format (SARIF) Version 2.1.0 JSON Schema",
4+
"$id": "https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json",
5+
"description": "Static Analysis Results Format (SARIF) Version 2.1.0 JSON Schema: a standard format for the output of static analysis tools.",
66
"additionalProperties": false,
77
"type": "object",
88
"properties": {
@@ -1136,13 +1136,13 @@
11361136
},
11371137

11381138
"startTimeUtc": {
1139-
"description": "The Coordinated Universal Time (UTC) date and time at which the invocation started. See \"Date/time properties\" in the SARIF spec for the required format.",
1139+
"description": "The Coordinated Universal Time (UTC) date and time at which the run started. See \"Date/time properties\" in the SARIF spec for the required format.",
11401140
"type": "string",
11411141
"format": "date-time"
11421142
},
11431143

11441144
"endTimeUtc": {
1145-
"description": "The Coordinated Universal Time (UTC) date and time at which the invocation ended. See \"Date/time properties\" in the SARIF spec for the required format.",
1145+
"description": "The Coordinated Universal Time (UTC) date and time at which the run ended. See \"Date/time properties\" in the SARIF spec for the required format.",
11461146
"type": "string",
11471147
"format": "date-time"
11481148
},
@@ -1222,27 +1222,27 @@
12221222
},
12231223

12241224
"machine": {
1225-
"description": "The machine on which the invocation occurred.",
1225+
"description": "The machine that hosted the analysis tool run.",
12261226
"type": "string"
12271227
},
12281228

12291229
"account": {
1230-
"description": "The account under which the invocation occurred.",
1230+
"description": "The account that ran the analysis tool.",
12311231
"type": "string"
12321232
},
12331233

12341234
"processId": {
1235-
"description": "The id of the process in which the invocation occurred.",
1235+
"description": "The process id for the analysis tool run.",
12361236
"type": "integer"
12371237
},
12381238

12391239
"executableLocation": {
1240-
"description": "An absolute URI specifying the location of the executable that was invoked.",
1240+
"description": "An absolute URI specifying the location of the analysis tool's executable.",
12411241
"$ref": "#/definitions/artifactLocation"
12421242
},
12431243

12441244
"workingDirectory": {
1245-
"description": "The working directory for the invocation.",
1245+
"description": "The working directory for the analysis tool run.",
12461246
"$ref": "#/definitions/artifactLocation"
12471247
},
12481248

@@ -2029,7 +2029,7 @@
20292029
"properties": {
20302030

20312031
"ruleId": {
2032-
"description": "The stable, unique identifier of the rule, if any, to which this result is relevant.",
2032+
"description": "The stable, unique identifier of the rule, if any, to which this notification is relevant. This member can be used to retrieve rule metadata from the rules dictionary, if it exists.",
20332033
"type": "string"
20342034
},
20352035

@@ -2715,8 +2715,8 @@
27152715
]
27162716
},
27172717

2718-
"status": {
2719-
"description": "A string that indicates the review status of the suppression.",
2718+
"state": {
2719+
"description": "A string that indicates the state of the suppression.",
27202720
"enum": [
27212721
"accepted",
27222722
"underReview",

sarif_om/_sarif_log.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
@attr.s
77
class SarifLog(object):
8-
"""Static Analysis Results Format (SARIF) Version 2.1.0-rtm.5 JSON Schema: a standard format for the output of static analysis tools."""
8+
"""Static Analysis Results Format (SARIF) Version 2.1.0 JSON Schema: a standard format for the output of static analysis tools."""
99

1010
runs = attr.ib(metadata={"schema_property_name": "runs"})
1111
version = attr.ib(metadata={"schema_property_name": "version"})

sarif_om/_suppression.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ class Suppression(object):
1212
justification = attr.ib(default=None, metadata={"schema_property_name": "justification"})
1313
location = attr.ib(default=None, metadata={"schema_property_name": "location"})
1414
properties = attr.ib(default=None, metadata={"schema_property_name": "properties"})
15-
status = attr.ib(default=None, metadata={"schema_property_name": "status"})
15+
state = attr.ib(default=None, metadata={"schema_property_name": "state"})

0 commit comments

Comments
 (0)