From b3a491d035f12ae8d347410a724ad15eeed05364 Mon Sep 17 00:00:00 2001
From: James Bardin <j.bardin@gmail.com>
Date: Thu, 18 Oct 2018 18:09:43 -0400
Subject: [PATCH] use correct block types in CoerceValue

When creating Null or Unknown values during CoerceValue, the the outer
block type was being used rather than the current block type.
---
 configs/configschema/coerce_value.go      | 18 +++---
 configs/configschema/coerce_value_test.go | 78 +++++++++++++++++++++++
 2 files changed, 87 insertions(+), 9 deletions(-)

diff --git a/configs/configschema/coerce_value.go b/configs/configschema/coerce_value.go
index 9c54f158a..e6b163b9f 100644
--- a/configs/configschema/coerce_value.go
+++ b/configs/configschema/coerce_value.go
@@ -98,10 +98,10 @@ func (b *Block) coerceValue(in cty.Value, path cty.Path) (cty.Value, error) {
 
 				switch {
 				case coll.IsNull():
-					attrs[typeName] = cty.NullVal(cty.List(b.ImpliedType()))
+					attrs[typeName] = cty.NullVal(cty.List(blockS.ImpliedType()))
 					continue
 				case !coll.IsKnown():
-					attrs[typeName] = cty.UnknownVal(cty.List(b.ImpliedType()))
+					attrs[typeName] = cty.UnknownVal(cty.List(blockS.ImpliedType()))
 					continue
 				}
 
@@ -116,7 +116,7 @@ func (b *Block) coerceValue(in cty.Value, path cty.Path) (cty.Value, error) {
 					return cty.UnknownVal(b.ImpliedType()), path.NewErrorf("too many items for attribute %q; must have at least %d", typeName, blockS.MinItems)
 				}
 				if l == 0 {
-					attrs[typeName] = cty.ListValEmpty(b.ImpliedType())
+					attrs[typeName] = cty.ListValEmpty(blockS.ImpliedType())
 					continue
 				}
 				elems := make([]cty.Value, 0, l)
@@ -146,10 +146,10 @@ func (b *Block) coerceValue(in cty.Value, path cty.Path) (cty.Value, error) {
 
 				switch {
 				case coll.IsNull():
-					attrs[typeName] = cty.NullVal(cty.Set(b.ImpliedType()))
+					attrs[typeName] = cty.NullVal(cty.Set(blockS.ImpliedType()))
 					continue
 				case !coll.IsKnown():
-					attrs[typeName] = cty.UnknownVal(cty.Set(b.ImpliedType()))
+					attrs[typeName] = cty.UnknownVal(cty.Set(blockS.ImpliedType()))
 					continue
 				}
 
@@ -164,7 +164,7 @@ func (b *Block) coerceValue(in cty.Value, path cty.Path) (cty.Value, error) {
 					return cty.UnknownVal(b.ImpliedType()), path.NewErrorf("too many items for attribute %q; must have at least %d", typeName, blockS.MinItems)
 				}
 				if l == 0 {
-					attrs[typeName] = cty.SetValEmpty(b.ImpliedType())
+					attrs[typeName] = cty.SetValEmpty(blockS.ImpliedType())
 					continue
 				}
 				elems := make([]cty.Value, 0, l)
@@ -194,10 +194,10 @@ func (b *Block) coerceValue(in cty.Value, path cty.Path) (cty.Value, error) {
 
 				switch {
 				case coll.IsNull():
-					attrs[typeName] = cty.NullVal(cty.Map(b.ImpliedType()))
+					attrs[typeName] = cty.NullVal(cty.Map(blockS.ImpliedType()))
 					continue
 				case !coll.IsKnown():
-					attrs[typeName] = cty.UnknownVal(cty.Map(b.ImpliedType()))
+					attrs[typeName] = cty.UnknownVal(cty.Map(blockS.ImpliedType()))
 					continue
 				}
 
@@ -206,7 +206,7 @@ func (b *Block) coerceValue(in cty.Value, path cty.Path) (cty.Value, error) {
 				}
 				l := coll.LengthInt()
 				if l == 0 {
-					attrs[typeName] = cty.MapValEmpty(b.ImpliedType())
+					attrs[typeName] = cty.MapValEmpty(blockS.ImpliedType())
 					continue
 				}
 				elems := make(map[string]cty.Value)
diff --git a/configs/configschema/coerce_value_test.go b/configs/configschema/coerce_value_test.go
index f0e3552d9..b7cc5f632 100644
--- a/configs/configschema/coerce_value_test.go
+++ b/configs/configschema/coerce_value_test.go
@@ -319,6 +319,84 @@ func TestCoerceValue(t *testing.T) {
 			cty.DynamicVal,
 			`attribute "foo" is required`,
 		},
+		"unknown nested list": {
+			&Block{
+				Attributes: map[string]*Attribute{
+					"attr": {
+						Type:     cty.String,
+						Required: true,
+					},
+				},
+				BlockTypes: map[string]*NestedBlock{
+					"foo": {
+						Block:    Block{},
+						Nesting:  NestingList,
+						MinItems: 1,
+					},
+				},
+			},
+			cty.ObjectVal(map[string]cty.Value{
+				"attr": cty.StringVal("test"),
+				"foo":  cty.UnknownVal(cty.EmptyObject),
+			}),
+			cty.ObjectVal(map[string]cty.Value{
+				"attr": cty.StringVal("test"),
+				"foo":  cty.UnknownVal(cty.List(cty.EmptyObject)),
+			}),
+			"",
+		},
+		"unknown nested set": {
+			&Block{
+				Attributes: map[string]*Attribute{
+					"attr": {
+						Type:     cty.String,
+						Required: true,
+					},
+				},
+				BlockTypes: map[string]*NestedBlock{
+					"foo": {
+						Block:    Block{},
+						Nesting:  NestingSet,
+						MinItems: 1,
+					},
+				},
+			},
+			cty.ObjectVal(map[string]cty.Value{
+				"attr": cty.StringVal("test"),
+				"foo":  cty.UnknownVal(cty.EmptyObject),
+			}),
+			cty.ObjectVal(map[string]cty.Value{
+				"attr": cty.StringVal("test"),
+				"foo":  cty.UnknownVal(cty.Set(cty.EmptyObject)),
+			}),
+			"",
+		},
+		"unknown nested map": {
+			&Block{
+				Attributes: map[string]*Attribute{
+					"attr": {
+						Type:     cty.String,
+						Required: true,
+					},
+				},
+				BlockTypes: map[string]*NestedBlock{
+					"foo": {
+						Block:    Block{},
+						Nesting:  NestingMap,
+						MinItems: 1,
+					},
+				},
+			},
+			cty.ObjectVal(map[string]cty.Value{
+				"attr": cty.StringVal("test"),
+				"foo":  cty.UnknownVal(cty.Map(cty.String)),
+			}),
+			cty.ObjectVal(map[string]cty.Value{
+				"attr": cty.StringVal("test"),
+				"foo":  cty.UnknownVal(cty.Map(cty.EmptyObject)),
+			}),
+			"",
+		},
 		"extraneous attribute": {
 			&Block{},
 			cty.ObjectVal(map[string]cty.Value{