1 files changed, 28 insertions, 0 deletions

diff --git a/vendor/github.com/hashicorp/terraform/config/loader_hcl.go b/vendor/github.com/hashicorp/terraform/config/loader_hcl.go
index 9abb196..e85e493 100644
--- a/vendor/github.com/hashicorp/terraform/config/loader_hcl.go
+++ b/vendor/github.com/hashicorp/terraform/config/loader_hcl.go
@@ -17,6 +17,20 @@ type hclConfigurable struct {
         Root *ast.File
 }
 
+var ReservedResourceFields = []string{
+        "connection",
+        "count",
+        "depends_on",
+        "lifecycle",
+        "provider",
+        "provisioner",
+}
+
+var ReservedProviderFields = []string{
+        "alias",
+        "version",
+}
+
 func (t *hclConfigurable) Config() (*Config, error) {
         validKeys := map[string]struct{}{
                 "atlas":     struct{}{},
@@ -562,6 +576,7 @@ func loadProvidersHcl(list *ast.ObjectList) ([]*ProviderConfig, error) {
                 }
 
                 delete(config, "alias")
+                delete(config, "version")
 
                 rawConfig, err := NewRawConfig(config)
                 if err != nil {
@@ -583,9 +598,22 @@ func loadProvidersHcl(list *ast.ObjectList) ([]*ProviderConfig, error) {
                         }
                 }
 
+                // If we have a version field then extract it
+                var version string
+                if a := listVal.Filter("version"); len(a.Items) > 0 {
+                        err := hcl.DecodeObject(&version, a.Items[0].Val)
+                        if err != nil {
+                                return nil, fmt.Errorf(
+                                        "Error reading version for provider[%s]: %s",
+                                        n,
+                                        err)
+                        }
+                }
+
                 result = append(result, &ProviderConfig{
                         Name:      n,
                         Alias:     alias,
+                        Version:   version,
                         RawConfig: rawConfig,
                 })
         }