fix(terraform): Handle explicitly-specified tfvars explicitly #7107
Conversation
This file contains hidden or 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
Contributor
omriyoffe-panw
left a comment
There was a problem hiding this comment.
Hey @thentenaar,
First of all thank you for your contribution!
I left a few minor comments, however along with them I am not sure I understand your use of the "explicit" variable. If I understand correctly the goal is to allow for .tfvars file in sub-directories of the project using the -var-file flag. I saw you implemented a search on the directory for .tfvars files but I don't see why you would need the "explicit" variable and I can see some use cases where it might allow for files other then .tfvars to be passed in the flag causing errors.
Would love if you could add a short explanation for this implementation.
Thanks!
gruebel
reviewed
Apr 21, 2025
Contributor
gruebel
left a comment
There was a problem hiding this comment.
overall the suggested implementation doesn't reflect the actual Terraform behavior and with the added explicit marker makes it harder to maintain than it actually should be, because it is not a simple override mechanism but rather a hierarchical resolution order.
* Allow for ``--var-file`` arguments outside of the tf dir to be handled correctly. * Use a dict to enforce tfvars precedence, grouping vars by the directory for which they were defined, reducing the number of tfvar nodes added to the graph for a given directory. * Create variable -> tfvars edges based on the directory for which the var was defined. * Have _load_files take a list of str instead of os.DirEntry. * Changed a usage of printf() to logging.debug()
lirshindalman
approved these changes
Jun 5, 2025
omriyoffe-panw
approved these changes
Jun 5, 2025
Saarett
pushed a commit
that referenced
this pull request
Jun 5, 2025
fix(terraform): Handle explicitly-specified vars explicitly * Allow for ``--var-file`` arguments outside of the tf dir to be handled correctly. * Use a dict to enforce tfvars precedence, grouping vars by the directory for which they were defined, reducing the number of tfvar nodes added to the graph for a given directory. * Create variable -> tfvars edges based on the directory for which the var was defined. * Have _load_files take a list of str instead of os.DirEntry. * Changed a usage of printf() to logging.debug()
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
Description
--var-filearguments outside of the tf dir to be handled correctlyFixes #4321
Checklist: