wire up to the command for testing the experiment

cmd/cue/cmd/get_crd.go

@@ -15,8 +15,12 @@
 package cmd
 
 import (
-	"cuelang.org/go/cue/build"
-	"cuelang.org/go/cue/load"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"cuelang.org/go/cue/cuecontext"
+	"cuelang.org/go/encoding/crd"
 	"github.com/spf13/cobra"
 )
 
@@ -50,24 +54,34 @@ CustomResourceDefinitions are converted to cue structs adhering to the following
 	- The @x-kubernetes-validation attribute is added if the field utilizes the "x-kubernetes-validation" extension.
 `,
 
-		RunE: mkRunE(c, extract),
+		RunE: mkRunE(c, runGetCRD),
 	}
 
 	return cmd
 }
 
 func runGetCRD(cmd *Command, args []string) error {
-	c := &config{
-		fileFilter:     `\.(json|yaml|yml|jsonl|ldjson)$`,
-		interpretation: build.CustomResourceDefinition,
-		encoding:       "yaml",
-		loadCfg:        &load.Config{DataFiles: true},
+	decoder := crd.NewDecoder(cuecontext.New(), "cue get crd "+strings.Join(args, " "))
+
+	data, err := os.ReadFile(args[0])
+	if err != nil {
+		return err
 	}
 
-	p, err := newBuildPlan(cmd, c)
+	defs, err := decoder.Generate(data)
 	if err != nil {
 		return err
 	}
 
+	for path, crd := range defs {
+		if err = os.MkdirAll(path, 0644); err != nil {
+			return err
+		}
+
+		if err = os.WriteFile(filepath.Join(path, "types_gen.cue"), crd, 0644); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }

encoding/crd/extract.go

@@ -212,6 +212,9 @@ func convertCRD(crd cue.Value) (*IntermediateCRD, error) {
 					}
 				`, cc.Props.Spec.Group, ver, kname, nsConstraint)))
 
+		// Add x-kubernetes-* OpenAPI extensions as attributes
+		sch = sch.FillPath(defpath, exts(ctx, defpath, *cc.Props.Spec.Versions[i].Schema.OpenAPIV3Schema))
+
 		// now, go back to an AST because it's easier to manipulate references there
 		var schast *ast.File
 		switch x := sch.Syntax(cue.All(), cue.Docs(true)).(type) {
@@ -254,11 +257,6 @@ func convertCRD(crd cue.Value) (*IntermediateCRD, error) {
 			return nil
 		}
 
-		extensions, err := exts(ctx, defpath, *cc.Props.Spec.Versions[0].Schema.OpenAPIV3Schema)
-		if err != nil {
-			return nil, err
-		}
-
 		// Have to prepend with the defpath where the CUE CRD representation
 		// lives because the astutil walker to remove ellipses operates over the
 		// whole file, and therefore will be looking for full paths, extending
@@ -409,7 +407,7 @@ func parentPath(c astutil.Cursor) (cue.Selector, astutil.Cursor) {
 }
 
 // exts preserves k8s OpenAPI extensions as attributes
-func exts(ctx *cue.Context, path cue.Path, props v1.JSONSchemaProps) (cue.Value, error) {
+func exts(ctx *cue.Context, path cue.Path, props v1.JSONSchemaProps) cue.Value {
 	extensions := cue.Value{}
 
 	if props.XPreserveUnknownFields != nil {
@@ -441,14 +439,9 @@ func exts(ctx *cue.Context, path cue.Path, props v1.JSONSchemaProps) (cue.Value,
 	}
 
 	for name, subProp := range props.Properties {
-		subExtensions, err := exts(ctx, cue.MakePath(cue.Str(name)), subProp)
-		if err != nil {
-			return extensions, err
-		}
-
-		// Merge subextensions at this level
-		extensions = extensions.FillPath(path, subExtensions)
+		// Recursively add subextensions for each property
+		extensions = extensions.FillPath(path, exts(ctx, cue.MakePath(cue.Str(name)), subProp))
 	}
 
-	return extensions, nil
+	return extensions
 }