Go: Use variants package for cogvariants.

[spinillos]

Fixes https://github.com/grafana/grafana-foundation-sdk/issues/190

We were using cogvariants instead of variants because the sanitiser removes all invalid characters of the aliases. When we add a variant we need to pass the cog/variants package and it's why this result.

The change is assuming that all packages fit with the directory name. The only exception that we had was cogvariants, so it should work for all of the cases.

[github-actions[bot]]

Note: in addition to the changes introduced by this PR, the diff includes unreleased changes living in main.

### 🔎 Changes to `grafana-foundation-sdk@next+cog-v0.0.x`

```patch diff --git a/go/alerting/query_builder_gen.go b/go/alerting/query_builder_gen.go index e2d3513..ac88ed7 100644 --- a/go/alerting/query_builder_gen.go +++ b/go/alerting/query_builder_gen.go @@ -4,7 +4,7 @@ package alerting import ( cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) var _ cog.Builder[Query] = (*QueryBuilder)(nil) @@ -47,7 +47,7 @@ func (builder *QueryBuilder) DatasourceUid(datasourceUid string) *QueryBuilder { return builder } -func (builder *QueryBuilder) Model(model cog.Builder[cogvariants.Dataquery]) *QueryBuilder { +func (builder *QueryBuilder) Model(model cog.Builder[variants.Dataquery]) *QueryBuilder { modelResource, err := model.Build() if err != nil { builder.errors["model"] = err.(cog.BuildErrors) diff --git a/go/alerting/types_gen.go b/go/alerting/types_gen.go index f1b30cd..e4205d0 100644 --- a/go/alerting/types_gen.go +++ b/go/alerting/types_gen.go @@ -7,15 +7,15 @@ import ( "time" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) type Query struct { - DatasourceUid *string `json:"datasourceUid,omitempty"` - Model cogvariants.Dataquery `json:"model,omitempty"` - QueryType *string `json:"queryType,omitempty"` - RefId *string `json:"refId,omitempty"` - RelativeTimeRange *RelativeTimeRange `json:"relativeTimeRange,omitempty"` + DatasourceUid *string `json:"datasourceUid,omitempty"` + Model variants.Dataquery `json:"model,omitempty"` + QueryType *string `json:"queryType,omitempty"` + RefId *string `json:"refId,omitempty"` + RelativeTimeRange *RelativeTimeRange `json:"relativeTimeRange,omitempty"` } func (resource *Query) UnmarshalJSON(raw []byte) error { diff --git a/go/annotationslist/panel_builder_gen.go b/go/annotationslist/panel_builder_gen.go index 2881eb1..bf44f7d 100644 --- a/go/annotationslist/panel_builder_gen.go +++ b/go/annotationslist/panel_builder_gen.go @@ -6,7 +6,7 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" dashboard "github.com/grafana/grafana-foundation-sdk/go/dashboard" ) @@ -53,8 +53,8 @@ func (builder *PanelBuilder) Id(id uint32) *PanelBuilder { } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery]) *PanelBuilder { - targetsResources := make([]cogvariants.Dataquery, 0, len(targets)) +func (builder *PanelBuilder) Targets(targets []cog.Builder[variants.Dataquery]) *PanelBuilder { + targetsResources := make([]variants.Dataquery, 0, len(targets)) for _, r1 := range targets { targetsDepth1, err := r1.Build() if err != nil { @@ -69,7 +69,7 @@ func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) WithTarget(targets cog.Builder[cogvariants.Dataquery]) *PanelBuilder { +func (builder *PanelBuilder) WithTarget(targets cog.Builder[variants.Dataquery]) *PanelBuilder { targetsResource, err := targets.Build() if err != nil { builder.errors["targets"] = err.(cog.BuildErrors) diff --git a/go/annotationslist/types_gen.go b/go/annotationslist/types_gen.go index c55d672..bb5cb53 100644 --- a/go/annotationslist/types_gen.go +++ b/go/annotationslist/types_gen.go @@ -5,7 +5,7 @@ package annotationslist import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) type Options struct { @@ -21,8 +21,8 @@ type Options struct { NavigateAfter string `json:"navigateAfter"` } -func VariantConfig() cogvariants.PanelcfgConfig { - return cogvariants.PanelcfgConfig{ +func VariantConfig() variants.PanelcfgConfig { + return variants.PanelcfgConfig{ Identifier: "annolist", OptionsUnmarshaler: func(raw []byte) (any, error) { options := Options{} diff --git a/go/azuremonitor/azuremonitorquery_builder_gen.go b/go/azuremonitor/azuremonitorquery_builder_gen.go index 5a912ac..98dfacc 100644 --- a/go/azuremonitor/azuremonitorquery_builder_gen.go +++ b/go/azuremonitor/azuremonitorquery_builder_gen.go @@ -4,10 +4,10 @@ package azuremonitor import ( cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) -var _ cog.Builder[cogvariants.Dataquery] = (*AzureMonitorQueryBuilder)(nil) +var _ cog.Builder[variants.Dataquery] = (*AzureMonitorQueryBuilder)(nil) type AzureMonitorQueryBuilder struct { internal *AzureMonitorQuery @@ -26,7 +26,7 @@ func NewAzureMonitorQueryBuilder() *AzureMonitorQueryBuilder { return builder } -func (builder *AzureMonitorQueryBuilder) Build() (cogvariants.Dataquery, error) { +func (builder *AzureMonitorQueryBuilder) Build() (variants.Dataquery, error) { var errs cog.BuildErrors for _, err := range builder.errors { diff --git a/go/azuremonitor/types_gen.go b/go/azuremonitor/types_gen.go index d795d9b..8de4bf8 100644 --- a/go/azuremonitor/types_gen.go +++ b/go/azuremonitor/types_gen.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) type AzureMonitorQuery struct { @@ -50,10 +50,10 @@ type AzureMonitorQuery struct { func (resource AzureMonitorQuery) ImplementsDataqueryVariant() {} -func VariantConfig() cogvariants.DataqueryConfig { - return cogvariants.DataqueryConfig{ +func VariantConfig() variants.DataqueryConfig { + return variants.DataqueryConfig{ Identifier: "grafana-azure-monitor-datasource", - DataqueryUnmarshaler: func(raw []byte) (cogvariants.Dataquery, error) { + DataqueryUnmarshaler: func(raw []byte) (variants.Dataquery, error) { dataquery := AzureMonitorQuery{} if err := json.Unmarshal(raw, &dataquery); err != nil { diff --git a/go/barchart/panel_builder_gen.go b/go/barchart/panel_builder_gen.go index 75164a3..5353b53 100644 --- a/go/barchart/panel_builder_gen.go +++ b/go/barchart/panel_builder_gen.go @@ -6,7 +6,7 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" dashboard "github.com/grafana/grafana-foundation-sdk/go/dashboard" ) @@ -54,8 +54,8 @@ func (builder *PanelBuilder) Id(id uint32) *PanelBuilder { } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery]) *PanelBuilder { - targetsResources := make([]cogvariants.Dataquery, 0, len(targets)) +func (builder *PanelBuilder) Targets(targets []cog.Builder[variants.Dataquery]) *PanelBuilder { + targetsResources := make([]variants.Dataquery, 0, len(targets)) for _, r1 := range targets { targetsDepth1, err := r1.Build() if err != nil { @@ -70,7 +70,7 @@ func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) WithTarget(targets cog.Builder[cogvariants.Dataquery]) *PanelBuilder { +func (builder *PanelBuilder) WithTarget(targets cog.Builder[variants.Dataquery]) *PanelBuilder { targetsResource, err := targets.Build() if err != nil { builder.errors["targets"] = err.(cog.BuildErrors) diff --git a/go/barchart/types_gen.go b/go/barchart/types_gen.go index 6c1970c..02315f2 100644 --- a/go/barchart/types_gen.go +++ b/go/barchart/types_gen.go @@ -5,7 +5,7 @@ package barchart import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" ) @@ -64,8 +64,8 @@ type FieldConfig struct { AxisBorderShow *bool `json:"axisBorderShow,omitempty"` } -func VariantConfig() cogvariants.PanelcfgConfig { - return cogvariants.PanelcfgConfig{ +func VariantConfig() variants.PanelcfgConfig { + return variants.PanelcfgConfig{ Identifier: "barchart", OptionsUnmarshaler: func(raw []byte) (any, error) { options := Options{} diff --git a/go/bargauge/panel_builder_gen.go b/go/bargauge/panel_builder_gen.go index eb2f169..10ee5aa 100644 --- a/go/bargauge/panel_builder_gen.go +++ b/go/bargauge/panel_builder_gen.go @@ -6,7 +6,7 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" dashboard "github.com/grafana/grafana-foundation-sdk/go/dashboard" ) @@ -54,8 +54,8 @@ func (builder *PanelBuilder) Id(id uint32) *PanelBuilder { } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery]) *PanelBuilder { - targetsResources := make([]cogvariants.Dataquery, 0, len(targets)) +func (builder *PanelBuilder) Targets(targets []cog.Builder[variants.Dataquery]) *PanelBuilder { + targetsResources := make([]variants.Dataquery, 0, len(targets)) for _, r1 := range targets { targetsDepth1, err := r1.Build() if err != nil { @@ -70,7 +70,7 @@ func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) WithTarget(targets cog.Builder[cogvariants.Dataquery]) *PanelBuilder { +func (builder *PanelBuilder) WithTarget(targets cog.Builder[variants.Dataquery]) *PanelBuilder { targetsResource, err := targets.Build() if err != nil { builder.errors["targets"] = err.(cog.BuildErrors) diff --git a/go/bargauge/types_gen.go b/go/bargauge/types_gen.go index 2ab483a..cb37a70 100644 --- a/go/bargauge/types_gen.go +++ b/go/bargauge/types_gen.go @@ -5,7 +5,7 @@ package bargauge import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" ) @@ -23,8 +23,8 @@ type Options struct { Orientation common.VizOrientation `json:"orientation"` } -func VariantConfig() cogvariants.PanelcfgConfig { - return cogvariants.PanelcfgConfig{ +func VariantConfig() variants.PanelcfgConfig { + return variants.PanelcfgConfig{ Identifier: "bargauge", OptionsUnmarshaler: func(raw []byte) (any, error) { options := Options{} diff --git a/go/candlestick/panel_builder_gen.go b/go/candlestick/panel_builder_gen.go index 608ab63..07a87f5 100644 --- a/go/candlestick/panel_builder_gen.go +++ b/go/candlestick/panel_builder_gen.go @@ -6,7 +6,7 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" dashboard "github.com/grafana/grafana-foundation-sdk/go/dashboard" ) @@ -54,8 +54,8 @@ func (builder *PanelBuilder) Id(id uint32) *PanelBuilder { } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery]) *PanelBuilder { - targetsResources := make([]cogvariants.Dataquery, 0, len(targets)) +func (builder *PanelBuilder) Targets(targets []cog.Builder[variants.Dataquery]) *PanelBuilder { + targetsResources := make([]variants.Dataquery, 0, len(targets)) for _, r1 := range targets { targetsDepth1, err := r1.Build() if err != nil { @@ -70,7 +70,7 @@ func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) WithTarget(targets cog.Builder[cogvariants.Dataquery]) *PanelBuilder { +func (builder *PanelBuilder) WithTarget(targets cog.Builder[variants.Dataquery]) *PanelBuilder { targetsResource, err := targets.Build() if err != nil { builder.errors["targets"] = err.(cog.BuildErrors) diff --git a/go/candlestick/types_gen.go b/go/candlestick/types_gen.go index 0b9ef70..de5c9a0 100644 --- a/go/candlestick/types_gen.go +++ b/go/candlestick/types_gen.go @@ -5,7 +5,7 @@ package candlestick import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" ) @@ -69,8 +69,8 @@ type Options struct { type FieldConfig = common.GraphFieldConfig -func VariantConfig() cogvariants.PanelcfgConfig { - return cogvariants.PanelcfgConfig{ +func VariantConfig() variants.PanelcfgConfig { + return variants.PanelcfgConfig{ Identifier: "candlestick", OptionsUnmarshaler: func(raw []byte) (any, error) { options := Options{} diff --git a/go/canvas/panel_builder_gen.go b/go/canvas/panel_builder_gen.go index 6abb2dd..b682b59 100644 --- a/go/canvas/panel_builder_gen.go +++ b/go/canvas/panel_builder_gen.go @@ -6,7 +6,7 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" dashboard "github.com/grafana/grafana-foundation-sdk/go/dashboard" ) @@ -53,8 +53,8 @@ func (builder *PanelBuilder) Id(id uint32) *PanelBuilder { } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery]) *PanelBuilder { - targetsResources := make([]cogvariants.Dataquery, 0, len(targets)) +func (builder *PanelBuilder) Targets(targets []cog.Builder[variants.Dataquery]) *PanelBuilder { + targetsResources := make([]variants.Dataquery, 0, len(targets)) for _, r1 := range targets { targetsDepth1, err := r1.Build() if err != nil { @@ -69,7 +69,7 @@ func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) WithTarget(targets cog.Builder[cogvariants.Dataquery]) *PanelBuilder { +func (builder *PanelBuilder) WithTarget(targets cog.Builder[variants.Dataquery]) *PanelBuilder { targetsResource, err := targets.Build() if err != nil { builder.errors["targets"] = err.(cog.BuildErrors) diff --git a/go/canvas/types_gen.go b/go/canvas/types_gen.go index eff09b3..62f0716 100644 --- a/go/canvas/types_gen.go +++ b/go/canvas/types_gen.go @@ -5,7 +5,7 @@ package canvas import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" ) @@ -101,13 +101,12 @@ type CanvasElementOptions struct { Name string `json:"name"` Type string `json:"type"` // TODO: figure out how to define this (element config(s)) - Config any `json:"config,omitempty"` - Constraint *Constraint `json:"constraint,omitempty"` - Placement *Placement `json:"placement,omitempty"` - Background *BackgroundConfig `json:"background,omitempty"` - Border *LineConfig `json:"border,omitempty"` - Connections []CanvasConnection `json:"connections,omitempty"` - OneClickLinks *bool `json:"oneClickLinks,omitempty"` + Config any `json:"config,omitempty"` + Constraint *Constraint `json:"constraint,omitempty"` + Placement *Placement `json:"placement,omitempty"` + Background *BackgroundConfig `json:"background,omitempty"` + Border *LineConfig `json:"border,omitempty"` + Connections []CanvasConnection `json:"connections,omitempty"` } type Options struct { @@ -131,8 +130,8 @@ type Options struct { } `json:"root"` } -func VariantConfig() cogvariants.PanelcfgConfig { - return cogvariants.PanelcfgConfig{ +func VariantConfig() variants.PanelcfgConfig { + return variants.PanelcfgConfig{ Identifier: "canvas", OptionsUnmarshaler: func(raw []byte) (any, error) { options := Options{} diff --git a/go/cloudwatch/cloudwatchannotationquery_builder_gen.go b/go/cloudwatch/cloudwatchannotationquery_builder_gen.go index f721af1..90eef3a 100644 --- a/go/cloudwatch/cloudwatchannotationquery_builder_gen.go +++ b/go/cloudwatch/cloudwatchannotationquery_builder_gen.go @@ -4,10 +4,10 @@ package cloudwatch import ( cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) -var _ cog.Builder[cogvariants.Dataquery] = (*CloudWatchAnnotationQueryBuilder)(nil) +var _ cog.Builder[variants.Dataquery] = (*CloudWatchAnnotationQueryBuilder)(nil) // Shape of a CloudWatch Annotation query // TS type is CloudWatchDefaultQuery = Omit & CloudWatchMetricsQuery, declared in veneer @@ -29,7 +29,7 @@ func NewCloudWatchAnnotationQueryBuilder() *CloudWatchAnnotationQueryBuilder { return builder } -func (builder *CloudWatchAnnotationQueryBuilder) Build() (cogvariants.Dataquery, error) { +func (builder *CloudWatchAnnotationQueryBuilder) Build() (variants.Dataquery, error) { var errs cog.BuildErrors for _, err := range builder.errors { diff --git a/go/cloudwatch/cloudwatchlogsquery_builder_gen.go b/go/cloudwatch/cloudwatchlogsquery_builder_gen.go index 0f6b73f..674fe6f 100644 --- a/go/cloudwatch/cloudwatchlogsquery_builder_gen.go +++ b/go/cloudwatch/cloudwatchlogsquery_builder_gen.go @@ -4,10 +4,10 @@ package cloudwatch import ( cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) -var _ cog.Builder[cogvariants.Dataquery] = (*CloudWatchLogsQueryBuilder)(nil) +var _ cog.Builder[variants.Dataquery] = (*CloudWatchLogsQueryBuilder)(nil) // Shape of a CloudWatch Logs query type CloudWatchLogsQueryBuilder struct { @@ -27,7 +27,7 @@ func NewCloudWatchLogsQueryBuilder() *CloudWatchLogsQueryBuilder { return builder } -func (builder *CloudWatchLogsQueryBuilder) Build() (cogvariants.Dataquery, error) { +func (builder *CloudWatchLogsQueryBuilder) Build() (variants.Dataquery, error) { var errs cog.BuildErrors for _, err := range builder.errors { diff --git a/go/cloudwatch/cloudwatchmetricsquery_builder_gen.go b/go/cloudwatch/cloudwatchmetricsquery_builder_gen.go index 6d679fb..2d8a264 100644 --- a/go/cloudwatch/cloudwatchmetricsquery_builder_gen.go +++ b/go/cloudwatch/cloudwatchmetricsquery_builder_gen.go @@ -4,10 +4,10 @@ package cloudwatch import ( cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) -var _ cog.Builder[cogvariants.Dataquery] = (*CloudWatchMetricsQueryBuilder)(nil) +var _ cog.Builder[variants.Dataquery] = (*CloudWatchMetricsQueryBuilder)(nil) // Shape of a CloudWatch Metrics query type CloudWatchMetricsQueryBuilder struct { @@ -27,7 +27,7 @@ func NewCloudWatchMetricsQueryBuilder() *CloudWatchMetricsQueryBuilder { return builder } -func (builder *CloudWatchMetricsQueryBuilder) Build() (cogvariants.Dataquery, error) { +func (builder *CloudWatchMetricsQueryBuilder) Build() (variants.Dataquery, error) { var errs cog.BuildErrors for _, err := range builder.errors { diff --git a/go/cloudwatch/types_gen.go b/go/cloudwatch/types_gen.go index 9fdb9ad..eeec289 100644 --- a/go/cloudwatch/types_gen.go +++ b/go/cloudwatch/types_gen.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) type MetricStat struct { @@ -300,10 +300,10 @@ type CloudWatchQuery = CloudWatchMetricsQueryOrCloudWatchLogsQueryOrCloudWatchAn func (resource CloudWatchQuery) ImplementsDataqueryVariant() {} -func VariantConfig() cogvariants.DataqueryConfig { - return cogvariants.DataqueryConfig{ +func VariantConfig() variants.DataqueryConfig { + return variants.DataqueryConfig{ Identifier: "cloudwatch", - DataqueryUnmarshaler: func(raw []byte) (cogvariants.Dataquery, error) { + DataqueryUnmarshaler: func(raw []byte) (variants.Dataquery, error) { dataquery := CloudWatchQuery{} if err := json.Unmarshal(raw, &dataquery); err != nil { diff --git a/go/cog/runtime.go b/go/cog/runtime.go index 05e4d04..fa957cf 100644 --- a/go/cog/runtime.go +++ b/go/cog/runtime.go @@ -5,14 +5,14 @@ package cog import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) var runtimeInstance *Runtime type Runtime struct { - panelcfgVariants map[string]cogvariants.PanelcfgConfig - dataqueryVariants map[string]cogvariants.DataqueryConfig + panelcfgVariants map[string]variants.PanelcfgConfig + dataqueryVariants map[string]variants.DataqueryConfig } func NewRuntime() *Runtime { @@ -21,34 +21,34 @@ func NewRuntime() *Runtime { } runtimeInstance = &Runtime{ - panelcfgVariants: make(map[string]cogvariants.PanelcfgConfig), - dataqueryVariants: make(map[string]cogvariants.DataqueryConfig), + panelcfgVariants: make(map[string]variants.PanelcfgConfig), + dataqueryVariants: make(map[string]variants.DataqueryConfig), } return runtimeInstance } -func (runtime *Runtime) RegisterPanelcfgVariant(config cogvariants.PanelcfgConfig) { +func (runtime *Runtime) RegisterPanelcfgVariant(config variants.PanelcfgConfig) { runtime.panelcfgVariants[config.Identifier] = config } -func (runtime *Runtime) ConfigForPanelcfgVariant(identifier string) (cogvariants.PanelcfgConfig, bool) { +func (runtime *Runtime) ConfigForPanelcfgVariant(identifier string) (variants.PanelcfgConfig, bool) { config, found := runtime.panelcfgVariants[identifier] return config, found } -func (runtime *Runtime) RegisterDataqueryVariant(config cogvariants.DataqueryConfig) { +func (runtime *Runtime) RegisterDataqueryVariant(config variants.DataqueryConfig) { runtime.dataqueryVariants[config.Identifier] = config } -func (runtime *Runtime) UnmarshalDataqueryArray(raw []byte, dataqueryTypeHint string) ([]cogvariants.Dataquery, error) { +func (runtime *Runtime) UnmarshalDataqueryArray(raw []byte, dataqueryTypeHint string) ([]variants.Dataquery, error) { rawDataqueries := []json.RawMessage{} if err := json.Unmarshal(raw, &rawDataqueries); err != nil { return nil, err } - dataqueries := make([]cogvariants.Dataquery, 0, len(rawDataqueries)) + dataqueries := make([]variants.Dataquery, 0, len(rawDataqueries)) for _, rawDataquery := range rawDataqueries { dataquery, err := runtime.UnmarshalDataquery(rawDataquery, dataqueryTypeHint) if err != nil { @@ -61,7 +61,7 @@ func (runtime *Runtime) UnmarshalDataqueryArray(raw []byte, dataqueryTypeHint st return dataqueries, nil } -func (runtime *Runtime) UnmarshalDataquery(raw []byte, dataqueryTypeHint string) (cogvariants.Dataquery, error) { +func (runtime *Runtime) UnmarshalDataquery(raw []byte, dataqueryTypeHint string) (variants.Dataquery, error) { // A hint tells us the dataquery type: let's use it. if dataqueryTypeHint != "" { config, found := runtime.dataqueryVariants[dataqueryTypeHint] @@ -71,12 +71,12 @@ func (runtime *Runtime) UnmarshalDataquery(raw []byte, dataqueryTypeHint string) return nil, err } - return dataquery.(cogvariants.Dataquery), nil + return dataquery.(variants.Dataquery), nil } } // We have no idea what type the dataquery is: use our `UnknownDataquery` bag to not lose data. - dataquery := cogvariants.UnknownDataquery{} + dataquery := variants.UnknownDataquery{} if err := json.Unmarshal(raw, &dataquery); err != nil { return nil, err } @@ -84,14 +84,14 @@ func (runtime *Runtime) UnmarshalDataquery(raw []byte, dataqueryTypeHint string) return dataquery, nil } -func UnmarshalDataqueryArray(raw []byte, dataqueryTypeHint string) ([]cogvariants.Dataquery, error) { +func UnmarshalDataqueryArray(raw []byte, dataqueryTypeHint string) ([]variants.Dataquery, error) { return NewRuntime().UnmarshalDataqueryArray(raw, dataqueryTypeHint) } -func UnmarshalDataquery(raw []byte, dataqueryTypeHint string) (cogvariants.Dataquery, error) { +func UnmarshalDataquery(raw []byte, dataqueryTypeHint string) (variants.Dataquery, error) { return NewRuntime().UnmarshalDataquery(raw, dataqueryTypeHint) } -func ConfigForPanelcfgVariant(identifier string) (cogvariants.PanelcfgConfig, bool) { +func ConfigForPanelcfgVariant(identifier string) (variants.PanelcfgConfig, bool) { return NewRuntime().ConfigForPanelcfgVariant(identifier) } diff --git a/go/cog/variants/variants.go b/go/cog/variants/variants.go index b0d0930..eebe47c 100644 --- a/go/cog/variants/variants.go +++ b/go/cog/variants/variants.go @@ -1,6 +1,6 @@ // Code generated - EDITING IS FUTILE. DO NOT EDIT. -package cogvariants +package variants type PanelcfgConfig struct { Identifier string diff --git a/go/dashboard/panel_builder_gen.go b/go/dashboard/panel_builder_gen.go index 98fcc5e..9ad2272 100644 --- a/go/dashboard/panel_builder_gen.go +++ b/go/dashboard/panel_builder_gen.go @@ -6,7 +6,7 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) var _ cog.Builder[Panel] = (*PanelBuilder)(nil) @@ -62,8 +62,8 @@ func (builder *PanelBuilder) Id(id uint32) *PanelBuilder { } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery]) *PanelBuilder { - targetsResources := make([]cogvariants.Dataquery, 0, len(targets)) +func (builder *PanelBuilder) Targets(targets []cog.Builder[variants.Dataquery]) *PanelBuilder { + targetsResources := make([]variants.Dataquery, 0, len(targets)) for _, r1 := range targets { targetsDepth1, err := r1.Build() if err != nil { @@ -78,7 +78,7 @@ func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) WithTarget(targets cog.Builder[cogvariants.Dataquery]) *PanelBuilder { +func (builder *PanelBuilder) WithTarget(targets cog.Builder[variants.Dataquery]) *PanelBuilder { targetsResource, err := targets.Build() if err != nil { builder.errors["targets"] = err.(cog.BuildErrors) diff --git a/go/dashboard/types_gen.go b/go/dashboard/types_gen.go index a8f9657..a95bc16 100644 --- a/go/dashboard/types_gen.go +++ b/go/dashboard/types_gen.go @@ -9,7 +9,7 @@ import ( "time" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) type Dashboard struct { @@ -563,7 +563,7 @@ type Panel struct { // The version of the plugin that is used for this panel. This is used to find the plugin to display the panel and to migrate old panel configs. PluginVersion *string `json:"pluginVersion,omitempty"` // Depends on the panel plugin. See the plugin documentation for details. - Targets []cogvariants.Dataquery `json:"targets,omitempty"` + Targets []variants.Dataquery `json:"targets,omitempty"` // Panel title. Title *string `json:"title,omitempty"` // Panel description. diff --git a/go/dashboardlist/panel_builder_gen.go b/go/dashboardlist/panel_builder_gen.go index 2b6adb6..2d0b061 100644 --- a/go/dashboardlist/panel_builder_gen.go +++ b/go/dashboardlist/panel_builder_gen.go @@ -6,7 +6,7 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" dashboard "github.com/grafana/grafana-foundation-sdk/go/dashboard" ) @@ -53,8 +53,8 @@ func (builder *PanelBuilder) Id(id uint32) *PanelBuilder { } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery]) *PanelBuilder { - targetsResources := make([]cogvariants.Dataquery, 0, len(targets)) +func (builder *PanelBuilder) Targets(targets []cog.Builder[variants.Dataquery]) *PanelBuilder { + targetsResources := make([]variants.Dataquery, 0, len(targets)) for _, r1 := range targets { targetsDepth1, err := r1.Build() if err != nil { @@ -69,7 +69,7 @@ func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) WithTarget(targets cog.Builder[cogvariants.Dataquery]) *PanelBuilder { +func (builder *PanelBuilder) WithTarget(targets cog.Builder[variants.Dataquery]) *PanelBuilder { targetsResource, err := targets.Build() if err != nil { builder.errors["targets"] = err.(cog.BuildErrors) diff --git a/go/dashboardlist/types_gen.go b/go/dashboardlist/types_gen.go index bd93ccc..61433fe 100644 --- a/go/dashboardlist/types_gen.go +++ b/go/dashboardlist/types_gen.go @@ -5,7 +5,7 @@ package dashboardlist import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) type Options struct { @@ -24,8 +24,8 @@ type Options struct { FolderUID *string `json:"folderUID,omitempty"` } -func VariantConfig() cogvariants.PanelcfgConfig { - return cogvariants.PanelcfgConfig{ +func VariantConfig() variants.PanelcfgConfig { + return variants.PanelcfgConfig{ Identifier: "dashlist", OptionsUnmarshaler: func(raw []byte) (any, error) { options := Options{} diff --git a/go/datagrid/panel_builder_gen.go b/go/datagrid/panel_builder_gen.go index 6e34484..d8345e5 100644 --- a/go/datagrid/panel_builder_gen.go +++ b/go/datagrid/panel_builder_gen.go @@ -6,7 +6,7 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" dashboard "github.com/grafana/grafana-foundation-sdk/go/dashboard" ) @@ -53,8 +53,8 @@ func (builder *PanelBuilder) Id(id uint32) *PanelBuilder { } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery]) *PanelBuilder { - targetsResources := make([]cogvariants.Dataquery, 0, len(targets)) +func (builder *PanelBuilder) Targets(targets []cog.Builder[variants.Dataquery]) *PanelBuilder { + targetsResources := make([]variants.Dataquery, 0, len(targets)) for _, r1 := range targets { targetsDepth1, err := r1.Build() if err != nil { @@ -69,7 +69,7 @@ func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) WithTarget(targets cog.Builder[cogvariants.Dataquery]) *PanelBuilder { +func (builder *PanelBuilder) WithTarget(targets cog.Builder[variants.Dataquery]) *PanelBuilder { targetsResource, err := targets.Build() if err != nil { builder.errors["targets"] = err.(cog.BuildErrors) diff --git a/go/datagrid/types_gen.go b/go/datagrid/types_gen.go index 2e6aaff..204e582 100644 --- a/go/datagrid/types_gen.go +++ b/go/datagrid/types_gen.go @@ -5,15 +5,15 @@ package datagrid import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) type Options struct { SelectedSeries int32 `json:"selectedSeries"` } -func VariantConfig() cogvariants.PanelcfgConfig { - return cogvariants.PanelcfgConfig{ +func VariantConfig() variants.PanelcfgConfig { + return variants.PanelcfgConfig{ Identifier: "datagrid", OptionsUnmarshaler: func(raw []byte) (any, error) { options := Options{} diff --git a/go/debug/panel_builder_gen.go b/go/debug/panel_builder_gen.go index 53b6443..8ebe6b5 100644 --- a/go/debug/panel_builder_gen.go +++ b/go/debug/panel_builder_gen.go @@ -6,7 +6,7 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" dashboard "github.com/grafana/grafana-foundation-sdk/go/dashboard" ) @@ -53,8 +53,8 @@ func (builder *PanelBuilder) Id(id uint32) *PanelBuilder { } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery]) *PanelBuilder { - targetsResources := make([]cogvariants.Dataquery, 0, len(targets)) +func (builder *PanelBuilder) Targets(targets []cog.Builder[variants.Dataquery]) *PanelBuilder { + targetsResources := make([]variants.Dataquery, 0, len(targets)) for _, r1 := range targets { targetsDepth1, err := r1.Build() if err != nil { @@ -69,7 +69,7 @@ func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) WithTarget(targets cog.Builder[cogvariants.Dataquery]) *PanelBuilder { +func (builder *PanelBuilder) WithTarget(targets cog.Builder[variants.Dataquery]) *PanelBuilder { targetsResource, err := targets.Build() if err != nil { builder.errors["targets"] = err.(cog.BuildErrors) diff --git a/go/debug/types_gen.go b/go/debug/types_gen.go index a2c476b..5c27b83 100644 --- a/go/debug/types_gen.go +++ b/go/debug/types_gen.go @@ -5,7 +5,7 @@ package debug import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) type UpdateConfig struct { @@ -29,8 +29,8 @@ type Options struct { Counters *UpdateConfig `json:"counters,omitempty"` } -func VariantConfig() cogvariants.PanelcfgConfig { - return cogvariants.PanelcfgConfig{ +func VariantConfig() variants.PanelcfgConfig { + return variants.PanelcfgConfig{ Identifier: "debug", OptionsUnmarshaler: func(raw []byte) (any, error) { options := Options{} diff --git a/go/elasticsearch/dataquery_builder_gen.go b/go/elasticsearch/dataquery_builder_gen.go index 51cb1c7..947677d 100644 --- a/go/elasticsearch/dataquery_builder_gen.go +++ b/go/elasticsearch/dataquery_builder_gen.go @@ -4,10 +4,10 @@ package elasticsearch import ( cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) -var _ cog.Builder[cogvariants.Dataquery] = (*DataqueryBuilder)(nil) +var _ cog.Builder[variants.Dataquery] = (*DataqueryBuilder)(nil) type DataqueryBuilder struct { internal *Dataquery @@ -26,7 +26,7 @@ func NewDataqueryBuilder() *DataqueryBuilder { return builder } -func (builder *DataqueryBuilder) Build() (cogvariants.Dataquery, error) { +func (builder *DataqueryBuilder) Build() (variants.Dataquery, error) { var errs cog.BuildErrors for _, err := range builder.errors { diff --git a/go/elasticsearch/types_gen.go b/go/elasticsearch/types_gen.go index c942c99..cc028af 100644 --- a/go/elasticsearch/types_gen.go +++ b/go/elasticsearch/types_gen.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) type BucketAggregation = DateHistogramOrHistogramOrTermsOrFiltersOrGeoHashGridOrNested @@ -525,10 +525,10 @@ type Dataquery struct { func (resource Dataquery) ImplementsDataqueryVariant() {} -func VariantConfig() cogvariants.DataqueryConfig { - return cogvariants.DataqueryConfig{ +func VariantConfig() variants.DataqueryConfig { + return variants.DataqueryConfig{ Identifier: "elasticsearch", - DataqueryUnmarshaler: func(raw []byte) (cogvariants.Dataquery, error) { + DataqueryUnmarshaler: func(raw []byte) (variants.Dataquery, error) { dataquery := Dataquery{} if err := json.Unmarshal(raw, &dataquery); err != nil { diff --git a/go/expr/typeclassicconditions_builder_gen.go b/go/expr/typeclassicconditions_builder_gen.go index f03f7c2..6f9eac0 100644 --- a/go/expr/typeclassicconditions_builder_gen.go +++ b/go/expr/typeclassicconditions_builder_gen.go @@ -4,10 +4,10 @@ package expr import ( cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) -var _ cog.Builder[cogvariants.Dataquery] = (*TypeClassicConditionsBuilder)(nil) +var _ cog.Builder[variants.Dataquery] = (*TypeClassicConditionsBuilder)(nil) type TypeClassicConditionsBuilder struct { internal *TypeClassicConditions @@ -27,7 +27,7 @@ func NewTypeClassicConditionsBuilder() *TypeClassicConditionsBuilder { return builder } -func (builder *TypeClassicConditionsBuilder) Build() (cogvariants.Dataquery, error) { +func (builder *TypeClassicConditionsBuilder) Build() (variants.Dataquery, error) { var errs cog.BuildErrors for _, err := range builder.errors { diff --git a/go/expr/typemath_builder_gen.go b/go/expr/typemath_builder_gen.go index 8ac4487..9600664 100644 --- a/go/expr/typemath_builder_gen.go +++ b/go/expr/typemath_builder_gen.go @@ -6,10 +6,10 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) -var _ cog.Builder[cogvariants.Dataquery] = (*TypeMathBuilder)(nil) +var _ cog.Builder[variants.Dataquery] = (*TypeMathBuilder)(nil) type TypeMathBuilder struct { internal *TypeMath @@ -29,7 +29,7 @@ func NewTypeMathBuilder() *TypeMathBuilder { return builder } -func (builder *TypeMathBuilder) Build() (cogvariants.Dataquery, error) { +func (builder *TypeMathBuilder) Build() (variants.Dataquery, error) { var errs cog.BuildErrors for _, err := range builder.errors { diff --git a/go/expr/typereduce_builder_gen.go b/go/expr/typereduce_builder_gen.go index f96dd8a..3be3866 100644 --- a/go/expr/typereduce_builder_gen.go +++ b/go/expr/typereduce_builder_gen.go @@ -6,10 +6,10 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) -var _ cog.Builder[cogvariants.Dataquery] = (*TypeReduceBuilder)(nil) +var _ cog.Builder[variants.Dataquery] = (*TypeReduceBuilder)(nil) type TypeReduceBuilder struct { internal *TypeReduce @@ -29,7 +29,7 @@ func NewTypeReduceBuilder() *TypeReduceBuilder { return builder } -func (builder *TypeReduceBuilder) Build() (cogvariants.Dataquery, error) { +func (builder *TypeReduceBuilder) Build() (variants.Dataquery, error) { var errs cog.BuildErrors for _, err := range builder.errors { diff --git a/go/expr/typeresample_builder_gen.go b/go/expr/typeresample_builder_gen.go index 6cb2009..d0cddf7 100644 --- a/go/expr/typeresample_builder_gen.go +++ b/go/expr/typeresample_builder_gen.go @@ -6,10 +6,10 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) -var _ cog.Builder[cogvariants.Dataquery] = (*TypeResampleBuilder)(nil) +var _ cog.Builder[variants.Dataquery] = (*TypeResampleBuilder)(nil) type TypeResampleBuilder struct { internal *TypeResample @@ -29,7 +29,7 @@ func NewTypeResampleBuilder() *TypeResampleBuilder { return builder } -func (builder *TypeResampleBuilder) Build() (cogvariants.Dataquery, error) { +func (builder *TypeResampleBuilder) Build() (variants.Dataquery, error) { var errs cog.BuildErrors for _, err := range builder.errors { diff --git a/go/expr/types_gen.go b/go/expr/types_gen.go index b3947cf..2f8844b 100644 --- a/go/expr/types_gen.go +++ b/go/expr/types_gen.go @@ -7,17 +7,17 @@ import ( "errors" "fmt" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) type Expr = TypeMathOrTypeReduceOrTypeResampleOrTypeClassicConditionsOrTypeThresholdOrTypeSql func (resource Expr) ImplementsDataqueryVariant() {} -func VariantConfig() cogvariants.DataqueryConfig { - return cogvariants.DataqueryConfig{ +func VariantConfig() variants.DataqueryConfig { + return variants.DataqueryConfig{ Identifier: "__expr__", - DataqueryUnmarshaler: func(raw []byte) (cogvariants.Dataquery, error) { + DataqueryUnmarshaler: func(raw []byte) (variants.Dataquery, error) { dataquery := Expr{} if err := json.Unmarshal(raw, &dataquery); err != nil { diff --git a/go/expr/typesql_builder_gen.go b/go/expr/typesql_builder_gen.go index 2358525..3d632fa 100644 --- a/go/expr/typesql_builder_gen.go +++ b/go/expr/typesql_builder_gen.go @@ -6,10 +6,10 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) -var _ cog.Builder[cogvariants.Dataquery] = (*TypeSqlBuilder)(nil) +var _ cog.Builder[variants.Dataquery] = (*TypeSqlBuilder)(nil) type TypeSqlBuilder struct { internal *TypeSql @@ -29,7 +29,7 @@ func NewTypeSqlBuilder() *TypeSqlBuilder { return builder } -func (builder *TypeSqlBuilder) Build() (cogvariants.Dataquery, error) { +func (builder *TypeSqlBuilder) Build() (variants.Dataquery, error) { var errs cog.BuildErrors for _, err := range builder.errors { diff --git a/go/expr/typethreshold_builder_gen.go b/go/expr/typethreshold_builder_gen.go index 3fcde76..3f52163 100644 --- a/go/expr/typethreshold_builder_gen.go +++ b/go/expr/typethreshold_builder_gen.go @@ -6,10 +6,10 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) -var _ cog.Builder[cogvariants.Dataquery] = (*TypeThresholdBuilder)(nil) +var _ cog.Builder[variants.Dataquery] = (*TypeThresholdBuilder)(nil) type TypeThresholdBuilder struct { internal *TypeThreshold @@ -29,7 +29,7 @@ func NewTypeThresholdBuilder() *TypeThresholdBuilder { return builder } -func (builder *TypeThresholdBuilder) Build() (cogvariants.Dataquery, error) { +func (builder *TypeThresholdBuilder) Build() (variants.Dataquery, error) { var errs cog.BuildErrors for _, err := range builder.errors { diff --git a/go/gauge/panel_builder_gen.go b/go/gauge/panel_builder_gen.go index bc2835b..84fa388 100644 --- a/go/gauge/panel_builder_gen.go +++ b/go/gauge/panel_builder_gen.go @@ -6,7 +6,7 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" dashboard "github.com/grafana/grafana-foundation-sdk/go/dashboard" ) @@ -54,8 +54,8 @@ func (builder *PanelBuilder) Id(id uint32) *PanelBuilder { } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery]) *PanelBuilder { - targetsResources := make([]cogvariants.Dataquery, 0, len(targets)) +func (builder *PanelBuilder) Targets(targets []cog.Builder[variants.Dataquery]) *PanelBuilder { + targetsResources := make([]variants.Dataquery, 0, len(targets)) for _, r1 := range targets { targetsDepth1, err := r1.Build() if err != nil { @@ -70,7 +70,7 @@ func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) WithTarget(targets cog.Builder[cogvariants.Dataquery]) *PanelBuilder { +func (builder *PanelBuilder) WithTarget(targets cog.Builder[variants.Dataquery]) *PanelBuilder { targetsResource, err := targets.Build() if err != nil { builder.errors["targets"] = err.(cog.BuildErrors) diff --git a/go/gauge/types_gen.go b/go/gauge/types_gen.go index 4b3315b..55dc597 100644 --- a/go/gauge/types_gen.go +++ b/go/gauge/types_gen.go @@ -5,7 +5,7 @@ package gauge import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" ) @@ -20,8 +20,8 @@ type Options struct { Orientation common.VizOrientation `json:"orientation"` } -func VariantConfig() cogvariants.PanelcfgConfig { - return cogvariants.PanelcfgConfig{ +func VariantConfig() variants.PanelcfgConfig { + return variants.PanelcfgConfig{ Identifier: "gauge", OptionsUnmarshaler: func(raw []byte) (any, error) { options := Options{} diff --git a/go/geomap/panel_builder_gen.go b/go/geomap/panel_builder_gen.go index 63e6a39..a9c3c79 100644 --- a/go/geomap/panel_builder_gen.go +++ b/go/geomap/panel_builder_gen.go @@ -6,7 +6,7 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" dashboard "github.com/grafana/grafana-foundation-sdk/go/dashboard" ) @@ -54,8 +54,8 @@ func (builder *PanelBuilder) Id(id uint32) *PanelBuilder { } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery]) *PanelBuilder { - targetsResources := make([]cogvariants.Dataquery, 0, len(targets)) +func (builder *PanelBuilder) Targets(targets []cog.Builder[variants.Dataquery]) *PanelBuilder { + targetsResources := make([]variants.Dataquery, 0, len(targets)) for _, r1 := range targets { targetsDepth1, err := r1.Build() if err != nil { @@ -70,7 +70,7 @@ func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) WithTarget(targets cog.Builder[cogvariants.Dataquery]) *PanelBuilder { +func (builder *PanelBuilder) WithTarget(targets cog.Builder[variants.Dataquery]) *PanelBuilder { targetsResource, err := targets.Build() if err != nil { builder.errors["targets"] = err.(cog.BuildErrors) diff --git a/go/geomap/types_gen.go b/go/geomap/types_gen.go index 913ecd1..1e79dd7 100644 --- a/go/geomap/types_gen.go +++ b/go/geomap/types_gen.go @@ -5,7 +5,7 @@ package geomap import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" ) @@ -65,8 +65,8 @@ const ( MapCenterIDFit MapCenterID = "fit" ) -func VariantConfig() cogvariants.PanelcfgConfig { - return cogvariants.PanelcfgConfig{ +func VariantConfig() variants.PanelcfgConfig { + return variants.PanelcfgConfig{ Identifier: "geomap", OptionsUnmarshaler: func(raw []byte) (any, error) { options := Options{} diff --git a/go/googlecloudmonitoring/cloudmonitoringquery_builder_gen.go b/go/googlecloudmonitoring/cloudmonitoringquery_builder_gen.go index 403e89d..82ae910 100644 --- a/go/googlecloudmonitoring/cloudmonitoringquery_builder_gen.go +++ b/go/googlecloudmonitoring/cloudmonitoringquery_builder_gen.go @@ -4,10 +4,10 @@ package googlecloudmonitoring import ( cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) -var _ cog.Builder[cogvariants.Dataquery] = (*CloudMonitoringQueryBuilder)(nil) +var _ cog.Builder[variants.Dataquery] = (*CloudMonitoringQueryBuilder)(nil) type CloudMonitoringQueryBuilder struct { internal *CloudMonitoringQuery @@ -26,7 +26,7 @@ func NewCloudMonitoringQueryBuilder() *CloudMonitoringQueryBuilder { return builder } -func (builder *CloudMonitoringQueryBuilder) Build() (cogvariants.Dataquery, error) { +func (builder *CloudMonitoringQueryBuilder) Build() (variants.Dataquery, error) { var errs cog.BuildErrors for _, err := range builder.errors { diff --git a/go/googlecloudmonitoring/types_gen.go b/go/googlecloudmonitoring/types_gen.go index 85c8e53..f547bf9 100644 --- a/go/googlecloudmonitoring/types_gen.go +++ b/go/googlecloudmonitoring/types_gen.go @@ -5,7 +5,7 @@ package googlecloudmonitoring import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) type CloudMonitoringQuery struct { @@ -41,10 +41,10 @@ type CloudMonitoringQuery struct { func (resource CloudMonitoringQuery) ImplementsDataqueryVariant() {} -func VariantConfig() cogvariants.DataqueryConfig { - return cogvariants.DataqueryConfig{ +func VariantConfig() variants.DataqueryConfig { + return variants.DataqueryConfig{ Identifier: "cloud-monitoring", - DataqueryUnmarshaler: func(raw []byte) (cogvariants.Dataquery, error) { + DataqueryUnmarshaler: func(raw []byte) (variants.Dataquery, error) { dataquery := CloudMonitoringQuery{} if err := json.Unmarshal(raw, &dataquery); err != nil { diff --git a/go/grafanapyroscope/dataquery_builder_gen.go b/go/grafanapyroscope/dataquery_builder_gen.go index b2c91f6..0adaef2 100644 --- a/go/grafanapyroscope/dataquery_builder_gen.go +++ b/go/grafanapyroscope/dataquery_builder_gen.go @@ -4,10 +4,10 @@ package grafanapyroscope import ( cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) -var _ cog.Builder[cogvariants.Dataquery] = (*DataqueryBuilder)(nil) +var _ cog.Builder[variants.Dataquery] = (*DataqueryBuilder)(nil) type DataqueryBuilder struct { internal *Dataquery @@ -26,7 +26,7 @@ func NewDataqueryBuilder() *DataqueryBuilder { return builder } -func (builder *DataqueryBuilder) Build() (cogvariants.Dataquery, error) { +func (builder *DataqueryBuilder) Build() (variants.Dataquery, error) { var errs cog.BuildErrors for _, err := range builder.errors { diff --git a/go/grafanapyroscope/types_gen.go b/go/grafanapyroscope/types_gen.go index 72ca853..245efe1 100644 --- a/go/grafanapyroscope/types_gen.go +++ b/go/grafanapyroscope/types_gen.go @@ -5,7 +5,7 @@ package grafanapyroscope import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) type PyroscopeQueryType string @@ -45,10 +45,10 @@ type Dataquery struct { func (resource Dataquery) ImplementsDataqueryVariant() {} -func VariantConfig() cogvariants.DataqueryConfig { - return cogvariants.DataqueryConfig{ +func VariantConfig() variants.DataqueryConfig { + return variants.DataqueryConfig{ Identifier: "grafanapyroscope", - DataqueryUnmarshaler: func(raw []byte) (cogvariants.Dataquery, error) { + DataqueryUnmarshaler: func(raw []byte) (variants.Dataquery, error) { dataquery := Dataquery{} if err := json.Unmarshal(raw, &dataquery); err != nil { diff --git a/go/heatmap/panel_builder_gen.go b/go/heatmap/panel_builder_gen.go index 045788c..09df45e 100644 --- a/go/heatmap/panel_builder_gen.go +++ b/go/heatmap/panel_builder_gen.go @@ -6,7 +6,7 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" dashboard "github.com/grafana/grafana-foundation-sdk/go/dashboard" ) @@ -54,8 +54,8 @@ func (builder *PanelBuilder) Id(id uint32) *PanelBuilder { } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery]) *PanelBuilder { - targetsResources := make([]cogvariants.Dataquery, 0, len(targets)) +func (builder *PanelBuilder) Targets(targets []cog.Builder[variants.Dataquery]) *PanelBuilder { + targetsResources := make([]variants.Dataquery, 0, len(targets)) for _, r1 := range targets { targetsDepth1, err := r1.Build() if err != nil { @@ -70,7 +70,7 @@ func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) WithTarget(targets cog.Builder[cogvariants.Dataquery]) *PanelBuilder { +func (builder *PanelBuilder) WithTarget(targets cog.Builder[variants.Dataquery]) *PanelBuilder { targetsResource, err := targets.Build() if err != nil { builder.errors["targets"] = err.(cog.BuildErrors) diff --git a/go/heatmap/types_gen.go b/go/heatmap/types_gen.go index 583f986..ee90cf8 100644 --- a/go/heatmap/types_gen.go +++ b/go/heatmap/types_gen.go @@ -5,7 +5,7 @@ package heatmap import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" ) @@ -170,8 +170,8 @@ type FieldConfig struct { HideFrom *common.HideSeriesConfig `json:"hideFrom,omitempty"` } -func VariantConfig() cogvariants.PanelcfgConfig { - return cogvariants.PanelcfgConfig{ +func VariantConfig() variants.PanelcfgConfig { + return variants.PanelcfgConfig{ Identifier: "heatmap", OptionsUnmarshaler: func(raw []byte) (any, error) { options := Options{} diff --git a/go/histogram/panel_builder_gen.go b/go/histogram/panel_builder_gen.go index 4b8be40..8a24277 100644 --- a/go/histogram/panel_builder_gen.go +++ b/go/histogram/panel_builder_gen.go @@ -6,7 +6,7 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" dashboard "github.com/grafana/grafana-foundation-sdk/go/dashboard" ) @@ -54,8 +54,8 @@ func (builder *PanelBuilder) Id(id uint32) *PanelBuilder { } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery]) *PanelBuilder { - targetsResources := make([]cogvariants.Dataquery, 0, len(targets)) +func (builder *PanelBuilder) Targets(targets []cog.Builder[variants.Dataquery]) *PanelBuilder { + targetsResources := make([]variants.Dataquery, 0, len(targets)) for _, r1 := range targets { targetsDepth1, err := r1.Build() if err != nil { @@ -70,7 +70,7 @@ func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) WithTarget(targets cog.Builder[cogvariants.Dataquery]) *PanelBuilder { +func (builder *PanelBuilder) WithTarget(targets cog.Builder[variants.Dataquery]) *PanelBuilder { targetsResource, err := targets.Build() if err != nil { builder.errors["targets"] = err.(cog.BuildErrors) diff --git a/go/histogram/types_gen.go b/go/histogram/types_gen.go index ca408be..20ade0d 100644 --- a/go/histogram/types_gen.go +++ b/go/histogram/types_gen.go @@ -5,7 +5,7 @@ package histogram import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" ) @@ -44,8 +44,8 @@ type FieldConfig struct { AxisBorderShow *bool `json:"axisBorderShow,omitempty"` } -func VariantConfig() cogvariants.PanelcfgConfig { - return cogvariants.PanelcfgConfig{ +func VariantConfig() variants.PanelcfgConfig { + return variants.PanelcfgConfig{ Identifier: "histogram", OptionsUnmarshaler: func(raw []byte) (any, error) { options := Options{} diff --git a/go/librarypanel/librarypanel_builder_gen.go b/go/librarypanel/librarypanel_builder_gen.go index 0fedc22..70888f9 100644 --- a/go/librarypanel/librarypanel_builder_gen.go +++ b/go/librarypanel/librarypanel_builder_gen.go @@ -6,7 +6,7 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" dashboard "github.com/grafana/grafana-foundation-sdk/go/dashboard" ) @@ -108,7 +108,7 @@ func (builder *LibraryPanelBuilder) Model(model struct { // The version of the plugin that is used for this panel. This is used to find the plugin to display the panel and to migrate old panel configs. PluginVersion *string `json:"pluginVersion,omitempty"` // Depends on the panel plugin. See the plugin documentation for details. - Targets []cogvariants.Dataquery `json:"targets,omitempty"` + Targets []variants.Dataquery `json:"targets,omitempty"` // Panel title. Title *string `json:"title,omitempty"` // Panel description. diff --git a/go/librarypanel/types_gen.go b/go/librarypanel/types_gen.go index 322cbae..1652868 100644 --- a/go/librarypanel/types_gen.go +++ b/go/librarypanel/types_gen.go @@ -5,7 +5,7 @@ package librarypanel import ( "time" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" dashboard "github.com/grafana/grafana-foundation-sdk/go/dashboard" ) @@ -32,7 +32,7 @@ type LibraryPanel struct { // The version of the plugin that is used for this panel. This is used to find the plugin to display the panel and to migrate old panel configs. PluginVersion *string `json:"pluginVersion,omitempty"` // Depends on the panel plugin. See the plugin documentation for details. - Targets []cogvariants.Dataquery `json:"targets,omitempty"` + Targets []variants.Dataquery `json:"targets,omitempty"` // Panel title. Title *string `json:"title,omitempty"` // Panel description. diff --git a/go/logs/panel_builder_gen.go b/go/logs/panel_builder_gen.go index 996aea5..b3880c7 100644 --- a/go/logs/panel_builder_gen.go +++ b/go/logs/panel_builder_gen.go @@ -6,7 +6,7 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" dashboard "github.com/grafana/grafana-foundation-sdk/go/dashboard" ) @@ -54,8 +54,8 @@ func (builder *PanelBuilder) Id(id uint32) *PanelBuilder { } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery]) *PanelBuilder { - targetsResources := make([]cogvariants.Dataquery, 0, len(targets)) +func (builder *PanelBuilder) Targets(targets []cog.Builder[variants.Dataquery]) *PanelBuilder { + targetsResources := make([]variants.Dataquery, 0, len(targets)) for _, r1 := range targets { targetsDepth1, err := r1.Build() if err != nil { @@ -70,7 +70,7 @@ func (builder *PanelBuilder) Targets(targets []cog.Builder[cogvariants.Dataquery } // Depends on the panel plugin. See the plugin documentation for details. -func (builder *PanelBuilder) WithTarget(targets cog.Builder[cogvariants.Dataquery]) *PanelBuilder { +func (builder *PanelBuilder) WithTarget(targets cog.Builder[variants.Dataquery]) *PanelBuilder { targetsResource, err := targets.Build() if err != nil { builder.errors["targets"] = err.(cog.BuildErrors) diff --git a/go/logs/types_gen.go b/go/logs/types_gen.go index d56ac58..b79fc6a 100644 --- a/go/logs/types_gen.go +++ b/go/logs/types_gen.go @@ -5,7 +5,7 @@ package logs import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" common "github.com/grafana/grafana-foundation-sdk/go/common" ) @@ -27,8 +27,8 @@ type Options struct { OnClickFilterOutString any `json:"onClickFilterOutString,omitempty"` } -func VariantConfig() cogvariants.PanelcfgConfig { - return cogvariants.PanelcfgConfig{ +func VariantConfig() variants.PanelcfgConfig { + return variants.PanelcfgConfig{ Identifier: "logs", OptionsUnmarshaler: func(raw []byte) (any, error) { options := Options{} diff --git a/go/loki/dataquery_builder_gen.go b/go/loki/dataquery_builder_gen.go index 103341c..fb45a1a 100644 --- a/go/loki/dataquery_builder_gen.go +++ b/go/loki/dataquery_builder_gen.go @@ -4,10 +4,10 @@ package loki import ( cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) -var _ cog.Builder[cogvariants.Dataquery] = (*DataqueryBuilder)(nil) +var _ cog.Builder[variants.Dataquery] = (*DataqueryBuilder)(nil) type DataqueryBuilder struct { internal *Dataquery @@ -26,7 +26,7 @@ func NewDataqueryBuilder() *DataqueryBuilder { return builder } -func (builder *DataqueryBuilder) Build() (cogvariants.Dataquery, error) { +func (builder *DataqueryBuilder) Build() (variants.Dataquery, error) { var errs cog.BuildErrors for _, err := range builder.errors { diff --git a/go/loki/types_gen.go b/go/loki/types_gen.go index fde967a..20df8f8 100644 --- a/go/loki/types_gen.go +++ b/go/loki/types_gen.go @@ -5,7 +5,7 @@ package loki import ( "encoding/json" - cogvariants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" + variants "github.com/grafana/grafana-foundation-sdk/go/cog/variants" ) type QueryEditorMode string @@ -73,10 +73,10 @@ type Dataquery struct { func (resource Dataquery) ImplementsDataqueryVariant() {} -func VariantConfig() cogvariants.DataqueryConfig { - return cogvariants.DataqueryConfig{ +func VariantConfig() variants.DataqueryConfig { + return variants.DataqueryConfig{ Identifier: "loki", - DataqueryUnmarshaler: func(raw []byte) (cogvariants.Dataquery, error) { + DataqueryUnmarshaler: func(raw []byte) (variants.Dataquery, error) { dataquery := Dataquery{} if err := json.Unmarshal(raw, &dataquery); err != nil { diff --git a/go/news/panel_builder_gen.go b/go/news/panel_builder_gen.go index dd596be..2ad670e 100644 --- a/go/news/panel_builder_gen.go +++ b/go/news/panel_builder_gen.go @@ -6,7 +6,7 @@ import ( "errors" cog "github.com/grafana/grafana-foundation-sdk/go/cog" - cogvariants "github...*[Comment body truncated]*