ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config/module: can load a tree properly

This commit is contained in:
Mitchell Hashimoto 2014-09-14 20:00:17 -07:00
parent e96fe43814
commit 85d1e40644
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/module/module.go
View File

@ -4,5 +4,4 @@ package module
type Module struct { type Module struct {
Name string Name string
Source string Source string
Dir string
} }

1
config/module/test-fixtures/basic/foo/main.tf Normal file
View File

@ -0,0 +1 @@
# Hello

4
config/module/tree.go
View File

@ -69,7 +69,7 @@ func (t *Tree) Modules() []*Module {
result := make([]*Module, len(t.config.Modules)) result := make([]*Module, len(t.config.Modules))
for i, m := range t.config.Modules { for i, m := range t.config.Modules {
result[i] = &Module{ result[i] = &Module{
Name: m.Name, Name: m.Name,
Source: m.Source, Source: m.Source,
} }
} }
@ -101,7 +101,7 @@ func (t *Tree) Load(s Storage, mode GetMode) error {
// Go through all the modules and get the directory for them. // Go through all the modules and get the directory for them.
update := mode == GetModeUpdate update := mode == GetModeUpdate
for i, m := range modules { for i, m := range modules {
source, err := Detect(m.Source, m.Dir) source, err := Detect(m.Source, t.config.Dir)
if err != nil { if err != nil {
return fmt.Errorf("module %s: %s", m.Name, err) return fmt.Errorf("module %s: %s", m.Name, err)
} }