8 files changed, 77 insertions, 20 deletions

diff --git a/vendor/github.com/hashicorp/terraform/configs/config_build.go b/vendor/github.com/hashicorp/terraform/configs/config_build.go
index 948b2c8..1ca1d77 100644
--- a/vendor/github.com/hashicorp/terraform/configs/config_build.go
+++ b/vendor/github.com/hashicorp/terraform/configs/config_build.go
@@ -76,6 +76,7 @@ func buildChildModules(parent *Config, walker ModuleWalker) (map[string]*Config,
                 }
 
                 child.Children, modDiags = buildChildModules(child, walker)
+                diags = append(diags, modDiags...)
 
                 ret[call.Name] = child
         }
diff --git a/vendor/github.com/hashicorp/terraform/configs/configload/getter.go b/vendor/github.com/hashicorp/terraform/configs/configload/getter.go
index 4a3dace..75c7ef1 100644
--- a/vendor/github.com/hashicorp/terraform/configs/configload/getter.go
+++ b/vendor/github.com/hashicorp/terraform/configs/configload/getter.go
@@ -20,6 +20,7 @@ import (
 var goGetterDetectors = []getter.Detector{
         new(getter.GitHubDetector),
         new(getter.BitBucketDetector),
+        new(getter.GCSDetector),
         new(getter.S3Detector),
         new(getter.FileDetector),
 }
@@ -44,6 +45,7 @@ var goGetterDecompressors = map[string]getter.Decompressor{
 
 var goGetterGetters = map[string]getter.Getter{
         "file":  new(getter.FileGetter),
+        "gcs":   new(getter.GCSGetter),
         "git":   new(getter.GitGetter),
         "hg":    new(getter.HgGetter),
         "s3":    new(getter.S3Getter),
diff --git a/vendor/github.com/hashicorp/terraform/configs/configload/loader_load.go b/vendor/github.com/hashicorp/terraform/configs/configload/loader_load.go
index 93a9420..0e6cba9 100644
--- a/vendor/github.com/hashicorp/terraform/configs/configload/loader_load.go
+++ b/vendor/github.com/hashicorp/terraform/configs/configload/loader_load.go
@@ -64,7 +64,15 @@ func (l *Loader) moduleWalkerLoad(req *configs.ModuleRequest) (*configs.Module,
                         Subject:  &req.SourceAddrRange,
                 })
         }
-        if !req.VersionConstraint.Required.Check(record.Version) {
+        if len(req.VersionConstraint.Required) > 0 && record.Version == nil {
+                diags = append(diags, &hcl.Diagnostic{
+                        Severity: hcl.DiagError,
+                        Summary:  "Module version requirements have changed",
+                        Detail:   "The version requirements have changed since this module was installed and the installed version is no longer acceptable. Run \"terraform init\" to install all modules required by this configuration.",
+                        Subject:  &req.SourceAddrRange,
+                })
+        }
+        if record.Version != nil && !req.VersionConstraint.Required.Check(record.Version) {
                 diags = append(diags, &hcl.Diagnostic{
                         Severity: hcl.DiagError,
                         Summary:  "Module version requirements have changed",
diff --git a/vendor/github.com/hashicorp/terraform/configs/configschema/coerce_value.go b/vendor/github.com/hashicorp/terraform/configs/configschema/coerce_value.go
index e59f58d..7996c38 100644
--- a/vendor/github.com/hashicorp/terraform/configs/configschema/coerce_value.go
+++ b/vendor/github.com/hashicorp/terraform/configs/configschema/coerce_value.go
@@ -113,7 +113,10 @@ func (b *Block) coerceValue(in cty.Value, path cty.Path) (cty.Value, error) {
                                         return cty.UnknownVal(b.ImpliedType()), path.NewErrorf("must be a list")
                                 }
                                 l := coll.LengthInt()
-                                if l < blockS.MinItems {
+
+                                // Assume that if there are unknowns this could have come from
+                                // a dynamic block, and we can't validate MinItems yet.
+                                if l < blockS.MinItems && coll.IsWhollyKnown() {
                                         return cty.UnknownVal(b.ImpliedType()), path.NewErrorf("insufficient items for attribute %q; must have at least %d", typeName, blockS.MinItems)
                                 }
                                 if l > blockS.MaxItems && blockS.MaxItems > 0 {
@@ -161,7 +164,10 @@ func (b *Block) coerceValue(in cty.Value, path cty.Path) (cty.Value, error) {
                                         return cty.UnknownVal(b.ImpliedType()), path.NewErrorf("must be a set")
                                 }
                                 l := coll.LengthInt()
-                                if l < blockS.MinItems {
+
+                                // Assume that if there are unknowns this could have come from
+                                // a dynamic block, and we can't validate MinItems yet.
+                                if l < blockS.MinItems && coll.IsWhollyKnown() {
                                         return cty.UnknownVal(b.ImpliedType()), path.NewErrorf("insufficient items for attribute %q; must have at least %d", typeName, blockS.MinItems)
                                 }
                                 if l > blockS.MaxItems && blockS.MaxItems > 0 {
diff --git a/vendor/github.com/hashicorp/terraform/configs/configschema/decoder_spec.go b/vendor/github.com/hashicorp/terraform/configs/configschema/decoder_spec.go
index d8f41ea..e748dd2 100644
--- a/vendor/github.com/hashicorp/terraform/configs/configschema/decoder_spec.go
+++ b/vendor/github.com/hashicorp/terraform/configs/configschema/decoder_spec.go
@@ -33,6 +33,14 @@ func (b *Block) DecoderSpec() hcldec.Spec {
 
                 childSpec := blockS.Block.DecoderSpec()
 
+                // We can only validate 0 or 1 for MinItems, because a dynamic block
+                // may satisfy any number of min items while only having a single
+                // block in the config.
+                minItems := 0
+                if blockS.MinItems > 1 {
+                        minItems = 1
+                }
+
                 switch blockS.Nesting {
                 case NestingSingle, NestingGroup:
                         ret[name] = &hcldec.BlockSpec{
@@ -57,14 +65,14 @@ func (b *Block) DecoderSpec() hcldec.Spec {
                                 ret[name] = &hcldec.BlockTupleSpec{
                                         TypeName: name,
                                         Nested:   childSpec,
-                                        MinItems: blockS.MinItems,
+                                        MinItems: minItems,
                                         MaxItems: blockS.MaxItems,
                                 }
                         } else {
                                 ret[name] = &hcldec.BlockListSpec{
                                         TypeName: name,
                                         Nested:   childSpec,
-                                        MinItems: blockS.MinItems,
+                                        MinItems: minItems,
                                         MaxItems: blockS.MaxItems,
                                 }
                         }
@@ -77,7 +85,7 @@ func (b *Block) DecoderSpec() hcldec.Spec {
                         ret[name] = &hcldec.BlockSetSpec{
                                 TypeName: name,
                                 Nested:   childSpec,
-                                MinItems: blockS.MinItems,
+                                MinItems: minItems,
                                 MaxItems: blockS.MaxItems,
                         }
                 case NestingMap:
diff --git a/vendor/github.com/hashicorp/terraform/configs/parser_config_dir.go b/vendor/github.com/hashicorp/terraform/configs/parser_config_dir.go
index 3014cb4..752d6d9 100644
--- a/vendor/github.com/hashicorp/terraform/configs/parser_config_dir.go
+++ b/vendor/github.com/hashicorp/terraform/configs/parser_config_dir.go
@@ -2,6 +2,7 @@ package configs
 
 import (
         "fmt"
+        "os"
         "path/filepath"
         "strings"
 
@@ -140,3 +141,23 @@ func IsIgnoredFile(name string) bool {
                 strings.HasSuffix(name, "~") || // vim
                 strings.HasPrefix(name, "#") && strings.HasSuffix(name, "#") // emacs
 }
+
+// IsEmptyDir returns true if the given filesystem path contains no Terraform
+// configuration files.
+//
+// Unlike the methods of the Parser type, this function always consults the
+// real filesystem, and thus it isn't appropriate to use when working with
+// configuration loaded from a plan file.
+func IsEmptyDir(path string) (bool, error) {
+        if _, err := os.Stat(path); err != nil && os.IsNotExist(err) {
+                return true, nil
+        }
+
+        p := NewParser(nil)
+        fs, os, err := p.dirFiles(path)
+        if err != nil {
+                return false, err
+        }
+
+        return len(fs) == 0 && len(os) == 0, nil
+}
diff --git a/vendor/github.com/hashicorp/terraform/configs/resource.go b/vendor/github.com/hashicorp/terraform/configs/resource.go
index de1a343..edf822c 100644
--- a/vendor/github.com/hashicorp/terraform/configs/resource.go
+++ b/vendor/github.com/hashicorp/terraform/configs/resource.go
@@ -111,13 +111,15 @@ func decodeResourceBlock(block *hcl.Block) (*Resource, hcl.Diagnostics) {
 
         if attr, exists := content.Attributes["for_each"]; exists {
                 r.ForEach = attr.Expr
-                // We currently parse this, but don't yet do anything with it.
-                diags = append(diags, &hcl.Diagnostic{
-                        Severity: hcl.DiagError,
-                        Summary:  "Reserved argument name in resource block",
-                        Detail:   fmt.Sprintf("The name %q is reserved for use in a future version of Terraform.", attr.Name),
-                        Subject:  &attr.NameRange,
-                })
+                // Cannot have count and for_each on the same resource block
+                if r.Count != nil {
+                        diags = append(diags, &hcl.Diagnostic{
+                                Severity: hcl.DiagError,
+                                Summary:  `Invalid combination of "count" and "for_each"`,
+                                Detail:   `The "count" and "for_each" meta-arguments are mutually-exclusive, only one should be used to be explicit about the number of resources to be created.`,
+                                Subject:  &attr.NameRange,
+                        })
+                }
         }
 
         if attr, exists := content.Attributes["provider"]; exists {
@@ -300,13 +302,15 @@ func decodeDataBlock(block *hcl.Block) (*Resource, hcl.Diagnostics) {
 
         if attr, exists := content.Attributes["for_each"]; exists {
                 r.ForEach = attr.Expr
-                // We currently parse this, but don't yet do anything with it.
-                diags = append(diags, &hcl.Diagnostic{
-                        Severity: hcl.DiagError,
-                        Summary:  "Reserved argument name in module block",
-                        Detail:   fmt.Sprintf("The name %q is reserved for use in a future version of Terraform.", attr.Name),
-                        Subject:  &attr.NameRange,
-                })
+                // Cannot have count and for_each on the same data block
+                if r.Count != nil {
+                        diags = append(diags, &hcl.Diagnostic{
+                                Severity: hcl.DiagError,
+                                Summary:  `Invalid combination of "count" and "for_each"`,
+                                Detail:   `The "count" and "for_each" meta-arguments are mutually-exclusive, only one should be used to be explicit about the number of resources to be created.`,
+                                Subject:  &attr.NameRange,
+                        })
+                }
         }
 
         if attr, exists := content.Attributes["provider"]; exists {
diff --git a/vendor/github.com/hashicorp/terraform/configs/version_constraint.go b/vendor/github.com/hashicorp/terraform/configs/version_constraint.go
index 7aa19ef..e40ce16 100644
--- a/vendor/github.com/hashicorp/terraform/configs/version_constraint.go
+++ b/vendor/github.com/hashicorp/terraform/configs/version_constraint.go
@@ -45,6 +45,13 @@ func decodeVersionConstraint(attr *hcl.Attribute) (VersionConstraint, hcl.Diagno
                 return ret, diags
         }
 
+        if !val.IsWhollyKnown() {
+                // If there is a syntax error, HCL sets the value of the given attribute
+                // to cty.DynamicVal. A diagnostic for the syntax error will already
+                // bubble up, so we will move forward gracefully here.
+                return ret, diags
+        }
+
         constraintStr := val.AsString()
         constraints, err := version.NewConstraint(constraintStr)
         if err != nil {