Improve JSON checks

Check formatting for all JSON files including the schema.

Improve check.sh with error details.

Update JQ to fix big integer parsing with Ubuntu 22.04:

 diff -u ./schema/landlockconfig.json <(jq < ./schema/landlockconfig.json)
 --- ./schema/landlockconfig.json
 +++ /dev/fd/63
 @@ -11,7 +11,7 @@
      "uint64": {
        "type": "integer",
        "minimum": 0,
 -      "maximum": 18446744073709551615
 +      "maximum": 18446744073709552000
      },
      "file": {
        "anyOf": [

See jqlang/jq#1752

Signed-off-by: Mickaël Salaün <[email protected]>

Author: l0kod

.github/workflows/ci.yml

@@ -44,7 +44,7 @@ jobs:
     outputs:
       commits: ${{ toJSON(steps.*.outputs.*) }}
 
-  ubuntu_22_schema:
+  ubuntu_22_json:
     runs-on: ubuntu-22.04
     needs: commit_list
     strategy:
@@ -60,7 +60,15 @@ jobs:
     - name: Install check-jsonschema
       run: pipx install check-jsonschema
 
-    - name: Check JSON schema
+    - name: Update jq
+      run: |
+        sudo apt update
+        sudo apt install jq
+
+    - name: Check schema format
+      run: diff -u ./schema/landlockconfig.json <(jq < ./schema/landlockconfig.json)
+
+    - name: Check JSON
       run: ./schema/check.sh examples/mini-write-tmp.json
 
   ubuntu_22_rust_msrv:

schema/check.sh

@@ -4,4 +4,26 @@ set -u -e -o pipefail
 
 BASE_DIR=$(dirname "${BASH_SOURCE[0]}")
 
-check-jsonschema --schemafile "${BASE_DIR}/landlockconfig.json" "$@"
+if [[ $# -eq 0 ]]; then
+    echo "ERROR: No files to check" >&2
+    exit 1
+fi
+
+for file in "$@"; do
+    if [[ ! -r "${file}" ]]; then
+        echo "ERROR: Invalid file: ${file}" >&2
+        exit 1
+    fi
+
+    diff -u "${file}" <(jq < "${file}") || {
+        echo
+        echo "ERROR: Invalid formatting" >&2
+        exit 1
+    }
+
+    check-jsonschema --schemafile "${BASE_DIR}/landlockconfig.json" "${file}" || {
+        echo
+        echo "ERROR: Not validated by schema: ${file}" >&2
+        exit 1
+    }
+done