kindsys: Adapt to new PanelCfg schema interface (#65297)

* kindsys: Adapt to new PanelCfg schema interface

* building locally

* Remove Panel prefix in cue files

* Regenerate

* Update imports

* fixup! Merge branch 'remove-panel-prefix' into sdboyer/redundant-panelcfg-prefixes

* Fix formatting

---------

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
Co-authored-by: Tania B <yalyna.ts@gmail.com>
This commit is contained in:
sam boyer
2023-05-15 23:07:54 -04:00
committed by GitHub
parent 5a5860256f
commit 33fd83f7e3
202 changed files with 618 additions and 617 deletions

View File

@@ -279,7 +279,7 @@ type FieldConfig struct {
// TODO docs
Color *FieldColor `json:"color,omitempty"`
// custom is specified by the PanelFieldConfig field
// custom is specified by the FieldConfig field
// in panel plugin schemas.
Custom map[string]interface{} `json:"custom,omitempty"`
@@ -422,7 +422,7 @@ type Panel struct {
// TODO docs
MaxDataPoints *float32 `json:"maxDataPoints,omitempty"`
// options is specified by the PanelOptions field in panel
// options is specified by the Options field in panel
// plugin schemas.
Options map[string]interface{} `json:"options"`

View File

@@ -39,7 +39,7 @@ type OperatorStateState string
// Status defines model for Status.
type Status struct {
// additionalFields is reserved for future use
AdditionalFields map[string]interface{} `json:"additionalFields"`
AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
// operatorStates is a map of operator ID to operator state evaluations.
// Any operator which consumes this kind SHOULD add its state evaluation information to this field.

View File

@@ -39,7 +39,7 @@ type OperatorStateState string
// Status defines model for Status.
type Status struct {
// additionalFields is reserved for future use
AdditionalFields map[string]interface{} `json:"additionalFields"`
AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
// operatorStates is a map of operator ID to operator state evaluations.
// Any operator which consumes this kind SHOULD add its state evaluation information to this field.

View File

@@ -39,7 +39,7 @@ type OperatorStateState string
// Status defines model for Status.
type Status struct {
// additionalFields is reserved for future use
AdditionalFields map[string]interface{} `json:"additionalFields"`
AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
// operatorStates is a map of operator ID to operator state evaluations.
// Any operator which consumes this kind SHOULD add its state evaluation information to this field.

View File

@@ -39,7 +39,7 @@ type OperatorStateState string
// Status defines model for Status.
type Status struct {
// additionalFields is reserved for future use
AdditionalFields map[string]interface{} `json:"additionalFields"`
AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
// operatorStates is a map of operator ID to operator state evaluations.
// Any operator which consumes this kind SHOULD add its state evaluation information to this field.

View File

@@ -39,7 +39,7 @@ type OperatorStateState string
// Status defines model for Status.
type Status struct {
// additionalFields is reserved for future use
AdditionalFields map[string]interface{} `json:"additionalFields"`
AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
// operatorStates is a map of operator ID to operator state evaluations.
// Any operator which consumes this kind SHOULD add its state evaluation information to this field.

View File

@@ -39,7 +39,7 @@ type OperatorStateState string
// Status defines model for Status.
type Status struct {
// additionalFields is reserved for future use
AdditionalFields map[string]interface{} `json:"additionalFields"`
AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
// operatorStates is a map of operator ID to operator state evaluations.
// Any operator which consumes this kind SHOULD add its state evaluation information to this field.

View File

@@ -39,7 +39,7 @@ type OperatorStateState string
// Status defines model for Status.
type Status struct {
// additionalFields is reserved for future use
AdditionalFields map[string]interface{} `json:"additionalFields"`
AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
// operatorStates is a map of operator ID to operator state evaluations.
// Any operator which consumes this kind SHOULD add its state evaluation information to this field.

View File

@@ -39,7 +39,7 @@ type OperatorStateState string
// Status defines model for Status.
type Status struct {
// additionalFields is reserved for future use
AdditionalFields map[string]interface{} `json:"additionalFields"`
AdditionalFields map[string]interface{} `json:"additionalFields,omitempty"`
// operatorStates is a map of operator ID to operator state evaluations.
// Any operator which consumes this kind SHOULD add its state evaluation information to this field.

View File

@@ -14,7 +14,7 @@ composableKinds: PanelCfg: {
{
schemas: [
{
PanelOptions: {
Options: {
foo: string
} @cuetsy(kind="interface")
},

View File

@@ -6,7 +6,7 @@ composableKinds: PanelCfg: lineage: {
{
schemas: [
{
PanelOptions: {
Options: {
foo: string
} @cuetsy(kind="interface")
},

View File

@@ -5,18 +5,18 @@ import "github.com/grafana/thema"
composableKinds: PanelCfg: {
lineage: {
joinSchema: {
PanelOptions: {...}
PanelFieldConfig: string
Options: {...}
FieldConfig: string
}
name: "panel_conflicting_joinschema"
seqs: [
{
schemas: [
{
PanelOptions: {
Options: {
foo: string
} @cuetsy(kind="interface")
PanelFieldConfig: string
FieldConfig: string
},
]
},

View File

@@ -9,10 +9,10 @@ composableKinds: PanelCfg: {
{
schemas: [
{
PanelOptions: {
Options: {
foo: string
} @cuetsy(kind="interface")
PanelFieldConfig: string
FieldConfig: string
},
]
},

View File

@@ -5,7 +5,7 @@ composableKinds: PanelCfg: lineage: {
{
schemas: [
{
PanelOptions: {
Options: {
foo: string
} @cuetsy(kind="interface")
},