Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix] if condition not found do nothing #169

Merged
merged 5 commits into from
Mar 10, 2019
Merged

[Fix] if condition not found do nothing #169

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c7504db
[Fix] if condition not found do nothing
Feb 8, 2019
5f75825
Merge branch 'master' into graham/leave-conditions-alone
PaulMaddox Mar 9, 2019
eaeafc8
Merge branch 'master' into graham/leave-conditions-alone
PaulMaddox Mar 10, 2019
2d9d200
Merge branch 'master' into graham/leave-conditions-alone
PaulMaddox Mar 10, 2019
f1ca5b2
Merge branch 'master' into graham/leave-conditions-alone
PaulMaddox Mar 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions intrinsics/intrinsics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,10 @@ func search(input interface{}, template interface{}, options *ProcessorOptions)
if key == "Condition" {
// This can lead to infinite recursion A -> B; B -> A;
// pass state of the conditions that we're evaluating so we can detect cycles
// in case of cycle, return nil
return condition(key, search(val, template, options), template, options)
// in case of cycle or not found, do nothing
if con := condition(key, search(val, template, options), template, options); con != nil {
return con
}
}

// This is not an intrinsic function, recurse through it normally
Expand Down