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

Fix CWD plugin loading.

This commit is contained in:
Mitchell Hashimoto 2014-09-25 22:39:31 -07:00
parent f05b2411e9
commit eabd8b1cc5
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,4 +1,4 @@
## 0.2.3 (unreleased) ## 0.3.0 (unreleased)
IMPROVEMENTS: IMPROVEMENTS:
@ -10,6 +10,7 @@ BUG FIXES:
* core: Providers are validated even without a `provider` block. [GH-284] * core: Providers are validated even without a `provider` block. [GH-284]
* core: In the case of error, walk all non-dependent trees. * core: In the case of error, walk all non-dependent trees.
* core: Plugin loading from CWD works properly.
* providers/aws: autoscaling_group can be launched into a vpc [GH-259] * providers/aws: autoscaling_group can be launched into a vpc [GH-259]
## 0.2.2 (September 9, 2014) ## 0.2.2 (September 9, 2014)

8
config.go
View File

@ -114,6 +114,14 @@ func (c1 *Config) Merge(c2 *Config) *Config {
func (c *Config) discover(path string) error { func (c *Config) discover(path string) error {
var err error var err error
if !filepath.IsAbs(path) {
path, err = filepath.Abs(path)
if err != nil {
return err
}
}
err = c.discoverSingle( err = c.discoverSingle(
filepath.Join(path, "terraform-provider-*"), &c.Providers) filepath.Join(path, "terraform-provider-*"), &c.Providers)
if err != nil { if err != nil {