fix: expression schema error

loft-sh · Oct 2, 2024 · 5b7e5d6 · 5b7e5d6
1 parent e3ad6bb
commit 5b7e5d6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/chart/tests/statefulset_test.yaml b/chart/tests/statefulset_test.yaml
@@ -879,3 +879,20 @@ tests:
       - equal:
           path: kind
           value: StatefulSet
+
+  - it: sync custom resources
+    set:
+      sync:
+        toHost:
+          customResources:
+            test.cert-manager.io:
+              enabled: true
+              translate:
+                - path: spec.dnsNames[*]
+                  expression:
+                    fromHost: "value.startsWith('www.') ? value.slice(4) : value"
+                    toHost: '"www."+value'
+    asserts:
+    - equal:
+        path: kind
+        value: StatefulSet
diff --git a/chart/values.schema.json b/chart/values.schema.json
@@ -3237,20 +3237,6 @@
       "type": "object"
     },
     "TranslatePatchExpression": {
-      "oneOf": [
-        {
-          "required": [
-            "toHost"
-          ],
-          "title": "toHost"
-        },
-        {
-          "required": [
-            "fromHost"
-          ],
-          "title": "fromHost"
-        }
-      ],
       "properties": {
         "toHost": {
           "type": "string",

diff --git a/config/config.go b/config/config.go
@@ -539,10 +539,10 @@ type TranslatePatchReference struct {
 
 type TranslatePatchExpression struct {
 	// ToHost is the expression to apply when retrieving a change from virtual to host.
-	ToHost string `json:"toHost,omitempty" jsonschema:"oneof_required=toHost"`
+	ToHost string `json:"toHost,omitempty"`
 
 	// FromHost is the patch to apply when retrieving a change from host to virtual.
-	FromHost string `json:"fromHost,omitempty" jsonschema:"oneof_required=fromHost"`
+	FromHost string `json:"fromHost,omitempty"`
 }
 
 type SyncFromHostCustomResource struct {