set empty objects in NewListResult as well as update Set method on tfsdk types to allow tftype values

Author: stephybun

internal/fwschemadata/data_set.go

@@ -10,11 +10,17 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/internal/reflect"
 	"github.com/hashicorp/terraform-plugin-framework/path"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 // Set replaces the entire value. The value should be a struct whose fields
 // have one of the attr.Value types. Each field must have the tfsdk field tag.
 func (d *Data) Set(ctx context.Context, val any) diag.Diagnostics {
+	if v, ok := val.(tftypes.Value); ok {
+		d.TerraformValue = v
+		return nil
+	}
+
 	attrValue, diags := reflect.FromValue(ctx, d.Schema.Type(), val, path.Empty())
 
 	if diags.HasError() {

internal/fwschemadata/data_set_test.go

@@ -139,6 +139,39 @@ func TestDataSet(t *testing.T) {
 				),
 			}),
 		},
+		"write-tftypes-values": {
+			data: fwschemadata.Data{
+				TerraformValue: tftypes.NewValue(tftypes.Object{
+					AttributeTypes: map[string]tftypes.Type{
+						"name": tftypes.String,
+					},
+				}, map[string]tftypes.Value{
+					"name": tftypes.NewValue(tftypes.String, "oldvalue"),
+				}),
+				Schema: testschema.Schema{
+					Attributes: map[string]fwschema.Attribute{
+						"name": testschema.Attribute{
+							Type:     types.StringType,
+							Required: true,
+						},
+					},
+				},
+			},
+			val: tftypes.NewValue(tftypes.Object{
+				AttributeTypes: map[string]tftypes.Type{
+					"name": tftypes.String,
+				},
+			}, map[string]tftypes.Value{
+				"name": tftypes.NewValue(tftypes.String, "newvalue"),
+			}),
+			expected: tftypes.NewValue(tftypes.Object{
+				AttributeTypes: map[string]tftypes.Type{
+					"name": tftypes.String,
+				},
+			}, map[string]tftypes.Value{
+				"name": tftypes.NewValue(tftypes.String, "newvalue"),
+			}),
+		},
 		"overwrite": {
 			data: fwschemadata.Data{
 				TerraformValue: tftypes.Value{},

internal/proto5server/server_listresource_test.go

@@ -105,7 +105,7 @@ func TestServerListResource(t *testing.T) {
 						continue
 					}
 
-					result := req.NewListResult()
+					result := req.NewListResult(ctx)
 					result.DisplayName = name
 
 					diags = result.Identity.Set(ctx, resources[name].ThingResourceIdentity)

internal/proto6server/server_listresource_test.go

@@ -105,7 +105,7 @@ func TestServerListResource(t *testing.T) {
 						continue
 					}
 
-					result := req.NewListResult()
+					result := req.NewListResult(ctx)
 					result.DisplayName = name
 
 					diags = result.Identity.Set(ctx, resources[name].ThingResourceIdentity)
@@ -131,7 +131,7 @@ func TestServerListResource(t *testing.T) {
 		}
 
 		r.ListMethod = func(ctx context.Context, req list.ListRequest, resp *list.ListResultsStream) {
-			result := req.NewListResult()
+			result := req.NewListResult(ctx)
 			result.DisplayName = "plateau"
 
 			diags := result.Identity.Set(ctx, resources["plateau"].ThingResourceIdentity)

list/list_resource.go

@@ -11,6 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/internal/fwschema"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 // ListResource represents an implementation of listing instances of a managed resource
@@ -109,9 +110,15 @@ type ListRequest struct {
 
 // NewListResult creates a new [ListResult] with convenient defaults
 // for each field.
-func (r ListRequest) NewListResult() ListResult {
-	identity := &tfsdk.ResourceIdentity{Schema: r.ResourceIdentitySchema}
-	resource := &tfsdk.Resource{Schema: r.ResourceSchema}
+func (r ListRequest) NewListResult(ctx context.Context) ListResult {
+	identity := &tfsdk.ResourceIdentity{
+		Raw:    tftypes.NewValue(r.ResourceIdentitySchema.Type().TerraformType(ctx), nil),
+		Schema: r.ResourceIdentitySchema,
+	}
+	resource := &tfsdk.Resource{
+		Raw:    tftypes.NewValue(r.ResourceSchema.Type().TerraformType(ctx), nil),
+		Schema: r.ResourceSchema,
+	}
 
 	return ListResult{
 		DisplayName: "",