It passes (at least once)

Author: iwahbe

pf/tests/provider_configure_test.go

@@ -102,6 +102,15 @@ func TestConfigureProperties(t *testing.T) {
 				asMapOrObject := map[string]tftypes.Value{}
 				require.NoError(t, v.As(&asMapOrObject))
 
+				for k, e := range asMapOrObject {
+					e = patchUp(e)
+					if e.IsNull() && typ.Is(tftypes.Map{}) {
+						delete(asMapOrObject, k)
+					} else {
+						asMapOrObject[k] = e
+					}
+				}
+
 				// TODO: Empty objects are represented as {} in PF but null in bridged PF.
 				//
 				// This normalizes all empty objects to be represented as null so the test passes.
@@ -110,9 +119,6 @@ func TestConfigureProperties(t *testing.T) {
 					return tftypes.NewValue(v.Type(), nil)
 				}
 
-				for k, e := range asMapOrObject {
-					asMapOrObject[k] = patchUp(e)
-				}
 				return tftypes.NewValue(v.Type(), asMapOrObject)
 			}
 

pf/tests/util/property/pf/value/provider/util.go

@@ -207,18 +207,21 @@ func convertSet(a []value, elem cty.Type) value {
 		puArr[i] = v.pu
 	}
 
-	set := cty.SetValEmpty(elem)
+	tfSet := cty.NullVal(cty.Set(elem))
 	if len(tfArr) > 0 {
-		set = cty.SetVal(tfArr)
+		tfSet = cty.SetVal(tfArr)
+		contract.Assertf(tfSet.LengthInt() == len(puArr),
+			"Set values have different lengths: (%d != %d), of %#v", tfSet.LengthInt(), len(puArr), a)
+	}
+	puSet := resource.NewNullProperty()
+	if len(puArr) > 0 {
+		puSet = resource.NewProperty(puArr)
 	}
-
-	contract.Assertf(set.LengthInt() == len(puArr),
-		"Set values have different lengths: (%d != %d), of %#v", set.LengthInt(), len(puArr), a)
 
 	return value{
 		hasValue: true,
-		tf:       set,
-		pu:       resource.NewProperty(puArr),
+		tf:       tfSet,
+		pu:       puSet,
 	}
 }
 
@@ -233,15 +236,19 @@ func convertList(a []value, elem cty.Type) value {
 		puArr[i] = v.pu
 	}
 
-	ctyList := cty.ListValEmpty(elem)
+	tfList := cty.NullVal(cty.List(elem))
 	if len(tfArr) > 0 {
-		ctyList = cty.ListVal(tfArr)
+		tfList = cty.ListVal(tfArr)
+	}
+	puList := resource.NewNullProperty()
+	if len(puArr) > 0 {
+		puList = resource.NewProperty(puArr)
 	}
 
 	return value{
 		hasValue: true,
-		tf:       ctyList,
-		pu:       resource.NewProperty(puArr),
+		tf:       tfList,
+		pu:       puList,
 	}
 }
 

pf/tests/util/property/pf/value/provider/value.go

@@ -100,6 +100,11 @@ func (g generator) withAttr(ctx context.Context, attribute schema.Attribute) *ra
 		})
 	}
 
+	var minIterableSize int
+	if attribute.IsRequired() {
+		minIterableSize = 1
+	}
+
 	getValue := func() *rapid.Generator[value] {
 		switch attribute := attribute.(type) {
 
@@ -125,20 +130,23 @@ func (g generator) withAttr(ctx context.Context, attribute schema.Attribute) *ra
 		case schema.MapAttribute:
 			elemType := attribute.ElementType
 			return rapid.Map(
-				rapid.MapOf(stringV(), g.attrType(ctx, elemType)),
+				rapid.MapOfN(
+					stringV(), g.attrType(ctx, elemType),
+					minIterableSize, maxIterableSize,
+				),
 				makeConvertMap(ctyType(elemType.TerraformType(ctx))),
 			)
 
 		case schema.ListAttribute:
 			elemType := attribute.ElementType
 			return rapid.Map(
-				rapid.SliceOfN(g.attrType(ctx, elemType), 0, maxIterableSize),
+				rapid.SliceOfN(g.attrType(ctx, elemType), minIterableSize, maxIterableSize),
 				makeConvertList(ctyType(elemType.TerraformType(ctx))),
 			)
 		case schema.SetAttribute:
 			elemType := attribute.ElementType
 			return rapid.Map(
-				rapid.SliceOfNDistinct(g.attrType(ctx, elemType), 0, maxIterableSize, g.valueID),
+				rapid.SliceOfNDistinct(g.attrType(ctx, elemType), minIterableSize, maxIterableSize, g.valueID),
 				makeConvertSet(ctyType(elemType.TerraformType(ctx))),
 			)
 
@@ -165,17 +173,17 @@ func (g generator) withAttr(ctx context.Context, attribute schema.Attribute) *ra
 			})
 		case schema.MapNestedAttribute:
 			return rapid.Map(
-				rapid.MapOfN(stringV(), g.nestedAttributeObject(ctx, attribute.NestedObject), 0, maxIterableSize),
+				rapid.MapOfN(stringV(), g.nestedAttributeObject(ctx, attribute.NestedObject), minIterableSize, maxIterableSize),
 				makeConvertMap(ctyType(attribute.NestedObject.Type().TerraformType(ctx))),
 			)
 		case schema.ListNestedAttribute:
 			return rapid.Map(
-				rapid.SliceOfN(g.nestedAttributeObject(ctx, attribute.NestedObject), 0, maxIterableSize),
+				rapid.SliceOfN(g.nestedAttributeObject(ctx, attribute.NestedObject), minIterableSize, maxIterableSize),
 				makeConvertList(ctyType(attribute.NestedObject.Type().TerraformType(ctx))),
 			)
 		case schema.SetNestedAttribute:
 			return rapid.Map(
-				rapid.SliceOfNDistinct(g.nestedAttributeObject(ctx, attribute.NestedObject), 0, maxIterableSize, g.valueID),
+				rapid.SliceOfNDistinct(g.nestedAttributeObject(ctx, attribute.NestedObject), minIterableSize, maxIterableSize, g.valueID),
 				makeConvertSet(ctyType(attribute.NestedObject.Type().TerraformType(ctx))),
 			)
 		default:

pkg/tests/cross-tests/tfwrite.go

@@ -82,6 +82,9 @@ func writePfProvider(body *hclwrite.Body, schemas pfproviderschema.Schema, value
 // This is why writePfBlock is called with parentBody, instead of with the block body
 // already created (as with [writeBlock]).
 func writePfBlock(key string, parentBody *hclwrite.Body, schemas pfproviderschema.Block, value cty.Value) {
+	if value.IsNull() {
+		return
+	}
 	switch schemas := schemas.(type) {
 	case pfproviderschema.ListNestedBlock:
 		for _, v := range value.AsValueSlice() {