Merge branch 'main' into dependabot/pip/ansible-compat-2.2.1

src/molecule/data/__init__.py

@@ -0,0 +1 @@
+"""Module containing molecule data files."""

src/molecule/data/molecule.json

@@ -13,12 +13,8 @@
       "type": "object"
     },
     "MoleculeDependencyModel": {
-      "additionalProperties": false,
+      "unevaluatedProperties": false,
       "properties": {
-        "command": {
-          "title": "Command",
-          "type": ["string", "null"]
-        },
         "enabled": {
           "default": true,
           "title": "Enabled",
@@ -38,6 +34,17 @@
           "type": "object"
         }
       },
+      "if": {
+        "properties": { "name": { "const": "galaxy" } }
+      },
+      "then": {
+        "properties": {
+          "command": { "title": "Command", "type": ["string", "null"] }
+        }
+      },
+      "else": {
+        "properties": { "command": { "title": "Command", "type": "string" } }
+      },
       "required": ["name"],
       "title": "MoleculeDependencyModel",
       "type": "object"
@@ -509,7 +516,7 @@
       "type": "object"
     }
   },
-  "$id": "https://raw.githubusercontent.com/ansible/schemas/main/f/molecule.json",
+  "$id": "https://raw.githubusercontent.com/ansible-community/molecule/main/src/molecule/data/molecule.json",
   "$schema": "http://json-schema.org/draft-07/schema",
   "additionalProperties": false,
   "examples": ["molecule/*/molecule.yml"],

src/molecule/model/schema_v3.py

@@ -25,13 +25,13 @@
 from jsonschema import validate as jsonschema_validate
 from jsonschema.exceptions import ValidationError
 
-from molecule.schemas import __file__ as schemas_module
+from molecule.data import __file__ as data_module
 
 
 def validate(c):
     """Perform schema validation."""
     result = []
-    schema_file = os.path.dirname(schemas_module) + "/molecule.json"
+    schema_file = os.path.dirname(data_module) + "/molecule.json"
     with open(schema_file, encoding="utf-8") as f:
         schema = json.load(f)