Normalize block values before passing to TF provider

pkg/tests/cross-tests/input_check.go

@@ -33,10 +33,6 @@ type inputTestCase struct {
 
 	Config     any
 	ObjectType *tftypes.Object
-
-	SkipCompareRawPlan   bool
-	SkipCompareRawConfig bool
-	SkipCompareRawState  bool
 }
 
 func FailNotEqual(t T, name string, tfVal, pulVal any) {
@@ -158,15 +154,7 @@ func runCreateInputCheck(t T, tc inputTestCase) {
 		assertValEqual(t, k+" Change New", tfChangeValNew, pulChangeValNew)
 	}
 
-	if !tc.SkipCompareRawConfig {
-		assertCtyValEqual(t, "RawConfig", tfResData.GetRawConfig(), pulResData.GetRawConfig())
-	}
-
-	if !tc.SkipCompareRawPlan {
-		assertCtyValEqual(t, "RawPlan", tfResData.GetRawPlan(), pulResData.GetRawPlan())
-	}
-
-	if !tc.SkipCompareRawState {
-		assertCtyValEqual(t, "RawState", tfResData.GetRawState(), pulResData.GetRawState())
-	}
+	assertCtyValEqual(t, "RawConfig", tfResData.GetRawConfig(), pulResData.GetRawConfig())
+	assertCtyValEqual(t, "RawPlan", tfResData.GetRawPlan(), pulResData.GetRawPlan())
+	assertCtyValEqual(t, "RawState", tfResData.GetRawState(), pulResData.GetRawState())
 }

pkg/tests/cross-tests/input_cross_test.go

@@ -2,6 +2,7 @@ package crosstests
 
 import (
 	"context"
+	"fmt"
 	"testing"
 	"time"
 
@@ -103,6 +104,7 @@ func TestInputsEqualObjectBasic(t *testing.T) {
 }
 
 func TestInputsConfigModeEqual(t *testing.T) {
+	// Regression test for [pulumi/pulumi-terraform-bridge#1762]
 	skipUnlessLinux(t)
 	t2 := tftypes.Object{AttributeTypes: map[string]tftypes.Type{
 		"x": tftypes.String,
@@ -183,8 +185,7 @@ func TestInputsConfigModeEqual(t *testing.T) {
 						},
 					},
 				},
-				Config:               tc.config,
-				SkipCompareRawConfig: true,
+				Config: tc.config,
 			})
 		})
 	}
@@ -215,7 +216,33 @@ func TestInputsEmptyString(t *testing.T) {
 	})
 }
 
+func TestInputsUnspecifiedMaxItemsOne(t *testing.T) {
+	// Regression test for [pulumi/pulumi-terraform-bridge#1767]
+	skipUnlessLinux(t)
+	runCreateInputCheck(t, inputTestCase{
+		Resource: &schema.Resource{
+			Schema: map[string]*schema.Schema{
+				"f0": {
+					Type:     schema.TypeList,
+					MaxItems: 1,
+					Optional: true,
+					Elem: &schema.Resource{
+						Schema: map[string]*schema.Schema{
+							"x": {Optional: true, Type: schema.TypeString},
+						},
+					},
+				},
+			},
+		},
+		Config: tftypes.NewValue(
+			tftypes.Object{},
+			map[string]tftypes.Value{},
+		),
+	})
+}
+
 func TestOptionalSetNotSpecified(t *testing.T) {
+	// Regression test for [pulumi/pulumi-terraform-bridge#1970] and [pulumi/pulumi-terraform-bridge#1964]
 	skipUnlessLinux(t)
 	runCreateInputCheck(t, inputTestCase{
 		Resource: &schema.Resource{
@@ -231,11 +258,47 @@ func TestOptionalSetNotSpecified(t *testing.T) {
 				},
 			},
 		},
-		Config:               tftypes.NewValue(tftypes.Object{}, map[string]tftypes.Value{}),
-		SkipCompareRawConfig: true,
+		Config: tftypes.NewValue(tftypes.Object{}, map[string]tftypes.Value{}),
 	})
 }
 
+func TestInputsEqualEmptyList(t *testing.T) {
+	// Regression test for [pulumi/pulumi-terraform-bridge#1915]
+	for _, maxItems := range []int{0, 1} {
+		name := fmt.Sprintf("MaxItems: %v", maxItems)
+		t.Run(name, func(t *testing.T) {
+			t1 := tftypes.List{ElementType: tftypes.String}
+			t0 := tftypes.Object{
+				AttributeTypes: map[string]tftypes.Type{
+					"f0": t1,
+				},
+			}
+			runCreateInputCheck(t, inputTestCase{
+				Resource: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"f0": {
+							Optional: true,
+							Type:     schema.TypeList,
+							MaxItems: maxItems,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"x": {Optional: true, Type: schema.TypeString},
+								},
+							},
+						},
+					},
+				},
+				Config: tftypes.NewValue(
+					t0,
+					map[string]tftypes.Value{
+						"f0": tftypes.NewValue(t1, []tftypes.Value{}),
+					},
+				),
+			})
+		})
+	}
+}
+
 func TestExplicitNilList(t *testing.T) {
 	skipUnlessLinux(t)
 	t0 := tftypes.Map{ElementType: tftypes.Number}
@@ -323,8 +386,7 @@ func TestInputsEmptyCollections(t *testing.T) {
 						},
 					},
 				},
-				Config:               config,
-				SkipCompareRawConfig: true,
+				Config: config,
 			})
 		})
 	}
@@ -417,8 +479,7 @@ func TestInputsNestedBlocksEmpty(t *testing.T) {
 						},
 					},
 				},
-				Config:               tc.config,
-				SkipCompareRawConfig: true,
+				Config: tc.config,
 			})
 		})
 	}