Skip to content

Commit

Permalink
Adds JSON linting
Browse files Browse the repository at this point in the history
eslint --fix

    This commit addresses some of the inconsistencies in our
    JSON files

Signed-off-by: xibz <impactbchang@gmail.com>
  • Loading branch information
xibz committed May 13, 2024
1 parent b462f84 commit a5fe063
Show file tree
Hide file tree
Showing 10 changed files with 181 additions and 159 deletions.
21 changes: 21 additions & 0 deletions .github/linters/.eslintrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
plugins:
- jsonc
overrides:
- files: "*.json"
parser: "jsonc-eslint-parser"
rules:
# These are the set of rules that belong to jsonc. For more information,
# https://ota-meshi.github.io/eslint-plugin-jsonc/rules
jsonc/comma-dangle:
- error
jsonc/indent:
- error
- 2
jsonc/key-name-casing:
- error
- camelCase: true
snake_case: false
jsonc/key-spacing:
- error
jsonc/no-dupe-keys:
- error
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
DEFAULT_BRANCH: main
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VALIDATE_MARKDOWN: true
VALIDATE_JSON: true

jsonschema:
name: Validate Examples
Expand Down
174 changes: 87 additions & 87 deletions custom/schema.json
Original file line number Diff line number Diff line change
@@ -1,93 +1,93 @@
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://cdevents.dev/0.4.0/schema/custom",
"properties": {
"context": {
"properties": {
"version": {
"type": "string",
"minLength": 1
},
"id": {
"type": "string",
"minLength": 1
},
"source": {
"type": "string",
"minLength": 1,
"format": "uri-reference"
},
"type": {
"type": "string",
"pattern": "^dev.cdeventsx.[a-zA-Z0-9]+-[a-zA-Z]+.[a-zA-Z]+$"
},
"timestamp": {
"type": "string",
"format": "date-time"
},
"schemaUri": {
"type": "string",
"minLength": 1,
"format": "uri"
}
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$id": "https://cdevents.dev/0.4.0/schema/custom",
"properties": {
"context": {
"properties": {
"version": {
"type": "string",
"minLength": 1
},
"additionalProperties": false,
"type": "object",
"required": [
"version",
"id",
"source",
"type",
"timestamp"
]
},
"subject": {
"properties": {
"id": {
"type": "string",
"minLength": 1
},
"source": {
"type": "string",
"minLength": 1,
"format": "uri-reference"
},
"type": {
"type": "string",
"pattern": "^[a-zA-Z0-9]+-[a-zA-Z]+$"
},
"content": {
"type": "object",
"additionalProperties": true
}
"id": {
"type": "string",
"minLength": 1
},
"source": {
"type": "string",
"minLength": 1,
"format": "uri-reference"
},
"type": {
"type": "string",
"pattern": "^dev.cdeventsx.[a-zA-Z0-9]+-[a-zA-Z]+.[a-zA-Z]+$"
},
"additionalProperties": false,
"type": "object",
"required": [
"id",
"type",
"content"
]
"timestamp": {
"type": "string",
"format": "date-time"
},
"schemaUri": {
"type": "string",
"minLength": 1,
"format": "uri"
}
},
"customData": {
"oneOf": [
{
"type": "object"
},
{
"type": "string",
"contentEncoding": "base64"
}
]
"additionalProperties": false,
"type": "object",
"required": [
"version",
"id",
"source",
"type",
"timestamp"
]
},
"subject": {
"properties": {
"id": {
"type": "string",
"minLength": 1
},
"source": {
"type": "string",
"minLength": 1,
"format": "uri-reference"
},
"type": {
"type": "string",
"pattern": "^[a-zA-Z0-9]+-[a-zA-Z]+$"
},
"content": {
"type": "object",
"additionalProperties": true
}
},
"customDataContentType": {
"type": "string"
}
"additionalProperties": false,
"type": "object",
"required": [
"id",
"type",
"content"
]
},
"customData": {
"oneOf": [
{
"type": "object"
},
{
"type": "string",
"contentEncoding": "base64"
}
]
},
"additionalProperties": false,
"type": "object",
"required": [
"context",
"subject"
]
}
"customDataContentType": {
"type": "string"
}
},
"additionalProperties": false,
"type": "object",
"required": [
"context",
"subject"
]
}
42 changes: 21 additions & 21 deletions examples/incident_detected.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"context": {
"version": "0.4.0",
"id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
"chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
"source": "/monitoring/prod1",
"type": "dev.cdevents.incident.detected.0.2.0",
"timestamp": "2022-11-11T13:52:20.079Z"
"version": "0.4.0",
"id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
"chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
"source": "/monitoring/prod1",
"type": "dev.cdevents.incident.detected.0.2.0",
"timestamp": "2022-11-11T13:52:20.079Z"
},
"subject": {
"id": "incident-123",
"source": "/monitoring/prod1",
"type": "incident",
"content": {
"description": "Response time above threshold of 100ms",
"environment": {
"id": "prod1",
"source": "/iaas/geo1"
},
"service": {
"id": "myApp",
"source": "/clusterA/namespaceB"
},
"artifactId": "pkg:oci/myapp@sha256%3A0b31b1c02ff458ad9b7b81cbdf8f028bd54699fa151f221d1e8de6817db93427"
}
"id": "incident-123",
"source": "/monitoring/prod1",
"type": "incident",
"content": {
"description": "Response time above threshold of 100ms",
"environment": {
"id": "prod1",
"source": "/iaas/geo1"
},
"service": {
"id": "myApp",
"source": "/clusterA/namespaceB"
},
"artifactId": "pkg:oci/myapp@sha256%3A0b31b1c02ff458ad9b7b81cbdf8f028bd54699fa151f221d1e8de6817db93427"
}
},
"customData": {
"metric": "responseTime",
Expand Down
44 changes: 22 additions & 22 deletions examples/incident_reported.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
{
"context": {
"version": "0.4.0",
"id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
"chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
"source": "/monitoring/prod1",
"type": "dev.cdevents.incident.reported.0.2.0",
"timestamp": "2022-11-11T13:52:20.079Z"
"version": "0.4.0",
"id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
"chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
"source": "/monitoring/prod1",
"type": "dev.cdevents.incident.reported.0.2.0",
"timestamp": "2022-11-11T13:52:20.079Z"
},
"subject": {
"id": "incident-123",
"source": "/monitoring/prod1",
"type": "incident",
"content": {
"description": "Response time above threshold of 100ms",
"environment": {
"id": "prod1",
"source": "/iaas/geo1"
},
"service": {
"id": "myApp",
"source": "/clusterA/namespaceB"
},
"artifactId": "pkg:oci/myapp@sha256%3A0b31b1c02ff458ad9b7b81cbdf8f028bd54699fa151f221d1e8de6817db93427",
"ticketURI": "https://my-issues.example/incidents/ticket-345"
}
"id": "incident-123",
"source": "/monitoring/prod1",
"type": "incident",
"content": {
"description": "Response time above threshold of 100ms",
"environment": {
"id": "prod1",
"source": "/iaas/geo1"
},
"service": {
"id": "myApp",
"source": "/clusterA/namespaceB"
},
"artifactId": "pkg:oci/myapp@sha256%3A0b31b1c02ff458ad9b7b81cbdf8f028bd54699fa151f221d1e8de6817db93427",
"ticketURI": "https://my-issues.example/incidents/ticket-345"
}
},
"customData": {
"severity": "medium",
Expand Down
42 changes: 21 additions & 21 deletions examples/incident_resolved.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"context": {
"version": "0.4.0",
"id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
"chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
"source": "/monitoring/prod1",
"type": "dev.cdevents.incident.resolved.0.2.0",
"timestamp": "2022-11-11T13:52:20.079Z"
"version": "0.4.0",
"id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
"chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
"source": "/monitoring/prod1",
"type": "dev.cdevents.incident.resolved.0.2.0",
"timestamp": "2022-11-11T13:52:20.079Z"
},
"subject": {
"id": "incident-123",
"source": "/monitoring/prod1",
"type": "incident",
"content": {
"description": "Response time restored below 100ms",
"environment": {
"id": "prod1",
"source": "/iaas/geo1"
},
"service": {
"id": "myApp",
"source": "/clusterA/namespaceB"
},
"artifactId": "pkg:oci/myapp@sha256%3A0b31b1c02ff458ad9b7b81cbdf8f028bd54699fa151f221d1e8de6817db93439"
}
"id": "incident-123",
"source": "/monitoring/prod1",
"type": "incident",
"content": {
"description": "Response time restored below 100ms",
"environment": {
"id": "prod1",
"source": "/iaas/geo1"
},
"service": {
"id": "myApp",
"source": "/clusterA/namespaceB"
},
"artifactId": "pkg:oci/myapp@sha256%3A0b31b1c02ff458ad9b7b81cbdf8f028bd54699fa151f221d1e8de6817db93439"
}
},
"customData": {
"metric": "responseTime",
Expand Down
2 changes: 1 addition & 1 deletion examples/testcaserun_finished.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"source": "/event/source/123",
"type": "testCaseRun",
"content": {
"outcome" : "pass",
"outcome": "pass",
"environment": {
"id": "dev",
"source": "testkube-dev-123"
Expand Down
4 changes: 2 additions & 2 deletions examples/testoutput_published.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"source": "/event/source/testrunreport-12123",
"type": "testOutput",
"content": {
"outputType" : "video",
"format" : "video/quicktime",
"outputType": "video",
"format": "video/quicktime",
"testCaseRun": {
"id": "myTestCaseRun123",
"source": "testkube-dev-123"
Expand Down
6 changes: 3 additions & 3 deletions examples/testsuiterun_finished.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"source": "/event/source/123",
"type": "testSuiteRun",
"content": {
"outcome" : "fail",
"severity" : "critical",
"reason" : "Host 123.34.23.32 not found",
"outcome": "fail",
"severity": "critical",
"reason": "Host 123.34.23.32 not found",
"environment": {
"id": "dev",
"source": "testkube-dev-123"
Expand Down
Loading

0 comments on commit a5fe063

Please sign in to comment.