fix: ref

foomo · Oct 8, 2024 · 2523e80 · 2523e80
1 parent 81f1ee3
commit 2523e80
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/internal/config/unit.go b/internal/config/unit.go
@@ -14,7 +14,7 @@ import (
 )
 
 type Unit struct {
-	Chart     Chart            `json:"chart,omitempty" yaml:"chart,omitempty" jsonschema:"anyof_type=string;Chart"`
+	Chart     Chart            `json:"chart,omitempty" yaml:"chart,omitempty" jsonschema:"anyof_type=string,anyof_ref=#/$defs/Chart"`
 	Kustomize string           `json:"kustomize,omitempty" yaml:"kustomize,omitempty"`
 	Tags      Tags             `json:"tags,omitempty" yaml:"tags,omitempty"`
 	Builds    map[string]Build `json:"builds,omitempty" yaml:"builds,omitempty"`
@@ -25,6 +25,15 @@ type Unit struct {
 // ~ Public methods
 // ------------------------------------------------------------------------------------------------
 
+// JSONSchemaProperty type workaround
+func (Unit) JSONSchemaProperty(prop string) any {
+	var x any
+	if prop == "chart" {
+		return x
+	}
+	return nil
+}
+
 func (u *Unit) ValuesYAML(global, vars map[string]any) ([]byte, error) {
 	values := u.Values
 	if values == nil {

diff --git a/squadron.schema.json b/squadron.schema.json
@@ -180,13 +180,12 @@
     "Unit": {
       "properties": {
         "chart": {
-          "$ref": "#/$defs/Chart",
           "anyOf": [
             {
               "type": "string"
             },
             {
-              "type": "Chart"
+              "$ref": "#/$defs/Chart"
             }
           ]
         },