DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

Lowercase yaml aux stucts, cleanup

Browse Source
This commit is contained in:
Denis Arh 2020-10-23 09:24:26 +02:00 committed by Tomaž Jerman
parent efe51b83f4
commit c400a5873f
13 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
pkg/envoy/yaml/applications.go
View File

@ -1,6 +1,7 @@
package yaml
import (
"github.com/cortezaproject/corteza-server/pkg/envoy"
"github.com/cortezaproject/corteza-server/system/types"
"gopkg.in/yaml.v3"
)
@ -11,7 +12,7 @@ type (
res *types.Application `yaml:",inline"`
// all known modules on a application
modules ComposeModuleSet
modules composeModuleSet
// module's RBAC rules
*rbacRules
@ -56,20 +57,19 @@ func (wset *applicationSet) UnmarshalYAML(n *yaml.Node) error {
})
}
//func (wset applicationSet) MarshalEnvoy() ([]envoy.Node, error) {
// // application usually have bunch of sub-resources defined
// nn := make([]envoy.Node, 0, len(wset)*10)
//
// for _, res := range wset {
// if tmp, err := res.MarshalEnvoy(); err != nil {
// return nil, err
// } else {
// nn = append(nn, tmp...)
// }
// }
//
// return nn, nil
//}
func (wset applicationSet) MarshalEnvoy() ([]envoy.Node, error) {
nn := make([]envoy.Node, 0, len(wset))
for _, res := range wset {
if tmp, err := res.MarshalEnvoy(); err != nil {
return nil, err
} else {
nn = append(nn, tmp...)
}
}
return nn, nil
}
func (wrap *application) UnmarshalYAML(n *yaml.Node) (err error) {
if !isKind(n, yaml.MappingNode) {
@ -91,23 +91,23 @@ func (wrap *application) UnmarshalYAML(n *yaml.Node) (err error) {
return nil
}
//func (wrap application) MarshalEnvoy() ([]envoy.Node, error) {
// nn := make([]envoy.Node, 0, 1+len(wrap.modules))
// nn = append(nn, &envoy.ApplicationNode{Ns: wrap.res})
//
// if tmp, err := wrap.modules.MarshalEnvoy(); err != nil {
// return nil, err
// } else {
// nn = append(nn, tmp...)
// }
//
// // @todo rbac
//
// //if tmp, err := wrap.rules.MarshalEnvoy(); err != nil {
// // return nil, err
// //} else {
// // nn = append(nn, tmp...)
// //}
//
// return nn, nil
//}
func (wrap application) MarshalEnvoy() ([]envoy.Node, error) {
nn := make([]envoy.Node, 0, 1+len(wrap.modules))
nn = append(nn, &envoy.ApplicationNode{Ns: wrap.res})
if tmp, err := wrap.modules.MarshalEnvoy(); err != nil {
return nil, err
} else {
nn = append(nn, tmp...)
}
// @todo rbac
//if tmp, err := wrap.rules.MarshalEnvoy(); err != nil {
// return nil, err
//} else {
// nn = append(nn, tmp...)
//}
return nn, nil
}

6
pkg/envoy/yaml/compose.go
View File

@ -7,9 +7,9 @@ import (
type (
compose struct {
namespaces ComposeNamespaceSet
modules ComposeModuleSet
records ComposeRecordSet
namespaces composeNamespaceSet
modules composeModuleSet
records composeRecordSet
pages composePageSet
charts composeChartSet
}

30
pkg/envoy/yaml/compose_module.go
View File

@ -9,24 +9,24 @@ import (
)
type (
ComposeModule struct {
composeModule struct {
res *types.Module
refNamespace string
*rbacRules
}
ComposeModuleSet []*ComposeModule
composeModuleSet []*composeModule
ComposeModuleField struct {
composeModuleField struct {
res *types.ModuleField `yaml:",inline"`
*rbacRules
}
ComposeModuleFieldSet []*ComposeModuleField
composeModuleFieldSet []*composeModuleField
)
func (wset *ComposeModuleSet) UnmarshalYAML(n *yaml.Node) error {
func (wset *composeModuleSet) UnmarshalYAML(n *yaml.Node) error {
return each(n, func(k, v *yaml.Node) (err error) {
var (
wrap = &ComposeModule{}
wrap = &composeModule{}
)
if v == nil {
@ -51,7 +51,7 @@ func (wset *ComposeModuleSet) UnmarshalYAML(n *yaml.Node) error {
})
}
func (wset ComposeModuleSet) setNamespaceRef(ref string) error {
func (wset composeModuleSet) setNamespaceRef(ref string) error {
for _, res := range wset {
if res.refNamespace != "" && ref != res.refNamespace {
return fmt.Errorf("cannot override namespace reference %s with %s", res.refNamespace, ref)
@ -63,7 +63,7 @@ func (wset ComposeModuleSet) setNamespaceRef(ref string) error {
return nil
}
func (wset ComposeModuleSet) MarshalEnvoy() ([]envoy.Node, error) {
func (wset composeModuleSet) MarshalEnvoy() ([]envoy.Node, error) {
// namespace usually have bunch of sub-resources defined
nn := make([]envoy.Node, 0, len(wset)*10)
@ -78,7 +78,7 @@ func (wset ComposeModuleSet) MarshalEnvoy() ([]envoy.Node, error) {
return nn, nil
}
func (wrap *ComposeModule) UnmarshalYAML(n *yaml.Node) (err error) {
func (wrap *composeModule) UnmarshalYAML(n *yaml.Node) (err error) {
if wrap.res == nil {
wrap.rbacRules = &rbacRules{}
wrap.res = &types.Module{}
@ -102,7 +102,7 @@ func (wrap *ComposeModule) UnmarshalYAML(n *yaml.Node) (err error) {
}
var (
aux = ComposeModuleFieldSet{}
aux = composeModuleFieldSet{}
)
if err = v.Decode(&aux); err != nil {
@ -118,17 +118,17 @@ func (wrap *ComposeModule) UnmarshalYAML(n *yaml.Node) (err error) {
})
}
func (wrap ComposeModule) MarshalEnvoy() ([]envoy.Node, error) {
func (wrap composeModule) MarshalEnvoy() ([]envoy.Node, error) {
nn := make([]envoy.Node, 0, 16)
nn = append(nn, &envoy.ComposeModuleNode{Module: wrap.res})
return nn, nil
}
func (set *ComposeModuleFieldSet) UnmarshalYAML(n *yaml.Node) error {
func (set *composeModuleFieldSet) UnmarshalYAML(n *yaml.Node) error {
return each(n, func(k, v *yaml.Node) (err error) {
var (
wrap = &ComposeModuleField{}
wrap = &composeModuleField{}
)
if v == nil {
@ -153,7 +153,7 @@ func (set *ComposeModuleFieldSet) UnmarshalYAML(n *yaml.Node) error {
})
}
func (set ComposeModuleFieldSet) set() (out types.ModuleFieldSet) {
func (set composeModuleFieldSet) set() (out types.ModuleFieldSet) {
for _, i := range set {
out = append(out, i.res)
}
@ -161,7 +161,7 @@ func (set ComposeModuleFieldSet) set() (out types.ModuleFieldSet) {
return out
}
func (wrap *ComposeModuleField) UnmarshalYAML(n *yaml.Node) (err error) {
func (wrap *composeModuleField) UnmarshalYAML(n *yaml.Node) (err error) {
if wrap.res == nil {
wrap.res = &types.ModuleField{}
}

4
pkg/envoy/yaml/compose_module_test.go
View File

@ -8,8 +8,8 @@ import (
func TestComposeModule_UnmarshalYAML(t *testing.T) {
var (
parseString = func(src string) (*ComposeModule, error) {
w := &ComposeModule{}
parseString = func(src string) (*composeModule, error) {
w := &composeModule{}
return w, yaml.Unmarshal([]byte(src), w)
}
)

18
pkg/envoy/yaml/compose_namespace.go
View File

@ -8,18 +8,18 @@ import (
)
type (
ComposeNamespace struct {
composeNamespace struct {
// when namespace is at least partially defined
res *types.Namespace `yaml:",inline"`
// all known modules on a namespace
modules ComposeModuleSet
modules composeModuleSet
// all known charts on a namespace
charts composeChartSet
// all known records on a namespace
records ComposeRecordSet
records composeRecordSet
// all known pages on a namespace
pages composePageSet
@ -27,7 +27,7 @@ type (
// module's RBAC rules
*rbacRules
}
ComposeNamespaceSet []*ComposeNamespace
composeNamespaceSet []*composeNamespace
)
// UnmarshalYAML resolves set of namespace definitions, either sequence or map
@ -35,10 +35,10 @@ type (
// When resolving map, key is used as slug
//
//
func (wset *ComposeNamespaceSet) UnmarshalYAML(n *yaml.Node) error {
func (wset *composeNamespaceSet) UnmarshalYAML(n *yaml.Node) error {
return each(n, func(k, v *yaml.Node) (err error) {
var (
wrap = &ComposeNamespace{}
wrap = &composeNamespace{}
)
if v == nil {
@ -67,7 +67,7 @@ func (wset *ComposeNamespaceSet) UnmarshalYAML(n *yaml.Node) error {
})
}
func (wset ComposeNamespaceSet) MarshalEnvoy() ([]envoy.Node, error) {
func (wset composeNamespaceSet) MarshalEnvoy() ([]envoy.Node, error) {
// namespace usually have bunch of sub-resources defined
nn := make([]envoy.Node, 0, len(wset)*10)
@ -82,7 +82,7 @@ func (wset ComposeNamespaceSet) MarshalEnvoy() ([]envoy.Node, error) {
return nn, nil
}
func (wrap *ComposeNamespace) UnmarshalYAML(n *yaml.Node) (err error) {
func (wrap *composeNamespace) UnmarshalYAML(n *yaml.Node) (err error) {
if !isKind(n, yaml.MappingNode) {
return nodeErr(n, "namespace definition must be a map or scalar")
}
@ -122,7 +122,7 @@ func (wrap *ComposeNamespace) UnmarshalYAML(n *yaml.Node) (err error) {
})
}
func (wrap ComposeNamespace) MarshalEnvoy() ([]envoy.Node, error) {
func (wrap composeNamespace) MarshalEnvoy() ([]envoy.Node, error) {
nn := make([]envoy.Node, 0, 1+len(wrap.modules))
nn = append(nn, &envoy.ComposeNamespaceNode{Ns: wrap.res})

6
pkg/envoy/yaml/compose_namespace_test.go
View File

@ -10,8 +10,8 @@ import (
func TestComposeNamespace_UnmarshalYAML(t *testing.T) {
var (
parseString = func(src string) (*ComposeNamespace, error) {
w := &ComposeNamespace{}
parseString = func(src string) (*composeNamespace, error) {
w := &composeNamespace{}
return w, yaml.Unmarshal([]byte(src), w)
}
)
@ -67,7 +67,7 @@ func TestComposeNamespace_MarshalEnvoy(t *testing.T) {
var (
req = require.New(t)
wrap = ComposeNamespace{res: &types.Namespace{ID: 42}}
wrap = composeNamespace{res: &types.Namespace{ID: 42}}
nn, err = wrap.MarshalEnvoy()
)

22
pkg/envoy/yaml/compose_record.go
View File

@ -8,7 +8,7 @@ import (
)
type (
ComposeRecord struct {
composeRecord struct {
res *types.Record `yaml:",inline"`
refModule string
refNamespace string
@ -18,9 +18,9 @@ type (
refOwnedBy string
*rbacRules
}
ComposeRecordSet []*ComposeRecord
composeRecordSet []*composeRecord
ComposeRecordValues struct {
composeRecordValues struct {
rvs types.RecordValueSet
}
)
@ -31,7 +31,7 @@ type (
//
// { module-handle: [ { ... values ... } ] }
// [ { module: module-handle, ... values ... } ]
func (wset *ComposeRecordSet) UnmarshalYAML(n *yaml.Node) error {
func (wset *composeRecordSet) UnmarshalYAML(n *yaml.Node) error {
return each(n, func(k, v *yaml.Node) (err error) {
var (
moduleRef string
@ -48,7 +48,7 @@ func (wset *ComposeRecordSet) UnmarshalYAML(n *yaml.Node) error {
if isKind(v, yaml.SequenceNode) {
// multiple records defined
return eachSeq(v, func(r *yaml.Node) error {
var wrap = &ComposeRecord{refModule: moduleRef}
var wrap = &composeRecord{refModule: moduleRef}
if err = r.Decode(&wrap); err != nil {
return err
}
@ -60,7 +60,7 @@ func (wset *ComposeRecordSet) UnmarshalYAML(n *yaml.Node) error {
if isKind(v, yaml.MappingNode) {
// one record defined
var wrap = &ComposeRecord{refModule: moduleRef}
var wrap = &composeRecord{refModule: moduleRef}
if err = v.Decode(&wrap); err != nil {
return
}
@ -72,7 +72,7 @@ func (wset *ComposeRecordSet) UnmarshalYAML(n *yaml.Node) error {
})
}
func (wset ComposeRecordSet) MarshalEnvoy() ([]envoy.Node, error) {
func (wset composeRecordSet) MarshalEnvoy() ([]envoy.Node, error) {
// namespace usually have bunch of sub-resources defined
var (
nn = []envoy.Node{}
@ -83,7 +83,7 @@ func (wset ComposeRecordSet) MarshalEnvoy() ([]envoy.Node, error) {
return nn, nil
}
func (set ComposeRecordSet) setNamespaceRef(ref string) error {
func (set composeRecordSet) setNamespaceRef(ref string) error {
for _, res := range set {
if res.refNamespace != "" && ref != res.refNamespace {
return fmt.Errorf("cannot override namespace reference %s with %s", res.refNamespace, ref)
@ -95,7 +95,7 @@ func (set ComposeRecordSet) setNamespaceRef(ref string) error {
return nil
}
func (wrap *ComposeRecord) UnmarshalYAML(n *yaml.Node) (err error) {
func (wrap *composeRecord) UnmarshalYAML(n *yaml.Node) (err error) {
if wrap.res == nil {
wrap.rbacRules = &rbacRules{}
wrap.res = &types.Record{}
@ -113,7 +113,7 @@ func (wrap *ComposeRecord) UnmarshalYAML(n *yaml.Node) (err error) {
case "values":
// Use aux structure to decode record values into RVS
aux := ComposeRecordValues{}
aux := composeRecordValues{}
if err := v.Decode(&aux); err != nil {
return err
}
@ -146,7 +146,7 @@ func (wrap *ComposeRecord) UnmarshalYAML(n *yaml.Node) (err error) {
//
// { <field name>: ... <scalar value>, .... }
// { <field name>: [ <scalar value> ], .... }
func (wset *ComposeRecordValues) UnmarshalYAML(n *yaml.Node) error {
func (wset *composeRecordValues) UnmarshalYAML(n *yaml.Node) error {
wset.rvs = types.RecordValueSet{}
return eachMap(n, func(k, v *yaml.Node) error {

4
pkg/envoy/yaml/compose_record_test.go
View File

@ -8,8 +8,8 @@ import (
func TestComposeRecord_UnmarshalYAML(t *testing.T) {
var (
parseString = func(src string) (*ComposeRecord, error) {
w := &ComposeRecord{}
parseString = func(src string) (*composeRecord, error) {
w := &composeRecord{}
return w, yaml.Unmarshal([]byte(src), w)
}
)

6
pkg/envoy/yaml/decoder.go
View File

@ -108,7 +108,7 @@ func (y *decoder) Decode(ctx context.Context, r io.Reader, i os.FileInfo) ([]env
// return nn, nil
//}
//func (y *decoder) convertNamespaces(nss ComposeNamespaceSet) ([]envoy.Node, error) {
//func (y *decoder) convertNamespaces(nss composeNamespaceSet) ([]envoy.Node, error) {
// nn := make([]envoy.Node, 0, 2)
//
// for _, ns := range nss {
@ -129,7 +129,7 @@ func (y *decoder) Decode(ctx context.Context, r io.Reader, i os.FileInfo) ([]env
// return nn, nil
//}
//
//func (y *decoder) convertModules(mm ComposeModuleSet, ns *types.Namespace) ([]envoy.Node, error) {
//func (y *decoder) convertModules(mm composeModuleSet, ns *types.Namespace) ([]envoy.Node, error) {
// nn := make([]envoy.Node, 0)
//
// for _, m := range mm {
@ -144,7 +144,7 @@ func (y *decoder) Decode(ctx context.Context, r io.Reader, i os.FileInfo) ([]env
// return nn, nil
//}
//
//func (y *decoder) convertRecords(rr ComposeRecordSet, m *types.Module) ([]envoy.Node, error) {
//func (y *decoder) convertRecords(rr composeRecordSet, m *types.Module) ([]envoy.Node, error) {
// // Iterator function for providing records to be imported.
// // This doesn't do any validation; that should be handled by other layers.
// f := func(f func(record *types.Record) error) error {

0
pkg/envoy/yaml/doc.go → pkg/envoy/yaml/document.go
View File

0
pkg/envoy/yaml/doc_test.go → pkg/envoy/yaml/document_test.go
View File

2
pkg/envoy/yaml/role.go
View File

@ -11,7 +11,7 @@ type (
res *types.Role
// all known modules on a role
modules ComposeModuleSet
modules composeModuleSet
// module's RBAC rules
*rbacRules

2
pkg/envoy/yaml/user.go
View File

@ -11,7 +11,7 @@ type (
res *types.User `yaml:",inline"`
// all known modules on a user
modules ComposeModuleSet
modules composeModuleSet
// module's RBAC rules
*rbacRules