From d4aa6d8a2d0419e0b6f511183f1422a475f31585 Mon Sep 17 00:00:00 2001 From: Kijima Daigo Date: Mon, 10 Jun 2024 22:06:05 +0900 Subject: [PATCH] chore: format JSON file `make -C schema fmt` Signed-off-by: Kijima Daigo --- schema/config-schema.json | 10 +++++----- schema/defs-zos.json | 8 ++++---- schema/features-linux.json | 4 ++-- schema/features-schema.json | 2 +- schema/test/config/good/spec-example.json | 20 ++++++++++++++++---- schema/test/config/good/zos-minimal.json | 3 +-- schema/test/features/good/runc.json | 4 ++-- 7 files changed, 31 insertions(+), 20 deletions(-) diff --git a/schema/config-schema.json b/schema/config-schema.json index 8f2bff772..4d549bfdc 100644 --- a/schema/config-schema.json +++ b/schema/config-schema.json @@ -181,11 +181,11 @@ "priority": { "$ref": "defs.json#/definitions/int32" }, - "flags": { - "type": "array", - "items": { - "$ref": "defs-linux.json#/definitions/SchedulerFlag" - } + "flags": { + "type": "array", + "items": { + "$ref": "defs-linux.json#/definitions/SchedulerFlag" + } }, "runtime": { "$ref": "defs.json#/definitions/uint64" diff --git a/schema/defs-zos.json b/schema/defs-zos.json index f0deee9c1..cf3051dac 100644 --- a/schema/defs-zos.json +++ b/schema/defs-zos.json @@ -29,16 +29,16 @@ ], "properties": { "path": { - "$ref": "defs.json#/definitions/FilePath" + "$ref": "defs.json#/definitions/FilePath" }, "type": { - "$ref": "#/definitions/FileType" + "$ref": "#/definitions/FileType" }, "major": { - "$ref": "#/definitions/Major" + "$ref": "#/definitions/Major" }, "minor": { - "$ref": "#/definitions/Minor" + "$ref": "#/definitions/Minor" }, "fileMode": { "$ref": "#/definitions/FileMode" diff --git a/schema/features-linux.json b/schema/features-linux.json index cb01fa862..0f4d21db3 100644 --- a/schema/features-linux.json +++ b/schema/features-linux.json @@ -104,10 +104,10 @@ "idmap": { "type": "object", "properties": { - "enabled": { + "enabled": { "type": "boolean" } - } + } } } } diff --git a/schema/features-schema.json b/schema/features-schema.json index 5a094a7dc..3ae17a7a5 100644 --- a/schema/features-schema.json +++ b/schema/features-schema.json @@ -21,7 +21,7 @@ "potentiallyUnsafeConfigAnnotations": { "$ref": "defs.json#/definitions/ArrayOfStrings" }, - "linux": { + "linux": { "$ref": "features-linux.json#/linux" } }, diff --git a/schema/test/config/good/spec-example.json b/schema/test/config/good/spec-example.json index fe56e54c8..5b9ad01dc 100644 --- a/schema/test/config/good/spec-example.json +++ b/schema/test/config/good/spec-example.json @@ -159,8 +159,14 @@ "createRuntime": [ { "path": "/usr/bin/fix-mounts", - "args": ["fix-mounts", "arg1", "arg2"], - "env": [ "key1=value1"] + "args": [ + "fix-mounts", + "arg1", + "arg2" + ], + "env": [ + "key1=value1" + ] }, { "path": "/usr/bin/setup-network" @@ -169,8 +175,14 @@ "createContainer": [ { "path": "/usr/bin/mount-hook", - "args": ["-mount", "arg1", "arg2"], - "env": [ "key1=value1"] + "args": [ + "-mount", + "arg1", + "arg2" + ], + "env": [ + "key1=value1" + ] } ], "startContainer": [ diff --git a/schema/test/config/good/zos-minimal.json b/schema/test/config/good/zos-minimal.json index 94d22372a..4647eb1ab 100644 --- a/schema/test/config/good/zos-minimal.json +++ b/schema/test/config/good/zos-minimal.json @@ -3,6 +3,5 @@ "root": { "path": "rootfs" }, - "zos": { - } + "zos": {} } diff --git a/schema/test/features/good/runc.json b/schema/test/features/good/runc.json index 43940a701..8f5196243 100644 --- a/schema/test/features/good/runc.json +++ b/schema/test/features/good/runc.json @@ -171,10 +171,10 @@ "SCMP_ARCH_X86_64" ], "knownFlags": [ - "SECCOMP_FILTER_FLAG_LOG" + "SECCOMP_FILTER_FLAG_LOG" ], "supportedFlags": [ - "SECCOMP_FILTER_FLAG_LOG" + "SECCOMP_FILTER_FLAG_LOG" ] }, "apparmor": {