From ec552dd6b8f8b55b89548df74c4efbd09fb0a490 Mon Sep 17 00:00:00 2001 From: sam boyer Date: Thu, 1 Dec 2022 07:36:36 -0500 Subject: [PATCH] kindsys: Fix loading on windows (backport of #59519 to v9.3.x) (#59520) kindsys: Fix loading on windows (#59519) (cherry picked from commit ce0bdb2cd9bd2f1e3fd7a1830531aba9babe80df) --- pkg/kindsys/load.go | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/pkg/kindsys/load.go b/pkg/kindsys/load.go index 08e4b857435..81bf9073c9f 100644 --- a/pkg/kindsys/load.go +++ b/pkg/kindsys/load.go @@ -8,10 +8,8 @@ import ( "cuelang.org/go/cue" "cuelang.org/go/cue/errors" - "github.com/grafana/grafana" "github.com/grafana/grafana/pkg/cuectx" "github.com/grafana/thema" - tload "github.com/grafana/thema/load" ) // CoreStructuredDeclParentPath is the path, relative to the repository root, where @@ -48,28 +46,14 @@ func loadpFrameworkOnce() { }) } -var prefix = filepath.Join("/pkg", "kindsys") - func doLoadFrameworkCUE(ctx *cue.Context) (cue.Value, error) { - var v cue.Value - var err error - - absolutePath := prefix - if !filepath.IsAbs(absolutePath) { - absolutePath, err = filepath.Abs(absolutePath) - if err != nil { - return v, err - } - } - - bi, err := tload.InstancesWithThema(grafana.CueSchemaFS, absolutePath) + v, err := cuectx.BuildGrafanaInstance(ctx, filepath.Join("pkg", "kindsys"), "kindsys", nil) if err != nil { return v, err } - v = ctx.BuildInstance(bi) if err = v.Validate(cue.Concrete(false), cue.All()); err != nil { - return cue.Value{}, fmt.Errorf("coremodel framework loaded cue.Value has err: %w", err) + return cue.Value{}, fmt.Errorf("kindsys framework loaded cue.Value has err: %w", err) } return v, nil