stages/groups: fix group name schema validation

Use `patternProperties` instead of `propertyNames` and `pattern`, which is not in draft 4 and so did not work (but also did not throw an error).
osbuild · Jun 9, 2021 · ee6d53a · ee6d53a
1 parent f08f026
commit ee6d53a
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/stages/org.osbuild.groups b/stages/org.osbuild.groups
@@ -22,16 +22,16 @@ SCHEMA = """
 "properties": {
   "groups": {
     "type": "object",
+    "additionalProperties": false,
     "description": "Keys are group names, values are objects with group info",
-    "propertyNames": {
-      "pattern": "^[A-Za-z0-9_][A-Za-z0-9_-]{0,31}$"
-    },
-    "additionalProperties": {
-      "type": "object",
-      "properties": {
-        "gid": {
-          "type": "number",
-          "description": "GID for this group"
+    "patternProperties": {
+      "^[A-Za-z0-9_][A-Za-z0-9_-]{0,31}$": {
+        "type": "object",
+        "properties": {
+          "gid": {
+            "type": "number",
+            "description": "GID for this group"
+          }
         }
       }
     }