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

lang: funcs: Send empty values when appropriate

Browse Source 
I seem to have forgotten to differentiate between the empty string and
no data because the zero value for the stored result was the empty
string. This turns it into a pointer so that we don't block the function
engine if a template or one of the other patched functions sends an
empty string as the first value.
This commit is contained in:
James Shubin
2019-12-30 12:35:08 -05:00
parent ff20e67d07
commit 762c53fb8d
10 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lang/funcs/core/deploy/abspath_func.go
View File

@@ -43,8 +43,8 @@ type AbsPathFunc struct {
data *interfaces.FuncData
last types.Value // last value received to use for diff
path string // the active path
result string // last calculated output
path string // the active path
result *string // last calculated output
closeChan chan struct{}
}
@@ -130,10 +130,10 @@ func (obj *AbsPathFunc) Stream() error {
}
result += obj.path
if obj.result == result {
if obj.result != nil && *obj.result == result {
continue // result didn't change
}
obj.result = result // store new result
obj.result = &result // store new result
case <-obj.closeChan:
return nil
@@ -141,7 +141,7 @@ func (obj *AbsPathFunc) Stream() error {
select {
case obj.init.Output <- &types.StrValue{
V: obj.result,
V: *obj.result,
}:
case <-obj.closeChan:
return nil