From 9bcae10ac9181322e4e933f4373603ec40e671f9 Mon Sep 17 00:00:00 2001
From: Ian Wahbe <me@iwahbe.com>
Date: Fri, 1 Nov 2024 09:43:16 +0100
Subject: [PATCH] Add a test for a single-nested-block

---
 pkg/internal/tests/cross-tests/tfwrite.go |  4 ++
 pkg/pf/tests/provider_configure_test.go   | 87 ++++++++++++++++++++++-
 2 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/pkg/internal/tests/cross-tests/tfwrite.go b/pkg/internal/tests/cross-tests/tfwrite.go
index 6f47438d1..cc6a74f3a 100644
--- a/pkg/internal/tests/cross-tests/tfwrite.go
+++ b/pkg/internal/tests/cross-tests/tfwrite.go
@@ -117,6 +117,10 @@ func writePfBlock(key string, parentBody *hclwrite.Body, schemas pfproviderschem
 	case pfproviderschema.SingleNestedBlock:
 		body := parentBody.AppendNewBlock(key, nil).Body()
 
+		if value.IsNull() {
+			return
+		}
+
 		writePfObject(body, pfproviderschema.NestedBlockObject{
 			Attributes: schemas.Attributes,
 			Blocks:     schemas.Blocks,
diff --git a/pkg/pf/tests/provider_configure_test.go b/pkg/pf/tests/provider_configure_test.go
index 1e3cd482f..0bbdec3b2 100644
--- a/pkg/pf/tests/provider_configure_test.go
+++ b/pkg/pf/tests/provider_configure_test.go
@@ -165,6 +165,55 @@ func TestConfigure(t *testing.T) {
 			},
 		))
 	})
+
+	t.Run("single-nested-block", func(t *testing.T) {
+		t.Parallel()
+
+		optionalAttrs := schema.Schema{Blocks: map[string]schema.Block{
+			"o": schema.SingleNestedBlock{
+				Attributes: map[string]schema.Attribute{
+					"n1": schema.StringAttribute{Optional: true},
+					"n2": schema.BoolAttribute{Optional: true},
+				},
+			},
+		}}
+
+		t.Run("missing", crosstests.MakeConfigure(optionalAttrs,
+			map[string]cty.Value{},
+		))
+
+		t.Run("empty", crosstests.MakeConfigure(optionalAttrs,
+			map[string]cty.Value{"o": cty.EmptyObjectVal},
+		))
+
+		t.Run("null", func(t *testing.T) {
+			t.Skip("TODO[pulumi/pulumi-terraform-bridge#2564] Null blocks don't match")
+			t.Parallel()
+			crosstests.Configure(t,
+				optionalAttrs,
+				map[string]cty.Value{
+					"o": cty.NullVal(cty.Object(map[string]cty.Type{"n1": cty.String, "n2": cty.Bool})),
+				},
+			)
+		})
+
+		t.Run("full", crosstests.MakeConfigure(optionalAttrs,
+			map[string]cty.Value{
+				"o": cty.ObjectVal(map[string]cty.Value{
+					"n1": cty.StringVal("123"),
+					"n2": cty.BoolVal(false),
+				}),
+			},
+		))
+
+		t.Run("partial", crosstests.MakeConfigure(optionalAttrs,
+			map[string]cty.Value{
+				"o": cty.ObjectVal(map[string]cty.Value{
+					"n1": cty.StringVal("123"),
+				}),
+			},
+		))
+	})
 }
 
 func TestConfigureNameOverrides(t *testing.T) {
@@ -182,9 +231,9 @@ func TestConfigureNameOverrides(t *testing.T) {
 		}),
 	))
 
-	t.Run("nested-attribute", func(t *testing.T) {
+	t.Run("single-nested-attribute", func(t *testing.T) {
+		t.Skip("TODO[pulumi/pulumi-terraform-bridge#2560]: SingleNestedAttribute nested type overrides don't line up for PF")
 		t.Parallel()
-		t.Skip("TODO[pulumi/pulumi-terraform-bridge#2560]: Attribute nested type overrides don't line up for PF")
 		crosstests.Configure(t,
 			schema.Schema{
 				Attributes: map[string]schema.Attribute{
@@ -212,7 +261,36 @@ func TestConfigureNameOverrides(t *testing.T) {
 		)
 	})
 
-	t.Run("nested-block", crosstests.MakeConfigure(
+	t.Run("single-nested-block", func(t *testing.T) {
+		t.Skip("TODO[pulumi/pulumi-terraform-bridge#2560]: SingleNestedBlock type overrides don't line up for PF")
+		t.Parallel()
+		crosstests.Configure(t,
+			schema.Schema{
+				Blocks: map[string]schema.Block{
+					"a": schema.SingleNestedBlock{
+						Attributes: map[string]schema.Attribute{
+							"as": schema.Int64Attribute{Optional: true},
+						},
+					},
+				},
+			},
+			map[string]cty.Value{
+				"a": cty.ObjectVal(map[string]cty.Value{
+					"as": cty.NumberIntVal(123),
+				}),
+			},
+			crosstests.ConfigureProviderInfo(map[string]*info.Schema{
+				"a": {
+					Name: "puAttr",
+					Elem: &info.Schema{Fields: map[string]*info.Schema{
+						"as": {Name: "puNestedAttrField"},
+					}},
+				},
+			}),
+		)
+	})
+
+	t.Run("list-nested-block", crosstests.MakeConfigure(
 		schema.Schema{
 			Blocks: map[string]schema.Block{
 				"b": schema.ListNestedBlock{NestedObject: schema.NestedBlockObject{
@@ -261,6 +339,7 @@ type testConfigureCollection struct {
 
 func (tc testConfigureCollection) run(t *testing.T) {
 	t.Parallel()
+	t.Helper()
 
 	t.Run("missing", crosstests.MakeConfigure(
 		schema.Schema{Attributes: map[string]schema.Attribute{
@@ -309,6 +388,8 @@ type testConfigurePrimitive struct {
 
 func (tc testConfigurePrimitive) run(t *testing.T) {
 	t.Parallel()
+	t.Helper()
+
 	t.Run("zero value - optional", crosstests.MakeConfigure(
 		schema.Schema{Attributes: map[string]schema.Attribute{
 			"v": tc.attrOptional,