Update schemas (#2250)

ansible · Jul 27, 2022 · 39914da · 39914da
1 parent 4ea4460
commit 39914da
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 16 deletions.
diff --git a/src/ansiblelint/schemas/galaxy.json b/src/ansiblelint/schemas/galaxy.json
@@ -528,6 +528,7 @@
       "type": "array"
     },
     "version": {
+      "markdownDescription": "Version must use [SemVer](https://semver.org/) format, which is more restrictive than [PEP-440](https://peps.python.org/pep-0440/). For example `1.0.0-rc1` is valid but `1.0.0rc` is not.",
       "minLength": 5,
       "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$",
       "title": "Version",

diff --git a/src/ansiblelint/schemas/meta.json b/src/ansiblelint/schemas/meta.json
@@ -199,7 +199,7 @@
       "type": "object"
     },
     "DependencyModel": {
-      "additionalProperties": false,
+      "additionalProperties": true,
       "anyOf": [
         {
           "required": ["role"]
@@ -211,7 +211,7 @@
           "required": ["name"]
         }
       ],
-      "markdownDescription": "See https://docs.ansible.com/ansible/latest/user_guide/playbooks_reuse_roles.html#role-dependencies and https://github.com/ansible/ansible/blob/devel/lib/ansible/playbook/role/metadata.py#L79",
+      "markdownDescription": "See https://docs.ansible.com/ansible/latest/user_guide/playbooks_reuse_roles.html#role-dependencies and https://github.com/ansible/ansible/blob/devel/lib/ansible/playbook/role/metadata.py#L79\n\nOther keys are treated as role [parameters](https://docs.ansible.com/ansible/latest/user_guide/playbooks_reuse_roles.html#passing-different-parameters).",
       "properties": {
         "become": {
           "title": "Become",
@@ -854,6 +854,35 @@
       "title": "OpenWRTPlatformModel",
       "type": "object"
     },
+    "OracleLinuxPlatformModel": {
+      "properties": {
+        "name": {
+          "const": "OracleLinux",
+          "title": "Name",
+          "type": "string"
+        },
+        "versions": {
+          "default": "all",
+          "items": {
+            "enum": [
+              "8.0",
+              "8.1",
+              "8.2",
+              "8.3",
+              "8.4",
+              "8.5",
+              "8.6",
+              "9.0",
+              "all"
+            ],
+            "type": "string"
+          },
+          "type": "array"
+        }
+      },
+      "title": "OracleLinuxPlatformModel",
+      "type": "object"
+    },
     "PAN-OSPlatformModel": {
       "properties": {
         "name": {

diff --git a/src/ansiblelint/schemas/playbook.json b/src/ansiblelint/schemas/playbook.json
@@ -473,23 +473,11 @@
         "serial": {
           "anyOf": [
             {
-              "type": "integer"
-            },
-            {
-              "pattern": "^\\d+\\.?\\d*%?$",
-              "type": "string"
+              "$ref": "#/$defs/templated-integer-or-percent"
             },
             {
               "items": {
-                "anyOf": [
-                  {
-                    "type": "integer"
-                  },
-                  {
-                    "pattern": "^\\d+\\.?\\d*%?$",
-                    "type": "string"
-                  }
-                ]
+                "$ref": "#/$defs/templated-integer-or-percent"
               },
               "type": "array"
             }
@@ -986,6 +974,21 @@
         }
       ]
     },
+    "templated-integer-or-percent": {
+      "oneOf": [
+        {
+          "type": "integer"
+        },
+        {
+          "pattern": "^\\d+\\.?\\d*%?$",
+          "type": "string"
+        },
+        {
+          "$ref": "#/$defs/full-jinja",
+          "type": "string"
+        }
+      ]
+    },
     "templated-object": {
       "oneOf": [
         {