(TFECO-7366) Stacks: parse terraform-sources.json to support remote component sources
#1836
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
ansgarm
changed the title
terraform-sources.json to support remote component sources
ansgarm
commented
Sep 30, 2024
| @@ -350,6 +401,8 @@ func (s *RootStore) CallersOfModule(path string) ([]string, error) { | |||
| if record.ModManifest.ContainsLocalModule(path) { | |||
| callers = append(callers, record.path) | |||
| } | |||
|
|
|||
| // TODO: support TerraformSources as well here | |||
| @@ -375,10 +428,28 @@ func (s *RootStore) InstalledModuleCalls(path string) (map[string]tfmod.Installe | |||
| } | |||
| } | |||
| } | |||
| // TODO: support TerraformSources as well here | |||
|
|
||
| fi, err := fs.Stat(terraformSourcesPath) | ||
| if err == nil && fi.Mode().IsRegular() { | ||
| return terraformSourcesDirPath, true // TODO: this is a bit weird and misleading, maybe we should just use the bundle thing reading the dir and catch the proper error or sth like that |
There was a problem hiding this comment.
Unsure whether we need this method at all since the go-slug parser for this file also handles it not existing
There was a problem hiding this comment.
Good point. I think you can remove it and make ParseTerraformSources a bit leaner.
ansgarm
force-pushed
the
parse-terraform-sources
branch
from
180223e
to
6f517c2
Compare
ansgarm
changed the title
terraform-sources.json to support remote component sourcesterraform-sources.json to support remote component sources
ansgarm
force-pushed
the
parse-terraform-sources
branch
from
fe982b4
to
b491749
Compare
ansgarm
force-pushed
the
parse-terraform-sources
branch
2 times, most recently
from
6bcb15e
to
21628e9
Compare
dbanck
reviewed
Oct 30, 2024
| return err | ||
| } | ||
|
|
||
| tfs, err := datadir.ParseTerraformSourcesFromFile(terraformSourcesPath) |
There was a problem hiding this comment.
Can we pass modPath as an argument to this function? This will remove the need for the module path "detection" logic inside that function
| normalizedSource := tfmod.ParseModuleSourceAddr(remote.String()) | ||
| installedModules[normalizedSource.String()] = dir | ||
| } | ||
|
|
There was a problem hiding this comment.
By iterating over sources.RegistryPackages(), we should be able to add support for registry modules as well
| @@ -350,6 +401,8 @@ func (s *RootStore) CallersOfModule(path string) ([]string, error) { | |||
| if record.ModManifest.ContainsLocalModule(path) { | |||
| callers = append(callers, record.path) | |||
| } | |||
|
|
|||
| // TODO: support TerraformSources as well here -> they don't contain local modules though, so we'd need to do this different here for stacks? | |||
There was a problem hiding this comment.
I think we can leave this as is for now. I'm not sure if the module caller command makes sense in a stack context.
|
|
||
| fi, err := fs.Stat(terraformSourcesPath) | ||
| if err == nil && fi.Mode().IsRegular() { | ||
| return terraformSourcesDirPath, true // TODO: this is a bit weird and misleading, maybe we should just use the bundle thing reading the dir and catch the proper error or sth like that |
There was a problem hiding this comment.
Good point. I think you can remove it and make ParseTerraformSources a bit leaner.
…to support completions for remote modules in stacks projects
ansgarm
force-pushed
the
parse-terraform-sources
branch
from
e57e03e
to
b599781
Compare
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.
needs hashicorp/terraform-schema#406
Open tasks