From ba233a0cbad76b4783a03893e7bf4716fbc0f0ec Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 26 Jun 2024 08:24:58 +0200
Subject: Merging upstream version 24.6.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/ansiblelint/schemas/ansible.json | 51 ++++++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 14 deletions(-)

(limited to 'src/ansiblelint/schemas/ansible.json')

diff --git a/src/ansiblelint/schemas/ansible.json b/src/ansiblelint/schemas/ansible.json
index 94846d0..9423f7a 100644
--- a/src/ansiblelint/schemas/ansible.json
+++ b/src/ansiblelint/schemas/ansible.json
@@ -1,5 +1,10 @@
 {
   "$defs": {
+    "removed-include-module": {
+      "markdownDescription": "See [include module](https://docs.ansible.com/ansible/latest/collections/ansible/builtin/include_module.html)",
+      "not": {},
+      "title": "Replace 'include' with either 'ansible.builtin.include_tasks' or 'ansible.builtin.import_tasks'"
+    },
     "ansible.builtin.import_playbook": {
       "additionalProperties": false,
       "oneOf": [
@@ -163,7 +168,7 @@
         },
         "ignore_unreachable": {
           "title": "Ignore Unreachable",
-          "type": "boolean"
+          "$ref": "#/$defs/templated-boolean"
         },
         "module_defaults": {
           "title": "Module Defaults"
@@ -348,8 +353,8 @@
           "type": "boolean"
         },
         "gather_facts": {
-          "title": "Gather Facts",
-          "type": "boolean"
+          "$ref": "#/$defs/templated-boolean",
+          "title": "Gather Facts"
         },
         "gather_subset": {
           "items": {
@@ -523,11 +528,11 @@
         },
         "ignore_unreachable": {
           "title": "Ignore Unreachable",
-          "type": "boolean"
+          "$ref": "#/$defs/templated-boolean"
         },
         "max_fail_percentage": {
           "title": "Max Fail Percentage",
-          "type": "number"
+          "$ref": "#/$defs/templated-integer"
         },
         "module_defaults": {
           "title": "Module Defaults"
@@ -540,15 +545,23 @@
           "$ref": "#/$defs/templated-boolean"
         },
         "order": {
-          "enum": [
-            "default",
-            "sorted",
-            "reverse_sorted",
-            "reverse_inventory",
-            "shuffle"
+          "oneOf": [
+            {
+              "enum": [
+                "inventory",
+                "reverse_inventory",
+                "reverse_sorted",
+                "shuffle",
+                "sorted"
+              ],
+              "type": "string"
+            },
+            {
+              "$ref": "#/$defs/full-jinja"
+            }
           ],
           "title": "Order",
-          "type": "string"
+          "markdownDescription": "See https://docs.ansible.com/ansible/latest/playbook_guide/playbooks_strategies.html#ordering-execution-based-on-inventory"
         },
         "port": {
           "$ref": "#/$defs/templated-integer",
@@ -720,7 +733,7 @@
         },
         "ignore_unreachable": {
           "title": "Ignore Unreachable",
-          "type": "boolean"
+          "$ref": "#/$defs/templated-boolean"
         },
         "module_defaults": {
           "title": "Module Defaults"
@@ -831,6 +844,15 @@
           "title": "Action",
           "type": "string"
         },
+        "ansible.builtin.include": {
+          "$ref": "#/$defs/removed-include-module"
+        },
+        "include": {
+          "$ref": "#/$defs/removed-include-module"
+        },
+        "ansible.legacy.include": {
+          "$ref": "#/$defs/removed-include-module"
+        },
         "any_errors_fatal": {
           "$ref": "#/$defs/templated-boolean",
           "title": "Any Errors Fatal"
@@ -914,7 +936,7 @@
         },
         "ignore_unreachable": {
           "title": "Ignore Unreachable",
-          "type": "boolean"
+          "$ref": "#/$defs/templated-boolean"
         },
         "listen": {
           "anyOf": [
@@ -1196,6 +1218,7 @@
   "$id": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/ansible.json",
   "$schema": "http://json-schema.org/draft-07/schema",
   "additionalProperties": false,
+  "description": "https://docs.ansible.com/ansible/latest/reference_appendices/playbooks_keywords.html",
   "examples": [],
   "title": "Ansible Schemas Bundle 22.4",
   "type": ["array", "object"]
-- 
cgit v1.2.3