Skip to content

Commit 511881a

Browse files
committed
[WIP]
1 parent c9edd32 commit 511881a

5 files changed

Lines changed: 235 additions & 553 deletions

File tree

cmd/config.go

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -82,46 +82,46 @@ func GlobalCfg(config *ng.ArgNode) error {
8282
return nil
8383
}
8484

85-
func ValidateCfg(cfgs []byte) []string {
86-
var cfg any
87-
err := yaml.Unmarshal(cfgs, &cfg)
88-
if err != nil {
89-
return []string{err.Error()}
90-
}
91-
92-
nodes := &ng.ArgNode{}
93-
err = nodes.FromAny(cfg)
94-
if err != nil {
95-
return []string{err.Error()}
96-
}
97-
98-
if err := Dedref(nodes); err != nil {
99-
return []string{err.Error()}
100-
}
101-
102-
if err := ng.AssertArg(nodes, TopLevelConfigAssertion); err != nil {
103-
return []string{err.Error()}
104-
}
105-
106-
space := ng.Space{
107-
Services: map[string]any{
108-
"sys": true,
109-
},
110-
Refs: ng.Registry(),
111-
AssertRefs: ng.AssertionsRegistry(),
112-
ServiceKinds: map[string]string{},
113-
}
114-
115-
errs := []string{}
116-
117-
errors := space.Validate(nodes)
118-
119-
if len(errors) > 0 {
120-
for _, err := range errors {
121-
errs = append(errs, err.Error())
122-
}
123-
return errs
124-
}
125-
126-
return nil
127-
}
85+
// func ValidateCfg(cfgs []byte) []string {
86+
// var cfg any
87+
// err := yaml.Unmarshal(cfgs, &cfg)
88+
// if err != nil {
89+
// return []string{err.Error()}
90+
// }
91+
92+
// nodes := &ng.ArgNode{}
93+
// err = nodes.FromAny(cfg)
94+
// if err != nil {
95+
// return []string{err.Error()}
96+
// }
97+
98+
// if err := Dedref(nodes); err != nil {
99+
// return []string{err.Error()}
100+
// }
101+
102+
// if err := ng.AssertArg(nodes, TopLevelConfigAssertion); err != nil {
103+
// return []string{err.Error()}
104+
// }
105+
106+
// space := ng.Space{
107+
// Services: map[string]any{
108+
// "sys": true,
109+
// },
110+
// Refs: ng.Registry(),
111+
// AssertRefs: ng.AssertionsRegistry(),
112+
// ServiceKinds: map[string]string{},
113+
// }
114+
115+
// errs := []string{}
116+
117+
// errors := space.Validate(nodes)
118+
119+
// if len(errors) > 0 {
120+
// for _, err := range errors {
121+
// errs = append(errs, err.Error())
122+
// }
123+
// return errs
124+
// }
125+
126+
// return nil
127+
// }

cmd/parser.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ var TopLevelConfigAssertion = ng.Assert{
2323
Type: "map",
2424
Sub: ng.AssertMap{
2525
"name": {Type: "string", Default: "_"},
26-
"recv": {Type: "string", Default: ""},
2726
"kind": {Type: "string", Required: true},
2827
"spec": {Type: "any"},
2928
},

0 commit comments

Comments
 (0)