Modules support relative path 2 #1726
Merged
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
3 tasks
wildum
force-pushed
the
modules-support-relative-path-2
branch
from
7bdd35b to
69b8022
Compare
wildum
commented
Sep 23, 2024
thampiotr
reviewed
Sep 24, 2024
|
Another idea, which I think could be powerful and simple for users to work with: if a file has a relative path in it, it is relative to that file's location. |
thampiotr
reviewed
Sep 26, 2024
@bentonam would be a good candidate |
thampiotr
approved these changes
Oct 14, 2024
internal/runtime/alloy.go
Outdated
| ComponentBlocks: source.components, | ||
| ConfigBlocks: source.configBlocks, | ||
| DeclareBlocks: source.declareBlocks, | ||
| ArgScope: &vm.Scope{ |
There was a problem hiding this comment.
What are the rules for the vm.Scope now? Does it always need to have either a Parent or ModulePath set?
I think the way it's instantiated now is error-prone. I would prefer to have specialised constructors in vm package that enforce correct creation of vm.Scope so that we don't make mistakes or have semantic merge conflicts that result in bugs.
Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
wildum
force-pushed
the
modules-support-relative-path-2
branch
from
f2c018c to
72440bd
Compare
clayton-cornell
approved these changes
Oct 16, 2024
clayton-cornell
added
the
type/docs
Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
…alloy into modules-support-relative-path-2
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
PR Description
This PR introduces an ArgScope to the loader that will be used as a parent scope when evaluating the nodes in the module. For now, it contains only one variable "module_path" that represents the current path of the module and can be used in the config. Both can be used together to configure a relative path on the import.file block.
import.file “default” { filename = file.path_join(module_path, "relative/path") }The following use-cases are currently supported:
import.file in a module imported via import.file (module_path = filename of the parent import.file)
import.file in a module imported via import.git (module_path = path to the local cloned repo)
import.file in a module imported via import.string (module_path = path of the current module)
Which issue(s) this PR fixes
Fixes #786
Notes to the Reviewer
This was an old PR that I revived now that the stdlib has been updated.
I recommend reviewing commit by commit.
PR Checklist