lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lang: Refactor the res metaparams helper

Browse Source 
We can do all the actions without returning anything but an error.
This commit is contained in:
James Shubin
2019-01-12 12:34:07 -05:00
parent 10dcf32f3c
commit 451e1122a7
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lang/structs.go
View File

@@ -358,11 +358,9 @@ func (obj *StmtRes) Output() (*interfaces.Output, error) {
} }
edges = append(edges, edgeList...) edges = append(edges, edgeList...)
metaparams, err := obj.metaparams() if err := obj.metaparams(res); err != nil { // set metaparams
if err != nil {
return nil, errwrap.Wrapf(err, "error building meta params") return nil, errwrap.Wrapf(err, "error building meta params")
} }
res.SetMetaParams(metaparams)
resources = append(resources, res) resources = append(resources, res)
} }
@@ -614,9 +612,9 @@ func (obj *StmtRes) edges(resName string) ([]*interfaces.Edge, error) {
return edges, nil return edges, nil
} }
// metaparams is a helper function to generate the metaparams that come from the // metaparams is a helper function to set the metaparams that come from the
// resource. // resource on to the individual resource we're working on.
func (obj *StmtRes) metaparams() (*engine.MetaParams, error) { func (obj *StmtRes) metaparams(res engine.Res) error {
meta := engine.DefaultMetaParams.Copy() // defaults meta := engine.DefaultMetaParams.Copy() // defaults
for _, line := range obj.Contents { for _, line := range obj.Contents {
@@ -628,7 +626,7 @@ func (obj *StmtRes) metaparams() (*engine.MetaParams, error) {
if x.Condition != nil { if x.Condition != nil {
b, err := x.Condition.Value() b, err := x.Condition.Value()
if err != nil { if err != nil {
return nil, err return err
} }
if !b.Bool() { // if value exists, and is false, skip it if !b.Bool() { // if value exists, and is false, skip it
@@ -638,7 +636,7 @@ func (obj *StmtRes) metaparams() (*engine.MetaParams, error) {
v, err := x.MetaExpr.Value() v, err := x.MetaExpr.Value()
if err != nil { if err != nil {
return nil, err return err
} }
switch p := strings.ToLower(x.Property); p { switch p := strings.ToLower(x.Property); p {
@@ -716,11 +714,12 @@ func (obj *StmtRes) metaparams() (*engine.MetaParams, error) {
} }
default: default:
return nil, fmt.Errorf("unknown property: %s", p) return fmt.Errorf("unknown property: %s", p)
} }
} }
return meta, nil res.SetMetaParams(meta) // set it!
return nil
} }
// StmtResContents is the interface that is met by the resource contents. Look // StmtResContents is the interface that is met by the resource contents. Look