From 239329951010c20dda9235062ee4fceba9f625d4 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Tue, 17 Sep 2024 16:16:46 +0200
Subject: [PATCH] *.unit.create.meta.json: Fix syntax for not-required checks

not required [A, B] is not right as it means its not required to have
both. Instead we want not any-of [ required: a, required: b ]
---
 ...g.osbuild.containers.unit.create.meta.json | 48 +++++++++++++------
 .../org.osbuild.systemd.unit.create.meta.json | 42 ++++++++++++----
 2 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/stages/org.osbuild.containers.unit.create.meta.json b/stages/org.osbuild.containers.unit.create.meta.json
index b1eb612c..1cbbfed0 100644
--- a/stages/org.osbuild.containers.unit.create.meta.json
+++ b/stages/org.osbuild.containers.unit.create.meta.json
@@ -78,10 +78,17 @@
               "Install"
             ],
             "not": {
-              "required": [
-                "Service",
-                "Volume",
-                "Network"
+              "anyOf": [
+                {
+                  "required": [
+                    "Volume"
+                  ]
+                },
+                {
+                  "required": [
+                    "Network"
+                  ]
+                }
               ]
             }
           },
@@ -90,10 +97,17 @@
               "Volume"
             ],
             "not": {
-              "required": [
-                "Container",
-                "Network",
-                "Service"
+              "anyOf": [
+                {
+                  "required": [
+                    "Container"
+                  ]
+                },
+                {
+                  "required": [
+                    "Network"
+                  ]
+                }
               ]
             }
           },
@@ -102,10 +116,17 @@
               "Network"
             ],
             "not": {
-              "required": [
-                "Service",
-                "Container",
-                "Volume"
+              "anyOf": [
+                {
+                  "required": [
+                    "Container"
+                  ]
+                },
+                {
+                  "required": [
+                    "Volume"
+                  ]
+                }
               ]
             }
           }
@@ -247,9 +268,6 @@
             "additionalProperties": false,
             "type": "object",
             "description": "'Volume' configuration section of a unit file.",
-            "required": [
-              "What"
-            ],
             "properties": {
               "VolumeName": {
                 "description": "Override volume name",
diff --git a/stages/org.osbuild.systemd.unit.create.meta.json b/stages/org.osbuild.systemd.unit.create.meta.json
index 496b6933..254bc0fa 100644
--- a/stages/org.osbuild.systemd.unit.create.meta.json
+++ b/stages/org.osbuild.systemd.unit.create.meta.json
@@ -90,9 +90,17 @@
               "Install"
             ],
             "not": {
-              "required": [
-                "Mount",
-                "Socket"
+              "anyOf": [
+                {
+                  "required": [
+                    "Mount"
+                  ]
+                },
+                {
+                  "required": [
+                    "Socket"
+                  ]
+                }
               ]
             }
           },
@@ -101,9 +109,17 @@
               "Socket"
             ],
             "not": {
-              "required": [
-                "Mount",
-                "Service"
+              "anyOf": [
+                {
+                  "required": [
+                    "Mount"
+                  ]
+                },
+                {
+                  "required": [
+                    "Service"
+                  ]
+                }
               ]
             }
           },
@@ -112,9 +128,17 @@
               "Mount"
             ],
             "not": {
-              "required": [
-                "Service",
-                "Socket"
+              "anyOf": [
+                {
+                  "required": [
+                    "Service"
+                  ]
+                },
+                {
+                  "required": [
+                    "Socket"
+                  ]
+                }
               ]
             }
           }