schema: updates and fixes

Several fields needed the correct typing, and updates for recent changes.

Signed-off-by: Vincent Batts <[email protected]>

Author: vbatts

schema/defs-linux.json

@@ -93,7 +93,9 @@
             "type": "string"
         },
         "FileType": {
-            "type": "integer"
+            "description": "Type of a block or special character device",
+            "type": "string",
+            "pattern": "^[c|b|u|p]$"
         },
         "Device": {
             "properties": {

schema/schema-linux.json

@@ -61,6 +61,15 @@
                 "id": "https://opencontainers.org/schema/bundle/linux/resources",
                 "type": "object",
                 "properties": {
+                    "pids": {
+                        "id": "https://opencontainers.org/schema/bundle/linux/resources/pids",
+                        "properties": {
+                            "limit": {
+                                "id": "https://opencontainers.org/schema/bundle/linux/resources/pids/limit",
+                                "$ref": "defs.json#/definitions/int64"
+                            }
+                        }
+                    },
                     "blockIO": {
                         "id": "https://opencontainers.org/schema/bundle/linux/resources/blockIO",
                         "type": "object",
@@ -190,13 +199,16 @@
                         "id": "https://opencontainers.org/schema/bundle/linux/resources/hugepageLimits",
                         "oneOf": [
                             {
-                                "type": "object",
-                                "properties": {
-                                    "pageSize": {
-                                        "type": "string"
-                                    },
-                                    "limit": {
-                                        "$ref": "defs.json#/definitions/uint64"
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "pageSize": {
+                                            "type": "string"
+                                        },
+                                        "limit": {
+                                            "$ref": "defs.json#/definitions/uint64"
+                                        }
                                     }
                                 }
                             },
@@ -235,9 +247,9 @@
                         "id": "https://opencontainers.org/schema/bundle/linux/resources/network",
                         "type": "object",
                         "properties": {
-                            "classId": {
+                            "classID": {
                                 "id": "https://opencontainers.org/schema/bundle/linux/resources/network/classId",
-                                "type": "string"
+                                "$ref": "defs.json#/definitions/uint32"
                             },
                             "priorities": {
                                 "id": "https://opencontainers.org/schema/bundle/linux/resources/network/priorities",
@@ -257,31 +269,6 @@
                     }
                 }
             },
-            "rlimits": {
-                "id": "https://opencontainers.org/schema/bundle/linux/rlimits",
-                "items": [
-                    {
-                        "id": "https://opencontainers.org/schema/bundle/linux/rlimits/0",
-                        "properties": {
-                            "hard": {
-                                "id": "https://opencontainers.org/schema/bundle/linux/rlimits/0/hard",
-                                "type": "integer"
-                            },
-                            "soft": {
-                                "id": "https://opencontainers.org/schema/bundle/linux/rlimits/0/soft",
-                                "type": "integer"
-                            },
-                            "type": {
-                                "id": "https://opencontainers.org/schema/bundle/linux/rlimits/0/type",
-                                "type": "string",
-                                "pattern": "^RLIMIT_[A-Z]+$"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ],
-                "type": "array"
-            },
             "cgroupsPath": {
                 "oneOf": [
                     {

schema/schema.json

@@ -25,7 +25,7 @@
             }
         },
         "annotations": {
-            "id": "https://opencontainers.org/schema/bundle/linux/sysctl",
+            "id": "https://opencontainers.org/schema/bundle/annotations",
             "oneOf": [
                 {
                     "$ref": "defs.json#/definitions/mapStringString"
@@ -139,6 +139,31 @@
                 "noNewPrivileges": {
                     "id": "https://opencontainers.org/schema/bundle/process/linux/noNewPrivileges",
                     "type": "boolean"
+                },
+                "rlimits": {
+                    "id": "https://opencontainers.org/schema/bundle/linux/rlimits",
+                    "type": "array",
+                    "items": [
+                        {
+                            "id": "https://opencontainers.org/schema/bundle/linux/rlimits/0",
+                            "type": "object",
+                            "properties": {
+                                "hard": {
+                                    "id": "https://opencontainers.org/schema/bundle/linux/rlimits/0/hard",
+                                    "$ref": "defs.json#/definitions/uint64"
+                                },
+                                "soft": {
+                                    "id": "https://opencontainers.org/schema/bundle/linux/rlimits/0/soft",
+                                    "$ref": "defs.json#/definitions/uint64"
+                                },
+                                "type": {
+                                    "id": "https://opencontainers.org/schema/bundle/linux/rlimits/0/type",
+                                    "type": "string",
+                                    "pattern": "^RLIMIT_[A-Z]+$"
+                                }
+                            }
+                        }
+                    ]
                 }
             }
         },