Fixing some missed issues

Signed-off-by: xibz <impactbchang@gmail.com>
cdevents · May 14, 2024 · d9a44fc · d9a44fc
1 parent 85686f4
commit d9a44fc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/.github/linters/.eslintrc.yml b/.github/linters/.eslintrc.yml
@@ -2,8 +2,9 @@ plugins:
   - jsonc
 overrides:
   - files:
-    - schemas/*.json
-    - examples/*.json
+    - schemas/**/*.json
+    - examples/**/*.json
+    - custom/**/*.json
     parser: jsonc-eslint-parser
     rules:
       # These are the set of rules that belong to jsonc. For more information,

diff --git a/examples/incident_detected.json b/examples/incident_detected.json
@@ -1,20 +1,11 @@
 {
   "context": {
-<<<<<<< HEAD
-      "version": "0.4.0",
-      "id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
-      "chainId": "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",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/monitoring/prod1",
     "type": "dev.cdevents.incident.detected.0.2.0",
     "timestamp": "2022-11-11T13:52:20.079Z"
->>>>>>> 2816601 (Changes snake cased fields to camel casing)
   },
   "subject": {
     "id": "incident-123",

diff --git a/examples/incident_resolved.json b/examples/incident_resolved.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.4.0",
     "id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/monitoring/prod1",
     "type": "dev.cdevents.incident.resolved.0.2.0",
     "timestamp": "2022-11-11T13:52:20.079Z"