1 files changed, 4 insertions, 1 deletions

diff --git a/vendor/github.com/hashicorp/terraform/config/loader.go b/vendor/github.com/hashicorp/terraform/config/loader.go
index 5dd7d46..6e34781 100644
--- a/vendor/github.com/hashicorp/terraform/config/loader.go
+++ b/vendor/github.com/hashicorp/terraform/config/loader.go
@@ -80,7 +80,7 @@ func LoadDir(root string) (*Config, error) {
         if err != nil {
                 return nil, err
         }
-        if len(files) == 0 {
+        if len(files) == 0 && len(overrides) == 0 {
                 return nil, &ErrNoConfigsFound{Dir: root}
         }
 
@@ -112,6 +112,9 @@ func LoadDir(root string) (*Config, error) {
                         result = c
                 }
         }
+        if len(files) == 0 {
+                result = &Config{}
+        }
 
         // Load all the overrides, and merge them into the config
         for _, f := range overrides {