2 files changed, 19 insertions, 5 deletions

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: