Codegen: Generate Golang code using cog (#98812)

* Use cog for Go types

* Delete old generation code

* Fix plugins generation

* workspaces update

* Update datasources with new generated code

* More fixes

* Update swagger and openapi specs

* Fixes

* More files...

* Update workspace

* More fixes...

* Remove unused functions

pkg/codegen/generators/decorators.go

@@ -1,282 +0,0 @@
-package generators
-
-import (
-	"fmt"
-	"regexp"
-	"strings"
-	"unicode"
-
-	"github.com/dave/dst"
-	"github.com/dave/dst/dstutil"
-)
-
-// depointerizer returns an AST manipulator that removes redundant
-// pointer indirection from the defined types.
-func depointerizer() dstutil.ApplyFunc {
-	return func(c *dstutil.Cursor) bool {
-		switch x := c.Node().(type) {
-		case *dst.Field:
-			if s, is := x.Type.(*dst.StarExpr); is {
-				switch deref := depoint(s).(type) {
-				case *dst.ArrayType, *dst.MapType:
-					x.Type = deref
-				}
-			}
-		}
-		return true
-	}
-}
-
-func depoint(e dst.Expr) dst.Expr {
-	if star, is := e.(*dst.StarExpr); is {
-		return star.X
-	}
-	return e
-}
-
-func setStar(e dst.Expr) string {
-	if _, is := e.(*dst.StarExpr); is {
-		return "*"
-	}
-	return ""
-}
-
-func fixTODOComments() dstutil.ApplyFunc {
-	return func(cursor *dstutil.Cursor) bool {
-		switch f := cursor.Node().(type) {
-		case *dst.File:
-			for _, d := range f.Decls {
-				if isTypeSpec(d) {
-					removeGoFieldComment(d.Decorations().Start.All())
-				}
-				fixTODOComment(d.Decorations().Start.All())
-			}
-		case *dst.Field:
-			if len(f.Names) > 0 {
-				removeGoFieldComment(f.Decorations().Start.All())
-			}
-		}
-
-		return true
-	}
-}
-
-func fixTODOComment(comments []string) {
-	todoRegex := regexp.MustCompile("(//) (.*) (TODO.*)")
-	if len(comments) > 0 {
-		comments[0] = todoRegex.ReplaceAllString(comments[0], "$1 $3")
-	}
-}
-
-func removeGoFieldComment(comments []string) {
-	todoRegex := regexp.MustCompile("(//) ([A-Z].*?) ([A-Z]?.*?) (.*)")
-	if len(comments) > 0 {
-		matches := todoRegex.FindAllStringSubmatch(comments[0], -1)
-		if len(matches) > 0 {
-			if strings.EqualFold(matches[0][3], matches[0][2]) {
-				comments[0] = fmt.Sprintf("%s %s %s", matches[0][1], matches[0][3], matches[0][4])
-			} else {
-				r := []rune(matches[0][3])
-				if !unicode.IsLower(r[0]) {
-					comments[0] = fmt.Sprintf("%s %s %s", matches[0][1], matches[0][3], matches[0][4])
-				}
-			}
-		}
-	}
-}
-
-func isTypeSpec(d dst.Decl) bool {
-	gd, ok := d.(*dst.GenDecl)
-	if !ok {
-		return false
-	}
-
-	_, is := gd.Specs[0].(*dst.TypeSpec)
-	return is
-}
-
-// It fixes the "generic" fields. It happens when a value in cue could be different structs.
-// For Go it generates a struct with a json.RawMessage field inside and multiple functions to map it between the different possibilities.
-func fixRawData() dstutil.ApplyFunc {
-	return func(c *dstutil.Cursor) bool {
-		f, is := c.Node().(*dst.File)
-		if !is {
-			return false
-		}
-
-		rawFields := make(map[string]bool)
-		existingRawFields := make(map[string]bool)
-		for _, decl := range f.Decls {
-			switch x := decl.(type) {
-			// Find the structs that only contains one json.RawMessage inside
-			case *dst.GenDecl:
-				for _, t := range x.Specs {
-					if ts, ok := t.(*dst.TypeSpec); ok {
-						if tp, ok := ts.Type.(*dst.StructType); ok && len(tp.Fields.List) == 1 {
-							if fn, ok := tp.Fields.List[0].Type.(*dst.SelectorExpr); ok {
-								if fmt.Sprintf("%s.%s", fn.X, fn.Sel.Name) == "json.RawMessage" {
-									rawFields[ts.Name.Name] = true
-								}
-							}
-						}
-					}
-				}
-			// Find the functions of the previous structs to verify that are the ones that we are looking for.
-			case *dst.FuncDecl:
-				for _, recv := range x.Recv.List {
-					fnType := depoint(recv.Type).(*dst.Ident).Name
-					if rawFields[fnType] {
-						existingRawFields[fnType] = true
-					}
-				}
-			}
-		}
-
-		dstutil.Apply(f, func(c *dstutil.Cursor) bool {
-			switch x := c.Node().(type) {
-			// Delete the functions
-			case *dst.FuncDecl:
-				c.Delete()
-			case *dst.GenDecl:
-				// Deletes all "generics" generated for these json.RawMessage structs
-				comments := x.Decorations().Start.All()
-				if len(comments) > 0 {
-					if strings.HasSuffix(comments[0], "defines model for .") {
-						c.Delete()
-					}
-				}
-				for _, spec := range x.Specs {
-					if tp, ok := spec.(*dst.TypeSpec); ok {
-						// Delete structs with only json.RawMessage
-						if existingRawFields[tp.Name.Name] && tp.Name.Name != "MetricAggregation2" {
-							c.Delete()
-							continue
-						}
-						// Set types that was using these structs as interface{}
-						if st, ok := tp.Type.(*dst.StructType); ok {
-							iterateStruct(st, withoutRawData(existingRawFields))
-						}
-						if mt, ok := tp.Type.(*dst.MapType); ok {
-							iterateMap(mt, withoutRawData(existingRawFields))
-						}
-						if at, ok := tp.Type.(*dst.ArrayType); ok {
-							iterateArray(at, withoutRawData(existingRawFields))
-						}
-					}
-				}
-			}
-			return true
-		}, nil)
-
-		return true
-	}
-}
-
-// Fixes type name containing underscores in the generated Go files
-func fixUnderscoreInTypeName() dstutil.ApplyFunc {
-	return func(c *dstutil.Cursor) bool {
-		switch x := c.Node().(type) {
-		case *dst.GenDecl:
-			if specs, isType := x.Specs[0].(*dst.TypeSpec); isType {
-				if strings.Contains(specs.Name.Name, "_") {
-					oldName := specs.Name.Name
-					specs.Name.Name = strings.ReplaceAll(specs.Name.Name, "_", "")
-					x.Decs.Start[0] = strings.ReplaceAll(x.Decs.Start[0], oldName, specs.Name.Name)
-				}
-				if st, ok := specs.Type.(*dst.StructType); ok {
-					iterateStruct(st, withoutUnderscore)
-				}
-				if mt, ok := specs.Type.(*dst.MapType); ok {
-					iterateMap(mt, withoutUnderscore)
-				}
-				if at, ok := specs.Type.(*dst.ArrayType); ok {
-					iterateArray(at, withoutUnderscore)
-				}
-			}
-		case *dst.Field:
-			findFieldsWithUnderscores(x)
-		}
-		return true
-	}
-}
-
-func findFieldsWithUnderscores(x *dst.Field) {
-	switch t := x.Type.(type) {
-	case *dst.Ident:
-		withoutUnderscore(t)
-	case *dst.StarExpr:
-		if i, is := t.X.(*dst.Ident); is {
-			withoutUnderscore(i)
-		}
-	case *dst.ArrayType:
-		iterateArray(t, withoutUnderscore)
-	case *dst.MapType:
-		iterateMap(t, withoutUnderscore)
-	}
-}
-
-func withoutUnderscore(i *dst.Ident) {
-	if strings.Contains(i.Name, "_") {
-		i.Name = strings.ReplaceAll(i.Name, "_", "")
-	}
-}
-
-func withoutRawData(existingFields map[string]bool) func(ident *dst.Ident) {
-	return func(i *dst.Ident) {
-		if existingFields[i.Name] {
-			i.Name = setStar(i) + "any"
-		}
-	}
-}
-
-func iterateStruct(s *dst.StructType, fn func(i *dst.Ident)) {
-	for i, f := range s.Fields.List {
-		switch mx := depoint(f.Type).(type) {
-		case *dst.Ident:
-			fn(mx)
-		case *dst.ArrayType:
-			iterateArray(mx, fn)
-		case *dst.MapType:
-			iterateMap(mx, fn)
-		case *dst.StructType:
-			iterateStruct(mx, fn)
-		case *dst.InterfaceType:
-			s.Fields.List[i].Type = interfaceToAny(f.Type)
-		}
-	}
-}
-
-func iterateMap(s *dst.MapType, fn func(i *dst.Ident)) {
-	switch mx := s.Value.(type) {
-	case *dst.Ident:
-		fn(mx)
-	case *dst.ArrayType:
-		iterateArray(mx, fn)
-	case *dst.MapType:
-		iterateMap(mx, fn)
-	case *dst.InterfaceType:
-		s.Value = interfaceToAny(s.Value)
-	}
-}
-
-func iterateArray(a *dst.ArrayType, fn func(i *dst.Ident)) {
-	switch mx := a.Elt.(type) {
-	case *dst.Ident:
-		fn(mx)
-	case *dst.ArrayType:
-		iterateArray(mx, fn)
-	case *dst.StructType:
-		iterateStruct(mx, fn)
-	case *dst.InterfaceType:
-		a.Elt = interfaceToAny(a.Elt)
-	}
-}
-
-func interfaceToAny(i dst.Expr) dst.Expr {
-	star := ""
-	if _, is := i.(*dst.StarExpr); is {
-		star = "*"
-	}
-
-	return &dst.Ident{Name: star + "any"}
-}

pkg/codegen/generators/go_generator.go

@@ -1,193 +0,0 @@
-package generators
-
-import (
-	"bytes"
-	"fmt"
-	"go/parser"
-	"go/token"
-	"path/filepath"
-	"strings"
-
-	"cuelang.org/go/cue"
-	"cuelang.org/go/pkg/encoding/yaml"
-	"github.com/dave/dst/decorator"
-	"github.com/dave/dst/dstutil"
-	"github.com/getkin/kin-openapi/openapi3"
-	"github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen"
-	"golang.org/x/tools/imports"
-)
-
-type GoConfig struct {
-	Config      *OpenApiConfig
-	PackageName string
-	ApplyFuncs  []dstutil.ApplyFunc
-}
-
-func GenerateTypesGo(v cue.Value, cfg *GoConfig) ([]byte, error) {
-	if cfg == nil {
-		return nil, fmt.Errorf("configuration cannot be nil")
-	}
-
-	applyFuncs := []dstutil.ApplyFunc{depointerizer(), fixRawData(), fixUnderscoreInTypeName(), fixTODOComments()}
-	applyFuncs = append(applyFuncs, cfg.ApplyFuncs...)
-
-	f, err := generateOpenAPI(v, cfg.Config)
-	if err != nil {
-		return nil, err
-	}
-
-	str, err := yaml.Marshal(v.Context().BuildFile(f))
-	if err != nil {
-		return nil, fmt.Errorf("cue-yaml marshaling failed: %w", err)
-	}
-
-	loader := openapi3.NewLoader()
-	oT, err := loader.LoadFromData([]byte(str))
-	if err != nil {
-		return nil, fmt.Errorf("loading generated openapi failed: %w", err)
-	}
-
-	schemaName, err := getSchemaName(v)
-	if err != nil {
-		return nil, err
-	}
-
-	if cfg.PackageName == "" {
-		cfg.PackageName = schemaName
-	}
-
-	// Hack to fix https://github.com/grafana/thema/pull/127 issue without importing
-	// to avoid to add the whole vendor in Grafana code
-	if cfg.PackageName == "dataquery" {
-		fixDataQuery(oT)
-	}
-
-	ccfg := codegen.Configuration{
-		PackageName: cfg.PackageName,
-		Compatibility: codegen.CompatibilityOptions{
-			AlwaysPrefixEnumValues: true,
-		},
-		Generate: codegen.GenerateOptions{
-			Models: true,
-		},
-		OutputOptions: codegen.OutputOptions{
-			SkipPrune: true,
-			UserTemplates: map[string]string{
-				"imports.tmpl": importstmpl,
-			},
-		},
-	}
-
-	gostr, err := codegen.Generate(oT, ccfg)
-	if err != nil {
-		return nil, fmt.Errorf("openapi generation failed: %w", err)
-	}
-
-	return postprocessGoFile(genGoFile{
-		path:     fmt.Sprintf("%s_type_gen.go", schemaName),
-		appliers: applyFuncs,
-		in:       []byte(gostr),
-	})
-}
-
-type genGoFile struct {
-	path     string
-	appliers []dstutil.ApplyFunc
-	in       []byte
-}
-
-func postprocessGoFile(cfg genGoFile) ([]byte, error) {
-	fname := sanitizeLabelString(filepath.Base(cfg.path))
-	buf := new(bytes.Buffer)
-	fset := token.NewFileSet()
-	gf, err := decorator.ParseFile(fset, fname, string(cfg.in), parser.ParseComments)
-	if err != nil {
-		return nil, fmt.Errorf("error parsing generated file: %w", err)
-	}
-
-	for _, af := range cfg.appliers {
-		dstutil.Apply(gf, af, nil)
-	}
-
-	err = decorator.Fprint(buf, gf)
-	if err != nil {
-		return nil, fmt.Errorf("error formatting generated file: %w", err)
-	}
-
-	byt, err := imports.Process(fname, buf.Bytes(), nil)
-	if err != nil {
-		return nil, fmt.Errorf("goimports processing of generated file failed: %w", err)
-	}
-
-	// Compare imports before and after; warn about performance if some were added
-	gfa, _ := parser.ParseFile(fset, fname, string(byt), parser.ParseComments)
-	imap := make(map[string]bool)
-	for _, im := range gf.Imports {
-		imap[im.Path.Value] = true
-	}
-	var added []string
-	for _, im := range gfa.Imports {
-		if !imap[im.Path.Value] {
-			added = append(added, im.Path.Value)
-		}
-	}
-
-	if len(added) != 0 {
-		// TODO improve the guidance in this error if/when we better abstract over imports to generate
-		return nil, fmt.Errorf("goimports added the following import statements to %s: \n\t%s\nRelying on goimports to find imports significantly slows down code generation. Either add these imports with an AST manipulation in cfg.ApplyFuncs, or set cfg.IgnoreDiscoveredImports to true", cfg.path, strings.Join(added, "\n\t"))
-	}
-	return byt, nil
-}
-
-// fixDataQuery extends the properties for the AllOf schemas when a DataQuery exists.
-// deep/oapi-codegen library ignores the properties of the models and only ones have references.
-// It doesn't apply this change https://github.com/grafana/thema/pull/154 since it modifies the
-// vendor implementation, and we don't import it.
-func fixDataQuery(spec *openapi3.T) *openapi3.T {
-	for _, sch := range spec.Components.Schemas {
-		if sch.Value != nil && len(sch.Value.AllOf) > 0 {
-			for _, allOf := range sch.Value.AllOf {
-				for n, p := range allOf.Value.Properties {
-					sch.Value.Properties[n] = p
-				}
-			}
-			sch.Value.AllOf = nil
-		}
-	}
-	return spec
-}
-
-// Almost all of the below imports are eliminated by dst transformers and calls
-// to goimports - but if they're not present in the template, then the internal
-// call to goimports that oapi-codegen makes will trigger a search for them,
-// which can slow down codegen by orders of magnitude.
-var importstmpl = `package {{ .PackageName }}
-
-import (
-	"bytes"
-	"compress/gzip"
-	"context"
-	"encoding/base64"
-	"encoding/json"
-	"encoding/xml"
-	"errors"
-	"fmt"
-	"gopkg.in/yaml.v2"
-	"io"
-	"io/ioutil"
-	"os"
-	"net/http"
-	"net/url"
-	"path"
-	"strings"
-	"time"
-
-	"github.com/oapi-codegen/runtime"
-	openapi_types "github.com/oapi-codegen/runtime/types"
-	"github.com/getkin/kin-openapi/openapi3"
-	"github.com/go-chi/chi/v5"
-	"github.com/labstack/echo/v4"
-	"github.com/gin-gonic/gin"
-	"github.com/gorilla/mux"
-)
-`

pkg/codegen/generators/openapi_generator.go

@@ -1,199 +0,0 @@
-package generators
-
-import (
-	"fmt"
-	"strings"
-
-	"cuelang.org/go/cue"
-	"cuelang.org/go/cue/ast"
-	"cuelang.org/go/encoding/openapi"
-)
-
-type OpenApiConfig struct {
-	Config   *openapi.Config
-	IsGroup  bool
-	RootName string
-	SubPath  cue.Path
-}
-
-func generateOpenAPI(v cue.Value, cfg *OpenApiConfig) (*ast.File, error) {
-	if cfg == nil {
-		return nil, fmt.Errorf("missing openapi configuration")
-	}
-
-	if cfg.Config == nil {
-		cfg.Config = &openapi.Config{}
-	}
-
-	name, err := getSchemaName(v)
-	if err != nil {
-		return nil, err
-	}
-
-	gen := &oapiGen{
-		cfg:     cfg,
-		name:    name,
-		val:     v.LookupPath(cue.ParsePath("lineage.schemas[0].schema")),
-		subpath: cfg.SubPath,
-		bpath:   v.LookupPath(cue.ParsePath("lineage.schemas[0]")).Path(),
-	}
-
-	declFunc := genSchema
-	if cfg.IsGroup {
-		declFunc = genGroup
-	}
-
-	decls, err := declFunc(gen)
-
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO recursively sort output to improve stability of output
-	return &ast.File{
-		Decls: []ast.Decl{
-			ast.NewStruct(
-				"openapi", ast.NewString("3.0.0"),
-				"paths", ast.NewStruct(),
-				"components", ast.NewStruct(
-					"schemas", &ast.StructLit{Elts: decls},
-				),
-			),
-		},
-	}, nil
-}
-
-type oapiGen struct {
-	cfg     *OpenApiConfig
-	val     cue.Value
-	subpath cue.Path
-
-	// overall name for the generated oapi doc
-	name string
-
-	// original NameFunc
-	onf func(cue.Value, cue.Path) string
-
-	// full prefix path that leads up to the #SchemaDef, e.g. lin._sortedSchemas[0]
-	bpath cue.Path
-}
-
-func genGroup(gen *oapiGen) ([]ast.Decl, error) {
-	ctx := gen.val.Context()
-	iter, err := gen.val.Fields(cue.Definitions(true), cue.Optional(true))
-	if err != nil {
-		panic(fmt.Errorf("unreachable - should always be able to get iter for struct kinds: %w", err))
-	}
-
-	var decls []ast.Decl
-	for iter.Next() {
-		val, sel := iter.Value(), iter.Selector()
-		name := strings.Trim(sel.String(), "?#")
-
-		v := ctx.CompileString(fmt.Sprintf("#%s: _", name))
-		defpath := cue.MakePath(cue.Def(name))
-		defsch := v.FillPath(defpath, val)
-
-		cfgi := *gen.cfg.Config
-		cfgi.NameFunc = func(val cue.Value, path cue.Path) string {
-			return gen.nfSingle(val, path, defpath, name)
-		}
-
-		part, err := openapi.Generate(defsch, &cfgi)
-		if err != nil {
-			return nil, fmt.Errorf("failed generation for grouped field %s: %w", sel, err)
-		}
-
-		decls = append(decls, getSchemas(part)...)
-	}
-
-	return decls, nil
-}
-
-func genSchema(gen *oapiGen) ([]ast.Decl, error) {
-	hasSubpath := len(gen.cfg.SubPath.Selectors()) > 0
-	name := sanitizeLabelString(gen.name)
-	if gen.cfg.RootName != "" {
-		name = gen.cfg.RootName
-	} else if hasSubpath {
-		sel := gen.cfg.SubPath.Selectors()
-		name = sel[len(sel)-1].String()
-	}
-
-	val := gen.val
-	if hasSubpath {
-		for i, sel := range gen.cfg.SubPath.Selectors() {
-			if !gen.val.Allows(sel) {
-				return nil, fmt.Errorf("subpath %q not present in schema", cue.MakePath(gen.cfg.SubPath.Selectors()[:i+1]...))
-			}
-		}
-		val = val.LookupPath(gen.cfg.SubPath)
-	}
-
-	v := gen.val.Context().CompileString(fmt.Sprintf("#%s: _", name))
-	defpath := cue.MakePath(cue.Def(name))
-	defsch := v.FillPath(defpath, val)
-
-	gen.cfg.Config.NameFunc = func(val cue.Value, path cue.Path) string {
-		return gen.nfSingle(val, path, defpath, name)
-	}
-
-	f, err := openapi.Generate(defsch.Eval(), gen.cfg.Config)
-	if err != nil {
-		return nil, err
-	}
-
-	return getSchemas(f), nil
-}
-
-// For generating a single, our NameFunc must:
-// - Eliminate any path prefixes on the element, both internal lineage and wrapping
-// - Replace the name "_#schema" with the desired name
-// - Call the user-provided NameFunc, if any
-// - Remove CUE markers like #, !, ?
-func (gen *oapiGen) nfSingle(val cue.Value, path, defpath cue.Path, name string) string {
-	tpath := trimPathPrefix(trimThemaPathPrefix(path, gen.bpath), defpath)
-
-	if path.String() == "" || tpath.String() == defpath.String() {
-		return name
-	}
-
-	if val == gen.val {
-		return ""
-	}
-
-	if gen.onf != nil {
-		return gen.onf(val, tpath)
-	}
-	return strings.Trim(tpath.String(), "?#")
-}
-
-func getSchemas(f *ast.File) []ast.Decl {
-	compos := orp(getFieldByLabel(f, "components"))
-	schemas := orp(getFieldByLabel(compos.Value, "schemas"))
-	return schemas.Value.(*ast.StructLit).Elts
-}
-
-func orp[T any](t T, err error) T {
-	if err != nil {
-		panic(err)
-	}
-	return t
-}
-
-func trimThemaPathPrefix(p, base cue.Path) cue.Path {
-	if !pathHasPrefix(p, base) {
-		return p
-	}
-
-	rest := p.Selectors()[len(base.Selectors()):]
-	if len(rest) == 0 {
-		return cue.Path{}
-	}
-	switch rest[0].String() {
-	case "schema", "_#schema", "_join", "joinSchema":
-		return cue.MakePath(rest[1:]...)
-	default:
-		return cue.MakePath(rest...)
-	}
-}

pkg/codegen/generators/utils.go

@@ -1,130 +0,0 @@
-package generators
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	"cuelang.org/go/cue"
-	"cuelang.org/go/cue/ast"
-	"cuelang.org/go/cue/token"
-)
-
-// sanitizeLabelString strips characters from a string that are not allowed for
-// use in a CUE label.
-func sanitizeLabelString(s string) string {
-	return strings.Map(func(r rune) rune {
-		switch {
-		case r >= 'a' && r <= 'z':
-			fallthrough
-		case r >= 'A' && r <= 'Z':
-			fallthrough
-		case r >= '0' && r <= '9':
-			fallthrough
-		case r == '_':
-			return r
-		default:
-			return -1
-		}
-	}, s)
-}
-
-// trimPathPrefix strips the provided prefix from the provided path, if the
-// prefix exists.
-//
-// If path and prefix are equivalent, and there is at least one additional
-// selector in the provided path.
-func trimPathPrefix(path, prefix cue.Path) cue.Path {
-	sels, psels := path.Selectors(), prefix.Selectors()
-	if len(sels) == 1 {
-		return path
-	}
-	var i int
-	for ; i < len(psels) && i < len(sels); i++ {
-		if !selEq(psels[i], sels[i]) {
-			break
-		}
-	}
-	return cue.MakePath(sels[i:]...)
-}
-
-// selEq indicates whether two selectors are equivalent. Selectors are equivalent if
-// they are either exactly equal, or if they are equal ignoring path optionality.
-func selEq(s1, s2 cue.Selector) bool {
-	return s1 == s2 || s1.Optional() == s2.Optional()
-}
-
-// getFieldByLabel returns the ast.Field with a given label from a struct-ish input.
-func getFieldByLabel(n ast.Node, label string) (*ast.Field, error) {
-	var d []ast.Decl
-	switch x := n.(type) {
-	case *ast.File:
-		d = x.Decls
-	case *ast.StructLit:
-		d = x.Elts
-	default:
-		return nil, fmt.Errorf("not an *ast.File or *ast.StructLit")
-	}
-
-	for _, el := range d {
-		if isFieldWithLabel(el, label) {
-			return el.(*ast.Field), nil
-		}
-	}
-
-	return nil, fmt.Errorf("no field with label %q", label)
-}
-
-func isFieldWithLabel(n ast.Node, label string) bool {
-	if x, is := n.(*ast.Field); is {
-		if l, is := x.Label.(*ast.BasicLit); is {
-			return strEq(l, label)
-		}
-		if l, is := x.Label.(*ast.Ident); is {
-			return identStrEq(l, label)
-		}
-	}
-	return false
-}
-
-func strEq(lit *ast.BasicLit, str string) bool {
-	if lit.Kind != token.STRING {
-		return false
-	}
-	ls, _ := strconv.Unquote(lit.Value)
-	return str == ls || str == lit.Value
-}
-
-func identStrEq(id *ast.Ident, str string) bool {
-	if str == id.Name {
-		return true
-	}
-	ls, _ := strconv.Unquote(id.Name)
-	return str == ls
-}
-
-// pathHasPrefix tests whether the [cue.Path] p begins with prefix.
-func pathHasPrefix(p, prefix cue.Path) bool {
-	ps, pres := p.Selectors(), prefix.Selectors()
-	if len(pres) > len(ps) {
-		return false
-	}
-	return pathsAreEq(ps[:len(pres)], pres)
-}
-
-func pathsAreEq(p1s, p2s []cue.Selector) bool {
-	if len(p1s) != len(p2s) {
-		return false
-	}
-	for i := 0; i < len(p2s); i++ {
-		if !selEq(p2s[i], p1s[i]) {
-			return false
-		}
-	}
-	return true
-}
-
-func getSchemaName(v cue.Value) (string, error) {
-	nameValue := v.LookupPath(cue.ParsePath("name"))
-	return nameValue.String()
-}

pkg/codegen/go.mod

@@ -5,21 +5,19 @@ go 1.23.1
 require (
 	cuelang.org/go v0.11.1
 	github.com/dave/dst v0.27.3
-	github.com/getkin/kin-openapi v0.128.0
 	github.com/grafana/codejen v0.0.4-0.20230321061741-77f656893a3d
+	github.com/grafana/cog v0.0.12
 	github.com/grafana/cuetsy v0.1.11
 	github.com/matryer/is v1.4.1
-	github.com/oapi-codegen/oapi-codegen/v2 v2.4.1
-	golang.org/x/tools v0.29.0
 )
 
 require (
 	github.com/cockroachdb/apd/v2 v2.0.2 // indirect
 	github.com/dave/jennifer v1.6.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
 	github.com/emicklei/proto v1.13.2 // indirect
-	github.com/fsnotify/fsnotify v1.8.0 // indirect
+	github.com/expr-lang/expr v1.16.9 // indirect
+	github.com/getkin/kin-openapi v0.128.0 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/golang/glog v1.2.2 // indirect
@@ -27,29 +25,28 @@ require (
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/invopop/yaml v0.3.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/lib/pq v1.10.9 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect
-	github.com/onsi/ginkgo v1.16.5 // indirect
-	github.com/onsi/gomega v1.35.1 // indirect
 	github.com/perimeterx/marshmallow v1.1.5 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/protocolbuffers/txtpbfmt v0.0.0-20241112170944-20d2c9ebc01d // indirect
-	github.com/rogpeppe/go-internal v1.13.1 // indirect
+	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
-	github.com/speakeasy-api/openapi-overlay v0.9.0 // indirect
-	github.com/stretchr/testify v1.10.0 // indirect
-	github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
+	github.com/yalue/merged_fs v1.3.0 // indirect
 	golang.org/x/mod v0.22.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/tools v0.29.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 

pkg/codegen/go.sum

@@ -1,6 +1,3 @@
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E=
 github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -12,48 +9,30 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960/go.mod h1:9HQzr9D/0PGwMEbC3d5AB7oi67+h4TsQqItC1GVYG58=
-github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 h1:PRxIJD8XjimM5aTknUK9w6DHLDox2r2M3DI4i2pnd3w=
-github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936/go.mod h1:ttYvX5qlB+mlV1okblJqcSMtR4c52UKxDiX9GRBS8+Q=
 github.com/emicklei/proto v1.13.2 h1:z/etSFO3uyXeuEsVPzfl56WNgzcvIr42aQazXaQmFZY=
 github.com/emicklei/proto v1.13.2/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
-github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/expr-lang/expr v1.16.9 h1:WUAzmR0JNI9JCiF0/ewwHB1gmcGw5wW7nWt8gc6PpCI=
+github.com/expr-lang/expr v1.16.9/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
 github.com/getkin/kin-openapi v0.128.0 h1:jqq3D9vC9pPq1dGcOCv7yOp1DaEe7c/T1vzcLbITSp4=
 github.com/getkin/kin-openapi v0.128.0/go.mod h1:OZrfXzUfGrNbsKj+xmFBx6E5c6yH3At/tAKSc2UszXM=
 github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
 github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
 github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
 github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
-github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
 github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.2.2 h1:1+mZ9upx1Dh6FmUTFR1naJ77miKiXgALjWOZ3NVFPmY=
 github.com/golang/glog v1.2.2/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/grafana/codejen v0.0.4-0.20230321061741-77f656893a3d h1:hrXbGJ5jgp6yNITzs5o+zXq0V5yT3siNJ+uM8LGwWKk=
 github.com/grafana/codejen v0.0.4-0.20230321061741-77f656893a3d/go.mod h1:zmwwM/DRyQB7pfuBjTWII3CWtxcXh8LTwAYGfDfpR6s=
+github.com/grafana/cog v0.0.12 h1:MJfFUVzp0El3+zZCmUQ2Y8uzwvM3aa5zj7EOeeuG6VY=
+github.com/grafana/cog v0.0.12/go.mod h1:HwJbc60fZ+viayROClLGdDwO5w/JjBOpO9wjGnAfMLc=
 github.com/grafana/cue v0.0.0-20230926092038-971951014e3f h1:TmYAMnqg3d5KYEAaT6PtTguL2GjLfvr6wnAX8Azw6tQ=
 github.com/grafana/cue v0.0.0-20230926092038-971951014e3f/go.mod h1:okjJBHFQFer+a41sAe2SaGm1glWS8oEb6CmJvn5Zdws=
 github.com/grafana/cuetsy v0.1.11 h1:I3IwBhF+UaQxRM79HnImtrAn8REGdb5M3+C4QrYHoWk=
@@ -63,8 +42,8 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI=
+github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/invopop/yaml v0.3.1 h1:f0+ZpmhfBSS4MhG+4HYseMdJhoeeopbSKbq5Rpeelso=
 github.com/invopop/yaml v0.3.1/go.mod h1:PMOp3nn4/12yEZUFfmOuNHJsZToEEOwoWsT+D81KkeA=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
@@ -90,25 +69,6 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de h1:D5x39vF5KCwKQaw+OC9ZPiLVHXz3UFw2+psEX+gYcto=
 github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de/go.mod h1:kJun4WP5gFuHZgRjZUWWuH1DTxCtxbHDOIJsudS8jzY=
-github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
-github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
-github.com/oapi-codegen/oapi-codegen/v2 v2.4.1 h1:ykgG34472DWey7TSjd8vIfNykXgjOgYJZoQbKfEeY/Q=
-github.com/oapi-codegen/oapi-codegen/v2 v2.4.1/go.mod h1:N5+lY1tiTDV3V1BeHtOxeWXHoPVeApvsvjJqegfoaz8=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
-github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
-github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
-github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
-github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
-github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
-github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
 github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
 github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -121,98 +81,38 @@ github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b h1:zd/2RN
 github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b/go.mod h1:KjY0wibdYKc4DYkerHSbguaf3JeIPGhNJBp2BNiFH78=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4=
+github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
-github.com/speakeasy-api/openapi-overlay v0.9.0 h1:Wrz6NO02cNlLzx1fB093lBlYxSI54VRhy1aSutx0PQg=
-github.com/speakeasy-api/openapi-overlay v0.9.0/go.mod h1:f5FloQrHA7MsxYg9djzMD5h6dxrHjVVByWKh7an8TRc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
 github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/vmware-labs/yaml-jsonpath v0.3.2 h1:/5QKeCBGdsInyDCyVNLbXyilb61MXGi9NP674f9Hobk=
-github.com/vmware-labs/yaml-jsonpath v0.3.2/go.mod h1:U6whw1z03QyqgWdgXxvVnQ90zN1BWz5V+51Ewf8k+rQ=
 github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
 github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+github.com/yalue/merged_fs v1.3.0 h1:qCeh9tMPNy/i8cwDsQTJ5bLr6IRxbs6meakNE5O+wyY=
+github.com/yalue/merged_fs v1.3.0/go.mod h1:WqqchfVYQyclV2tnR7wtRhBddzBvLVR83Cjw9BKQw0M=
 golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
 golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
 golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
 golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/codegen/jenny_go_spec.go

@@ -1,13 +1,14 @@
 package codegen
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
 	"cuelang.org/go/cue"
 	"github.com/dave/dst/dstutil"
 	"github.com/grafana/codejen"
-	"github.com/grafana/grafana/pkg/codegen/generators"
+	"github.com/grafana/cog"
 )
 
 type GoSpecJenny struct {
@@ -20,25 +21,20 @@ func (jenny *GoSpecJenny) JennyName() string {
 
 func (jenny *GoSpecJenny) Generate(sfg ...SchemaForGen) (codejen.Files, error) {
 	files := make(codejen.Files, len(sfg))
+
 	for i, v := range sfg {
 		packageName := strings.ToLower(v.Name)
-		b, err := generators.GenerateTypesGo(v.CueFile,
-			&generators.GoConfig{
-				Config: &generators.OpenApiConfig{
-					IsGroup:  false,
-					RootName: "Spec",
-					SubPath:  cue.MakePath(cue.Str("spec")),
-				},
-				PackageName: packageName,
-				ApplyFuncs:  append(jenny.ApplyFuncs, PrefixDropper(v.Name)),
-			},
-		)
+		cueValue := v.CueFile.LookupPath(cue.ParsePath("lineage.schemas[0].schema.spec"))
 
+		b, err := cog.TypesFromSchema().
+			CUEValue(packageName, cueValue, cog.ForceEnvelope("Spec")).
+			Golang(cog.GoConfig{}).
+			Run(context.Background())
 		if err != nil {
 			return nil, err
 		}
 
-		files[i] = *codejen.NewFile(fmt.Sprintf("pkg/kinds/%s/%s_spec_gen.go", packageName, packageName), b, jenny)
+		files[i] = *codejen.NewFile(fmt.Sprintf("pkg/kinds/%s/%s_spec_gen.go", packageName, packageName), b[0].Data, jenny)
 	}
 
 	return files, nil