bake: allow user functions in variables and vice-versa #575
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
tonistiigi
force-pushed
the
user-func-vars
branch
2 times, most recently
from
2ca6218
to
ce655c4
Compare
tiborvass
reviewed
Mar 27, 2021
tiborvass
reviewed
Mar 27, 2021
|
|
||
| def, ok := sc.attrs[name] | ||
| func appendJSONFuncCalls(exp hcl.Expression, m map[string]struct{}) error { | ||
| v := reflect.ValueOf(exp) |
There was a problem hiding this comment.
if you want to make this hackier but more readable, you might as well abuse //go:linkname to import those private structs.
There was a problem hiding this comment.
not that it is any cleaner but I don't think it would even work. I don't just need access to a private function/var in here.
|
@tonistiigi Tested on my side and LGTM. Maybe we should wait for hashicorp/hcl#455 before merge? |
|
I don't think we can wait for hashicorp/hcl#455 . If there is movement we can replace the code. |
crazy-max
approved these changes
May 5, 2021
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
depends on #541Removes previous limitations where user-defined functions could not be used in variables and function definitions could not call other functions.
I at least temporarily needed to fork
userfuncpackage to make this work. The package is not very big but I already sent a PR to upstream with the same refactor. A more complicated story is parsing function dependencies from JSON that isn't really available with the current API. I added a hacky version with reflect package and opened an issue in upstream to find a better solution.Some of the parsing logic could use a reorganization but didn't want to do it yet as much work is still needed to get #445 working first. After that, we can think about cleanups.