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

Kindsys: Replace "Declaration" with "Definition" (#62515)

Browse Source 
* s/Declaration/Definition/g

* s/DeclForGen/DefForGen/g

* Rename some local vars
This commit is contained in:
sam boyer
2023-01-31 09:50:08 +00:00
committed by GitHub
parent d48a8fd227
commit dbe2f0c8f6
34 changed files with 262 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/kinds/dashboard/dashboard_kind_gen.go
+13 -13
View File
@@ -16,8 +16,8 @@ import (
)
// rootrel is the relative path from the grafana repository root to the
// directory containing the .cue files in which this kind is declared. Necessary
// for runtime errors related to the declaration and/or lineage to provide
// directory containing the .cue files in which this kind is defined. Necessary
// for runtime errors related to the definition and/or lineage to provide
// a real path to the correct .cue file.
const rootrel string = "kinds/dashboard"
@@ -26,7 +26,7 @@ type Kind struct {
lin thema.ConvergentLineage[*Dashboard]
jcodec vmux.Codec
valmux vmux.ValueMux[*Dashboard]
decl kindsys.Decl[kindsys.CoreProperties]
def kindsys.Def[kindsys.CoreProperties]
}
// type guard
@@ -34,22 +34,22 @@ var _ kindsys.Core = &Kind{}
// TODO standard generated docs
func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
decl, err := kindsys.LoadCoreKind(rootrel, rt.Context(), nil)
def, err := kindsys.LoadCoreKind(rootrel, rt.Context(), nil)
if err != nil {
return nil, err
}
k := &Kind{
decl: decl,
def: def,
}
lin, err := decl.Some().BindKindLineage(rt, opts...)
lin, err := def.Some().BindKindLineage(rt, opts...)
if err != nil {
return nil, err
}
// Get the thema.Schema that the meta says is in the current version (which
// codegen ensures is always the latest)
cursch := thema.SchemaP(lin, k.decl.Properties.CurrentVersion)
cursch := thema.SchemaP(lin, k.def.Properties.CurrentVersion)
tsch, err := thema.BindType[*Dashboard](cursch, &Dashboard{})
if err != nil {
// Should be unreachable, modulo bugs in the Thema->Go code generator
@@ -95,19 +95,19 @@ func (k *Kind) JSONValueMux(b []byte) (*Dashboard, thema.TranslationLacunas, err
// TODO standard generated docs
func (k *Kind) Maturity() kindsys.Maturity {
return k.decl.Properties.Maturity
return k.def.Properties.Maturity
}
// Decl returns the [kindsys.Decl] containing both CUE and Go representations of the
// Def returns the [kindsys.Def] containing both CUE and Go representations of the
// dashboard declaration in .cue files.
func (k *Kind) Decl() kindsys.Decl[kindsys.CoreProperties] {
return k.decl
func (k *Kind) Def() kindsys.Def[kindsys.CoreProperties] {
return k.def
}
// Props returns a [kindsys.SomeKindProps], with underlying type [kindsys.CoreProperties],
// representing the static properties declared in the dashboard kind.
//
// This method is identical to calling Decl().Props. It is provided to satisfy [kindsys.Interface].
// This method is identical to calling Def().Props. It is provided to satisfy [kindsys.Interface].
func (k *Kind) Props() kindsys.SomeKindProperties {
return k.decl.Properties
return k.def.Properties
}
pkg/kinds/librarypanel/librarypanel_kind_gen.go
+13 -13
View File
@@ -16,8 +16,8 @@ import (
)
// rootrel is the relative path from the grafana repository root to the
// directory containing the .cue files in which this kind is declared. Necessary
// for runtime errors related to the declaration and/or lineage to provide
// directory containing the .cue files in which this kind is defined. Necessary
// for runtime errors related to the definition and/or lineage to provide
// a real path to the correct .cue file.
const rootrel string = "kinds/librarypanel"
@@ -26,7 +26,7 @@ type Kind struct {
lin thema.ConvergentLineage[*LibraryPanel]
jcodec vmux.Codec
valmux vmux.ValueMux[*LibraryPanel]
decl kindsys.Decl[kindsys.CoreProperties]
def kindsys.Def[kindsys.CoreProperties]
}
// type guard
@@ -34,22 +34,22 @@ var _ kindsys.Core = &Kind{}
// TODO standard generated docs
func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
decl, err := kindsys.LoadCoreKind(rootrel, rt.Context(), nil)
def, err := kindsys.LoadCoreKind(rootrel, rt.Context(), nil)
if err != nil {
return nil, err
}
k := &Kind{
decl: decl,
def: def,
}
lin, err := decl.Some().BindKindLineage(rt, opts...)
lin, err := def.Some().BindKindLineage(rt, opts...)
if err != nil {
return nil, err
}
// Get the thema.Schema that the meta says is in the current version (which
// codegen ensures is always the latest)
cursch := thema.SchemaP(lin, k.decl.Properties.CurrentVersion)
cursch := thema.SchemaP(lin, k.def.Properties.CurrentVersion)
tsch, err := thema.BindType[*LibraryPanel](cursch, &LibraryPanel{})
if err != nil {
// Should be unreachable, modulo bugs in the Thema->Go code generator
@@ -95,19 +95,19 @@ func (k *Kind) JSONValueMux(b []byte) (*LibraryPanel, thema.TranslationLacunas,
// TODO standard generated docs
func (k *Kind) Maturity() kindsys.Maturity {
return k.decl.Properties.Maturity
return k.def.Properties.Maturity
}
// Decl returns the [kindsys.Decl] containing both CUE and Go representations of the
// Def returns the [kindsys.Def] containing both CUE and Go representations of the
// librarypanel declaration in .cue files.
func (k *Kind) Decl() kindsys.Decl[kindsys.CoreProperties] {
return k.decl
func (k *Kind) Def() kindsys.Def[kindsys.CoreProperties] {
return k.def
}
// Props returns a [kindsys.SomeKindProps], with underlying type [kindsys.CoreProperties],
// representing the static properties declared in the librarypanel kind.
//
// This method is identical to calling Decl().Props. It is provided to satisfy [kindsys.Interface].
// This method is identical to calling Def().Props. It is provided to satisfy [kindsys.Interface].
func (k *Kind) Props() kindsys.SomeKindProperties {
return k.decl.Properties
return k.def.Properties
}
pkg/kinds/playlist/playlist_kind_gen.go
+13 -13
View File
@@ -16,8 +16,8 @@ import (
)
// rootrel is the relative path from the grafana repository root to the
// directory containing the .cue files in which this kind is declared. Necessary
// for runtime errors related to the declaration and/or lineage to provide
// directory containing the .cue files in which this kind is defined. Necessary
// for runtime errors related to the definition and/or lineage to provide
// a real path to the correct .cue file.
const rootrel string = "kinds/playlist"
@@ -26,7 +26,7 @@ type Kind struct {
lin thema.ConvergentLineage[*Playlist]
jcodec vmux.Codec
valmux vmux.ValueMux[*Playlist]
decl kindsys.Decl[kindsys.CoreProperties]
def kindsys.Def[kindsys.CoreProperties]
}
// type guard
@@ -34,22 +34,22 @@ var _ kindsys.Core = &Kind{}
// TODO standard generated docs
func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
decl, err := kindsys.LoadCoreKind(rootrel, rt.Context(), nil)
def, err := kindsys.LoadCoreKind(rootrel, rt.Context(), nil)
if err != nil {
return nil, err
}
k := &Kind{
decl: decl,
def: def,
}
lin, err := decl.Some().BindKindLineage(rt, opts...)
lin, err := def.Some().BindKindLineage(rt, opts...)
if err != nil {
return nil, err
}
// Get the thema.Schema that the meta says is in the current version (which
// codegen ensures is always the latest)
cursch := thema.SchemaP(lin, k.decl.Properties.CurrentVersion)
cursch := thema.SchemaP(lin, k.def.Properties.CurrentVersion)
tsch, err := thema.BindType[*Playlist](cursch, &Playlist{})
if err != nil {
// Should be unreachable, modulo bugs in the Thema->Go code generator
@@ -95,19 +95,19 @@ func (k *Kind) JSONValueMux(b []byte) (*Playlist, thema.TranslationLacunas, erro
// TODO standard generated docs
func (k *Kind) Maturity() kindsys.Maturity {
return k.decl.Properties.Maturity
return k.def.Properties.Maturity
}
// Decl returns the [kindsys.Decl] containing both CUE and Go representations of the
// Def returns the [kindsys.Def] containing both CUE and Go representations of the
// playlist declaration in .cue files.
func (k *Kind) Decl() kindsys.Decl[kindsys.CoreProperties] {
return k.decl
func (k *Kind) Def() kindsys.Def[kindsys.CoreProperties] {
return k.def
}
// Props returns a [kindsys.SomeKindProps], with underlying type [kindsys.CoreProperties],
// representing the static properties declared in the playlist kind.
//
// This method is identical to calling Decl().Props. It is provided to satisfy [kindsys.Interface].
// This method is identical to calling Def().Props. It is provided to satisfy [kindsys.Interface].
func (k *Kind) Props() kindsys.SomeKindProperties {
return k.decl.Properties
return k.def.Properties
}
pkg/kinds/preferences/preferences_kind_gen.go
+13 -13
View File
@@ -16,8 +16,8 @@ import (
)
// rootrel is the relative path from the grafana repository root to the
// directory containing the .cue files in which this kind is declared. Necessary
// for runtime errors related to the declaration and/or lineage to provide
// directory containing the .cue files in which this kind is defined. Necessary
// for runtime errors related to the definition and/or lineage to provide
// a real path to the correct .cue file.
const rootrel string = "kinds/preferences"
@@ -26,7 +26,7 @@ type Kind struct {
lin thema.ConvergentLineage[*Preferences]
jcodec vmux.Codec
valmux vmux.ValueMux[*Preferences]
decl kindsys.Decl[kindsys.CoreProperties]
def kindsys.Def[kindsys.CoreProperties]
}
// type guard
@@ -34,22 +34,22 @@ var _ kindsys.Core = &Kind{}
// TODO standard generated docs
func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
decl, err := kindsys.LoadCoreKind(rootrel, rt.Context(), nil)
def, err := kindsys.LoadCoreKind(rootrel, rt.Context(), nil)
if err != nil {
return nil, err
}
k := &Kind{
decl: decl,
def: def,
}
lin, err := decl.Some().BindKindLineage(rt, opts...)
lin, err := def.Some().BindKindLineage(rt, opts...)
if err != nil {
return nil, err
}
// Get the thema.Schema that the meta says is in the current version (which
// codegen ensures is always the latest)
cursch := thema.SchemaP(lin, k.decl.Properties.CurrentVersion)
cursch := thema.SchemaP(lin, k.def.Properties.CurrentVersion)
tsch, err := thema.BindType[*Preferences](cursch, &Preferences{})
if err != nil {
// Should be unreachable, modulo bugs in the Thema->Go code generator
@@ -95,19 +95,19 @@ func (k *Kind) JSONValueMux(b []byte) (*Preferences, thema.TranslationLacunas, e
// TODO standard generated docs
func (k *Kind) Maturity() kindsys.Maturity {
return k.decl.Properties.Maturity
return k.def.Properties.Maturity
}
// Decl returns the [kindsys.Decl] containing both CUE and Go representations of the
// Def returns the [kindsys.Def] containing both CUE and Go representations of the
// preferences declaration in .cue files.
func (k *Kind) Decl() kindsys.Decl[kindsys.CoreProperties] {
return k.decl
func (k *Kind) Def() kindsys.Def[kindsys.CoreProperties] {
return k.def
}
// Props returns a [kindsys.SomeKindProps], with underlying type [kindsys.CoreProperties],
// representing the static properties declared in the preferences kind.
//
// This method is identical to calling Decl().Props. It is provided to satisfy [kindsys.Interface].
// This method is identical to calling Def().Props. It is provided to satisfy [kindsys.Interface].
func (k *Kind) Props() kindsys.SomeKindProperties {
return k.decl.Properties
return k.def.Properties
}
pkg/kinds/publicdashboard/publicdashboard_kind_gen.go
+13 -13
View File
@@ -16,8 +16,8 @@ import (
)
// rootrel is the relative path from the grafana repository root to the
// directory containing the .cue files in which this kind is declared. Necessary
// for runtime errors related to the declaration and/or lineage to provide
// directory containing the .cue files in which this kind is defined. Necessary
// for runtime errors related to the definition and/or lineage to provide
// a real path to the correct .cue file.
const rootrel string = "kinds/publicdashboard"
@@ -26,7 +26,7 @@ type Kind struct {
lin thema.ConvergentLineage[*PublicDashboard]
jcodec vmux.Codec
valmux vmux.ValueMux[*PublicDashboard]
decl kindsys.Decl[kindsys.CoreProperties]
def kindsys.Def[kindsys.CoreProperties]
}
// type guard
@@ -34,22 +34,22 @@ var _ kindsys.Core = &Kind{}
// TODO standard generated docs
func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
decl, err := kindsys.LoadCoreKind(rootrel, rt.Context(), nil)
def, err := kindsys.LoadCoreKind(rootrel, rt.Context(), nil)
if err != nil {
return nil, err
}
k := &Kind{
decl: decl,
def: def,
}
lin, err := decl.Some().BindKindLineage(rt, opts...)
lin, err := def.Some().BindKindLineage(rt, opts...)
if err != nil {
return nil, err
}
// Get the thema.Schema that the meta says is in the current version (which
// codegen ensures is always the latest)
cursch := thema.SchemaP(lin, k.decl.Properties.CurrentVersion)
cursch := thema.SchemaP(lin, k.def.Properties.CurrentVersion)
tsch, err := thema.BindType[*PublicDashboard](cursch, &PublicDashboard{})
if err != nil {
// Should be unreachable, modulo bugs in the Thema->Go code generator
@@ -95,19 +95,19 @@ func (k *Kind) JSONValueMux(b []byte) (*PublicDashboard, thema.TranslationLacuna
// TODO standard generated docs
func (k *Kind) Maturity() kindsys.Maturity {
return k.decl.Properties.Maturity
return k.def.Properties.Maturity
}
// Decl returns the [kindsys.Decl] containing both CUE and Go representations of the
// Def returns the [kindsys.Def] containing both CUE and Go representations of the
// publicdashboard declaration in .cue files.
func (k *Kind) Decl() kindsys.Decl[kindsys.CoreProperties] {
return k.decl
func (k *Kind) Def() kindsys.Def[kindsys.CoreProperties] {
return k.def
}
// Props returns a [kindsys.SomeKindProps], with underlying type [kindsys.CoreProperties],
// representing the static properties declared in the publicdashboard kind.
//
// This method is identical to calling Decl().Props. It is provided to satisfy [kindsys.Interface].
// This method is identical to calling Def().Props. It is provided to satisfy [kindsys.Interface].
func (k *Kind) Props() kindsys.SomeKindProperties {
return k.decl.Properties
return k.def.Properties
}
pkg/kinds/serviceaccount/serviceaccount_kind_gen.go
+13 -13
View File
@@ -16,8 +16,8 @@ import (
)
// rootrel is the relative path from the grafana repository root to the
// directory containing the .cue files in which this kind is declared. Necessary
// for runtime errors related to the declaration and/or lineage to provide
// directory containing the .cue files in which this kind is defined. Necessary
// for runtime errors related to the definition and/or lineage to provide
// a real path to the correct .cue file.
const rootrel string = "kinds/serviceaccount"
@@ -26,7 +26,7 @@ type Kind struct {
lin thema.ConvergentLineage[*ServiceAccount]
jcodec vmux.Codec
valmux vmux.ValueMux[*ServiceAccount]
decl kindsys.Decl[kindsys.CoreProperties]
def kindsys.Def[kindsys.CoreProperties]
}
// type guard
@@ -34,22 +34,22 @@ var _ kindsys.Core = &Kind{}
// TODO standard generated docs
func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
decl, err := kindsys.LoadCoreKind(rootrel, rt.Context(), nil)
def, err := kindsys.LoadCoreKind(rootrel, rt.Context(), nil)
if err != nil {
return nil, err
}
k := &Kind{
decl: decl,
def: def,
}
lin, err := decl.Some().BindKindLineage(rt, opts...)
lin, err := def.Some().BindKindLineage(rt, opts...)
if err != nil {
return nil, err
}
// Get the thema.Schema that the meta says is in the current version (which
// codegen ensures is always the latest)
cursch := thema.SchemaP(lin, k.decl.Properties.CurrentVersion)
cursch := thema.SchemaP(lin, k.def.Properties.CurrentVersion)
tsch, err := thema.BindType[*ServiceAccount](cursch, &ServiceAccount{})
if err != nil {
// Should be unreachable, modulo bugs in the Thema->Go code generator
@@ -95,19 +95,19 @@ func (k *Kind) JSONValueMux(b []byte) (*ServiceAccount, thema.TranslationLacunas
// TODO standard generated docs
func (k *Kind) Maturity() kindsys.Maturity {
return k.decl.Properties.Maturity
return k.def.Properties.Maturity
}
// Decl returns the [kindsys.Decl] containing both CUE and Go representations of the
// Def returns the [kindsys.Def] containing both CUE and Go representations of the
// serviceaccount declaration in .cue files.
func (k *Kind) Decl() kindsys.Decl[kindsys.CoreProperties] {
return k.decl
func (k *Kind) Def() kindsys.Def[kindsys.CoreProperties] {
return k.def
}
// Props returns a [kindsys.SomeKindProps], with underlying type [kindsys.CoreProperties],
// representing the static properties declared in the serviceaccount kind.
//
// This method is identical to calling Decl().Props. It is provided to satisfy [kindsys.Interface].
// This method is identical to calling Def().Props. It is provided to satisfy [kindsys.Interface].
func (k *Kind) Props() kindsys.SomeKindProperties {
return k.decl.Properties
return k.def.Properties
}
pkg/kinds/team/team_kind_gen.go
+13 -13
View File
@@ -16,8 +16,8 @@ import (
)
// rootrel is the relative path from the grafana repository root to the
// directory containing the .cue files in which this kind is declared. Necessary
// for runtime errors related to the declaration and/or lineage to provide
// directory containing the .cue files in which this kind is defined. Necessary
// for runtime errors related to the definition and/or lineage to provide
// a real path to the correct .cue file.
const rootrel string = "kinds/team"
@@ -26,7 +26,7 @@ type Kind struct {
lin thema.ConvergentLineage[*Team]
jcodec vmux.Codec
valmux vmux.ValueMux[*Team]
decl kindsys.Decl[kindsys.CoreProperties]
def kindsys.Def[kindsys.CoreProperties]
}
// type guard
@@ -34,22 +34,22 @@ var _ kindsys.Core = &Kind{}
// TODO standard generated docs
func NewKind(rt *thema.Runtime, opts ...thema.BindOption) (*Kind, error) {
decl, err := kindsys.LoadCoreKind(rootrel, rt.Context(), nil)
def, err := kindsys.LoadCoreKind(rootrel, rt.Context(), nil)
if err != nil {
return nil, err
}
k := &Kind{
decl: decl,
def: def,
}
lin, err := decl.Some().BindKindLineage(rt, opts...)
lin, err := def.Some().BindKindLineage(rt, opts...)
if err != nil {
return nil, err
}
// Get the thema.Schema that the meta says is in the current version (which
// codegen ensures is always the latest)
cursch := thema.SchemaP(lin, k.decl.Properties.CurrentVersion)
cursch := thema.SchemaP(lin, k.def.Properties.CurrentVersion)
tsch, err := thema.BindType[*Team](cursch, &Team{})
if err != nil {
// Should be unreachable, modulo bugs in the Thema->Go code generator
@@ -95,19 +95,19 @@ func (k *Kind) JSONValueMux(b []byte) (*Team, thema.TranslationLacunas, error) {
// TODO standard generated docs
func (k *Kind) Maturity() kindsys.Maturity {
return k.decl.Properties.Maturity
return k.def.Properties.Maturity
}
// Decl returns the [kindsys.Decl] containing both CUE and Go representations of the
// Def returns the [kindsys.Def] containing both CUE and Go representations of the
// team declaration in .cue files.
func (k *Kind) Decl() kindsys.Decl[kindsys.CoreProperties] {
return k.decl
func (k *Kind) Def() kindsys.Def[kindsys.CoreProperties] {
return k.def
}
// Props returns a [kindsys.SomeKindProps], with underlying type [kindsys.CoreProperties],
// representing the static properties declared in the team kind.
//
// This method is identical to calling Decl().Props. It is provided to satisfy [kindsys.Interface].
// This method is identical to calling Def().Props. It is provided to satisfy [kindsys.Interface].
func (k *Kind) Props() kindsys.SomeKindProperties {
return k.decl.Properties
return k.def.Properties
}