fix: jsonschema to correctly validate key|keys in rollout segment (#2947

)
flipt-io · Apr 4, 2024 · 70302a1 · 70302a1
1 parent 2770a9d
commit 70302a1
Showing 1 changed file with 28 additions and 2 deletions.
diff --git a/core/validation/flipt.json b/core/validation/flipt.json
@@ -27,10 +27,15 @@
     "rolloutSegment": {
       "type": "object",
       "properties": {
+        "key": {
+          "type": "string",
+          "pattern": "^[-_,A-Za-z0-9]+$"
+        },
         "keys": {
           "type": "array",
           "items": {
-            "type": "string"
+            "type": "string",
+            "pattern": "^[-_,A-Za-z0-9]+$"
           }
         },
         "operator": {
@@ -44,8 +49,29 @@
         }
       },
       "required": [
-        "keys",
         "value"
+      ],
+      "oneOf": [
+        {
+          "required": [
+            "key"
+          ],
+          "not": {
+            "required": [
+              "keys"
+            ]
+          }
+        },
+        {
+          "required": [
+            "keys"
+          ],
+          "not": {
+            "required": [
+              "key"
+            ]
+          }
+        }
       ]
     },
     "rolloutThreshold": {