public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kindsys: Unify plugins, pfs with kind framework (#61192)

Browse Source 
* New pfs impl

* Reached codegen parity with old system

* Update all models.cue inputs

* Rename all models.cue files

* Remove unused prefixfs

* Changes Queries->DataQuery schema interface

* Recodegen

* All tests passing, nearly good now

* Add SchemaInterface to kindsys props

* Add pascal name deriver

* Relocate plugin cue files again

* Clarify use of injected fields

* Remove unnecessary aliasing

* Move DataQuery into mudball

* Allow forcing ExpandReferences on go type generation

* Move DataQuery def into kindsys, add generator to copy it to common

* Fix copy generator to replace package name correctly

* Fix duplicate type, test failure

* Fix linting issues
This commit is contained in:
sam boyer
2023-01-20 09:41:35 +00:00
committed by GitHub
parent 6a7cbeae6c
commit 3b3059c9ce
91 changed files with 2192 additions and 1870 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/plugins/manager/testdata/disallowed-cue-import/composable.cue
Vendored
+25
View File
@@ -0,0 +1,25 @@
package grafanaplugin
import (
"github.com/grafana/thema"
"github.com/grafana/grafana/kinds/dashboard:kind"
)
_dummy: coremodel.slots
composableKinds: PanelCfg: {
lineage: {
name: "disallowed_cue_import"
seqs: [
{
schemas: [
{
PanelOptions: {
foo: string
} @cuetsy(kind="interface")
},
]
},
]
}
}
pkg/plugins/manager/testdata/disallowed-cue-import/models.cue
Vendored
-23
View File
@@ -1,23 +0,0 @@
package grafanaplugin
import (
"github.com/grafana/thema"
"github.com/grafana/grafana/kinds/dashboard:kind"
)
_dummy: coremodel.slots
Panel: thema.#Lineage & {
name: "disallowed_cue_import"
seqs: [
{
schemas: [
{
PanelOptions: {
foo: string
} @cuetsy(kind="interface")
},
]
},
]
}
pkg/plugins/manager/testdata/mismatch/plugin.json
Vendored
-14
View File
@@ -1,14 +0,0 @@
{
"type": "panel",
"name": "Slot impl testing",
"id": "mismatch-panel",
"backend": true,
"state": "alpha",
"info": {
"description": "Test",
"author": {
"name": "Grafana Labs",
"url": "https://grafana.com"
}
}
}
pkg/plugins/manager/testdata/missing-kind-datasource/models.cue → pkg/plugins/manager/testdata/missing-kind-datasource/composable_dataquery.cue
Vendored
+1 -4
View File
@@ -1,9 +1,6 @@
package grafanaplugin
import "github.com/grafana/thema"
Query: thema.#Lineage & {
name: "missing_kind_datasource"
composableKinds: DataQuery: lineage: {
seqs: [
{
schemas: [
pkg/plugins/manager/testdata/mismatch/models.cue → pkg/plugins/manager/testdata/name-mismatch-panel/composable_panelcfg.cue
Vendored
+1 -3
View File
@@ -1,8 +1,6 @@
package grafanaplugin
import "github.com/grafana/thema"
Panel: thema.#Lineage & {
composableKinds: PanelCfg: lineage: {
name: "doesnamatch"
seqs: [
{
pkg/plugins/manager/testdata/name-id-mismatch/plugin.json → pkg/plugins/manager/testdata/name-mismatch-panel/plugin.json
Vendored
View File
pkg/plugins/manager/testdata/panel-conflicting-joinschema/composable.cue
Vendored
+25
View File
@@ -0,0 +1,25 @@
package grafanaplugin
import "github.com/grafana/thema"
composableKinds: PanelCfg: {
lineage: {
joinSchema: {
PanelOptions: {...}
PanelFieldConfig: string
}
name: "panel_conflicting_joinschema"
seqs: [
{
schemas: [
{
PanelOptions: {
foo: string
} @cuetsy(kind="interface")
PanelFieldConfig: string
},
]
},
]
}
}
pkg/plugins/manager/testdata/panel-conflicting-joinschema/models.cue
Vendored
-23
View File
@@ -1,23 +0,0 @@
package grafanaplugin
import "github.com/grafana/thema"
Panel: thema.#Lineage & {
joinSchema: {
PanelOptions: {...}
PanelFieldConfig: string
}
name: "panel_conflicting_joinschema"
seqs: [
{
schemas: [
{
PanelOptions: {
foo: string
} @cuetsy(kind="interface")
PanelFieldConfig: string
},
]
},
]
}
pkg/plugins/manager/testdata/panel-does-not-follow-slot-joinschema/composable.cue
Vendored
+21
View File
@@ -0,0 +1,21 @@
package grafanaplugin
import "github.com/grafana/thema"
composableKinds: PanelCfg: {
lineage: {
name: "panel_does_not_follow_slot_joinschema"
seqs: [
{
schemas: [
{
PanelOptions: {
foo: string
} @cuetsy(kind="interface")
PanelFieldConfig: string
},
]
},
]
}
}
pkg/plugins/manager/testdata/panel-does-not-follow-slot-joinschema/models.cue
Vendored
-19
View File
@@ -1,19 +0,0 @@
package grafanaplugin
import "github.com/grafana/thema"
Panel: thema.#Lineage & {
name: "panel_does_not_follow_slot_joinschema"
seqs: [
{
schemas: [
{
PanelOptions: {
foo: string
} @cuetsy(kind="interface")
PanelFieldConfig: string
},
]
},
]
}
pkg/plugins/manager/testdata/valid-model-datasource/composable_dataquery.cue
Vendored
+13
View File
@@ -0,0 +1,13 @@
package grafanaplugin
composableKinds: DataQuery: lineage: {
seqs: [
{
schemas: [
{
foo: string
},
]
},
]
}
pkg/plugins/manager/testdata/valid-model-datasource/composable_datasourcecfg.cue
Vendored
+18
View File
@@ -0,0 +1,18 @@
package grafanaplugin
composableKinds: DataSourceCfg: lineage: {
seqs: [
{
schemas: [
{
Options: {
foo: string
}
SecureOptions: {
bar: string
}
},
]
},
]
}
pkg/plugins/manager/testdata/valid-model-datasource/models.cue
Vendored
-34
View File
@@ -1,34 +0,0 @@
package grafanaplugin
import "github.com/grafana/thema"
Query: thema.#Lineage & {
name: "valid_model_datasource"
seqs: [
{
schemas: [
{
foo: string
},
]
},
]
}
DSOptions: thema.#Lineage & {
name: "valid_model_datasource"
seqs: [
{
schemas: [
{
Options: {
foo: string
}
SecureOptions: {
bar: string
}
},
]
},
]
}
pkg/plugins/manager/testdata/name-id-mismatch/models.cue → pkg/plugins/manager/testdata/valid-model-panel/composable.cue
Vendored
+1 -4
View File
@@ -1,9 +1,6 @@
package grafanaplugin
import "github.com/grafana/thema"
Panel: thema.#Lineage & {
name: "mismatch"
composableKinds: PanelCfg: lineage: {
seqs: [
{
schemas: [
pkg/plugins/manager/testdata/valid-model-panel/models.cue
Vendored
-18
View File
@@ -1,18 +0,0 @@
package grafanaplugin
import "github.com/grafana/thema"
Panel: thema.#Lineage & {
name: "valid_model_panel"
seqs: [
{
schemas: [
{
PanelOptions: {
foo: string
} @cuetsy(kind="interface")
},
]
},
]
}
pkg/plugins/manager/testdata/wrong-slot-panel/models.cue
Vendored
-31
View File
@@ -1,31 +0,0 @@
package grafanaplugin
import "github.com/grafana/thema"
Query: thema.#Lineage & {
name: "wrong_slot_panel"
seqs: [
{
schemas: [
{
foo: string
},
]
},
]
}
Panel: thema.#Lineage & {
name: "wrong_slot_panel"
seqs: [
{
schemas: [
{
PanelOptions: {
foo: string
} @cuetsy(kind="interface")
},
]
},
]
}
pkg/plugins/manager/testdata/wrong-slot-panel/plugin.json
Vendored
-14
View File
@@ -1,14 +0,0 @@
{
"type": "panel",
"name": "Wrong slot for type",
"id": "wrong-slot-panel",
"backend": true,
"state": "alpha",
"info": {
"description": "Test",
"author": {
"name": "Grafana Labs",
"url": "https://grafana.com"
}
}
}