fix(parameter): resolve ref for allOf

apis/parameters/v1alpha1/parametersdefinition_types.go

@@ -467,6 +467,7 @@ type IniConfig struct {
 type ParametersSchema struct {
 	// Specifies the top-level key in the 'configSchema.cue' that organizes the validation rules for parameters.
 	// This key must exist within the CUE script defined in 'configSchema.cue'.
+	// If not specified, the first schema found will be used.
 	//
 	// +optional
 	TopLevelKey string `json:"topLevelKey,omitempty"`

config/crd/bases/parameters.kubeblocks.io_parametersdefinitions.yaml

@@ -188,6 +188,7 @@ spec:
                     description: |-
                       Specifies the top-level key in the 'configSchema.cue' that organizes the validation rules for parameters.
                       This key must exist within the CUE script defined in 'configSchema.cue'.
+                      If not specified, the first schema found will be used.
                     type: string
                 type: object
               reloadAction:

deploy/helm/crds/parameters.kubeblocks.io_parametersdefinitions.yaml

@@ -188,6 +188,7 @@ spec:
                     description: |-
                       Specifies the top-level key in the 'configSchema.cue' that organizes the validation rules for parameters.
                       This key must exist within the CUE script defined in 'configSchema.cue'.
+                      If not specified, the first schema found will be used.
                     type: string
                 type: object
               reloadAction:

docs/developer_docs/api-reference/parameters.md

@@ -3241,7 +3241,8 @@ string
 <td>
 <em>(Optional)</em>
 <p>Specifies the top-level key in the &lsquo;configSchema.cue&rsquo; that organizes the validation rules for parameters.
-This key must exist within the CUE script defined in &lsquo;configSchema.cue&rsquo;.</p>
+This key must exist within the CUE script defined in &lsquo;configSchema.cue&rsquo;.
+If not specified, the first schema found will be used.</p>
 </td>
 </tr>
 <tr>

pkg/parameters/openapi/cue_gen_openapi.go

@@ -164,6 +164,15 @@ func deReferenceSchema(props *apiextv1.JSONSchemaProps, resolveFn func(path stri
 			return err
 		}
 	}
+	for i := range props.AllOf {
+		schemaProps := util.ToPointer(props.AllOf[i])
+		schemaProps, err = oneProps(schemaProps)
+		if err != nil {
+			return err
+		}
+		props.AllOf[i] = *schemaProps
+	}
+	expandAllOf(props)
 	for key := range props.Properties {
 		schemaProps := util.ToPointer(props.Properties[key])
 		schemaProps, err = oneProps(schemaProps)
@@ -174,3 +183,56 @@ func deReferenceSchema(props *apiextv1.JSONSchemaProps, resolveFn func(path stri
 	}
 	return nil
 }
+
+func expandAllOf(props *apiextv1.JSONSchemaProps) {
+	if len(props.AllOf) == 0 {
+		return
+	}
+	allOf := props.AllOf
+	props.AllOf = nil
+	for _, schemaProps := range allOf {
+		if schemaProps.Type != "" && schemaProps.Type != SchemaStructType {
+			props.AllOf = append(props.AllOf, schemaProps)
+			continue
+		}
+		mergeSchemaProps(props, schemaProps)
+	}
+}
+
+func mergeSchemaProps(dst *apiextv1.JSONSchemaProps, src apiextv1.JSONSchemaProps) {
+	if dst.Type == "" {
+		dst.Type = src.Type
+	}
+	if len(src.Properties) > 0 {
+		if dst.Properties == nil {
+			dst.Properties = map[string]apiextv1.JSONSchemaProps{}
+		}
+		for key, value := range src.Properties {
+			if _, ok := dst.Properties[key]; !ok {
+				dst.Properties[key] = value
+			}
+		}
+	}
+	if dst.AdditionalProperties == nil {
+		dst.AdditionalProperties = src.AdditionalProperties
+	}
+	dst.Required = mergeRequired(dst.Required, src.Required)
+}
+
+func mergeRequired(dst, src []string) []string {
+	if len(src) == 0 {
+		return dst
+	}
+	required := make(map[string]struct{}, len(dst)+len(src))
+	for _, item := range dst {
+		required[item] = struct{}{}
+	}
+	for _, item := range src {
+		if _, ok := required[item]; ok {
+			continue
+		}
+		required[item] = struct{}{}
+		dst = append(dst, item)
+	}
+	return dst
+}

pkg/parameters/openapi/cue_gen_openapi_test.go

@@ -23,88 +23,45 @@ import (
 	"bytes"
 	"encoding/json"
 	"os"
-	"reflect"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
 
 	"github.com/apecloud/kubeblocks/pkg/parameters/core"
 	"github.com/apecloud/kubeblocks/test/testdata"
 )
 
 func TestGenerateOpenApiSchema(t *testing.T) {
-	type args struct {
-		cueFile    string
-		schemaType string
-	}
-	tests := []struct {
-		name    string
-		args    args
-		want    string
-		wantErr bool
-	}{{
-		name: "normal_test",
-		args: args{
-			cueFile:    "test_import_type.cue",
-			schemaType: "Exemplar",
-		},
-		want:    "test_import_type.json",
-		wantErr: false,
-	}, {
-		name: "normal_test",
-		args: args{
-			cueFile:    "mysql_openapi.cue",
-			schemaType: "MysqlParameter",
-		},
-		want:    "mysql_openapi.json",
-		wantErr: false,
-	}, {
-		//	name: "normal_test",
-		//	args: args{
-		//		cueFile:    "mysql_openapi_v2.cue",
-		//		schemaType: "MysqlSchema",
-		//	},
-		//	want:    "mysql_openapi_v2.json",
-		//	wantErr: false,
-		// }, {
-		name: "normal_with_not_empty",
-		args: args{
-			cueFile:    "mysql_openapi.cue",
-			schemaType: "",
-		},
-		want:    "mysql_openapi.json",
-		wantErr: false,
-	}, {
-		name: "pg14_openapi",
-		args: args{
-			cueFile:    "pg14.cue",
-			schemaType: "PGPameter",
-		},
-		want:    "pg14_openapi.json",
-		wantErr: false,
-	}, {
-		name: "failed_test",
-		args: args{
-			cueFile:    "mysql.cue",
-			schemaType: "NotType",
-		},
-		want:    "mysql_openapi_failed_not_exist",
-		wantErr: true,
-	}}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := runOpenAPITest(tt.args.cueFile, tt.args.schemaType)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("GenerateOpenAPISchema() error = %v, wantErr %v", err, tt.wantErr)
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "OpenAPI Schema Suite")
+}
+
+var _ = Describe("GenerateOpenAPISchema", func() {
+	DescribeTable("generates schema from CUE definitions",
+		func(cueFile, schemaType, want string, wantErr bool) {
+			got, err := runOpenAPITest(cueFile, schemaType)
+			GinkgoWriter.Println(string(got))
+			Expect(err != nil).To(Equal(wantErr), "GenerateOpenAPISchema() error = %v, wantErr %v", err, wantErr)
+			if wantErr {
 				return
 			}
-			wantContent := getContentFromFile(tt.want)
-			if !reflect.DeepEqual(got, wantContent) {
-				t.Errorf("GenerateOpenAPISchema() diff: %s", cmp.Diff(wantContent, got))
-			}
-		})
-	}
-}
+
+			wantContent := getContentFromFile(want)
+			Expect(got).To(Equal(wantContent), "GenerateOpenAPISchema() diff: %s", cmp.Diff(wantContent, got))
+		},
+		Entry("test_import_type", "test_import_type.cue", "Exemplar", "test_import_type.json", false),
+		Entry("normal_test with mysql", "mysql_openapi.cue", "MysqlParameter", "mysql_openapi.json", false),
+		Entry("normal_test with mysql2", "mysql_openapi_v2.cue", "MysqlSchema", "mysql_openapi_v2.json", false),
+		Entry("normal_with_not_empty", "mysql_openapi.cue", "", "mysql_openapi.json", false),
+		Entry("pg14_openapi", "pg14.cue", "PGPameter", "pg14_openapi.json", false),
+		Entry("multiple_schema_arch_a", "multiple_schema.cue", "archA", "multiple_schema_arch_a.json", false),
+		Entry("multiple_schema_combined", "multiple_schema.cue", "combined", "multiple_schema_combined.json", false),
+		Entry("multiple_schema_embedded", "multiple_schema.cue", "embedded", "multiple_schema_combined.json", false),
+		Entry("failed_test", "mysql.cue", "NotType", "mysql_openapi_failed_not_exist", true),
+	)
+})
 
 func getContentFromFile(file string) []byte {
 	content, err := os.ReadFile(testdata.SubTestDataPath("./cue_testdata/" + file))

pkg/parameters/openapi/utils.go

@@ -96,7 +96,7 @@ func DeReference(f *ast.File, rt *Runtime) func(path string) (*apiextv1.JSONSche
 
 func fetchTypeDefine(value string, node ast.Node) ast.Node {
 	n := node
-	for _, field := range strings.Split(value, "/") {
+	for field := range strings.SplitSeq(value, "/") {
 		if field == "" {
 			continue
 		}

test/testdata/cue_testdata/multiple_schema.cue

@@ -0,0 +1,35 @@
+// Copyright (C) 2022-2026 ApeCloud Co., Ltd
+//
+// This file is part of KubeBlocks project
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#shared: {
+	a?: string
+}
+
+#archA: #shared & {
+	b?: string
+}
+
+#archB: #shared & {
+	c?: string
+}
+
+#combined: #archA & #archB
+
+#embedded: {
+	#archA
+	#archB
+}

test/testdata/cue_testdata/multiple_schema_arch_a.json

@@ -0,0 +1,16 @@
+{
+  "type": "object",
+  "properties": {
+    "spec": {
+      "type": "object",
+      "properties": {
+        "a": {
+          "type": "string"
+        },
+        "b": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}

test/testdata/cue_testdata/multiple_schema_combined.json

@@ -0,0 +1,19 @@
+{
+  "type": "object",
+  "properties": {
+    "spec": {
+      "type": "object",
+      "properties": {
+        "a": {
+          "type": "string"
+        },
+        "b": {
+          "type": "string"
+        },
+        "c": {
+          "type": "string"
+        }
+      }
+    }
+  }
+}

test/testdata/cue_testdata/mysql_openapi_v2.json

@@ -16,7 +16,6 @@
           }
         },
         "mysqlld": {
-          "description": "mysql config validator",
           "type": "object",
           "required": [
             "automatic_sp_privileges",
@@ -57,7 +56,9 @@
               "minimum": 4096
             },
             "caching_sha2_password_private_key_path": {
-              "$ref": "#/components/schemas/MysqlSchema.mysqlld.KeyPath"
+              "description": "custom format, reference Regular expressions",
+              "type": "string",
+              "pattern": "^[a-z][a-zA-Z0-9]+.pem$"
             },
             "flush_time": {
               "type": "integer",
@@ -67,7 +68,9 @@
             },
             "group_concat_max_len": {
               "type": "integer",
-              "default": 1024
+              "default": 1024,
+              "minimum": 4,
+              "exclusiveMinimum": true
             },
             "gtid_mode": {
               "type": "string",