Merge pull request #1255 from kd-collective/fmt

chore: format JSON file
opencontainers · Jun 10, 2024 · db6d962 · db6d962
2 parents 2d3f72e + d4aa6d8
commit db6d962
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 20 deletions.
diff --git 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
@@ -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
@@ -104,10 +104,10 @@
                     "idmap": {
                         "type": "object",
                         "properties": {
-			    "enabled": {
+                            "enabled": {
                                 "type": "boolean"
                             }
-                       }
+                        }
                     }
                 }
             }

diff --git 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
@@ -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
@@ -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
@@ -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": {