address review comments

Author: stephybun

internal/fwserver/server_listresource.go

@@ -161,12 +161,10 @@ func (s *Server) ListResource(ctx context.Context, fwReq *ListRequest, fwStream
 	}
 
 	if stream.Results == nil {
-		fwStream.Results = processListResults(req, list.NoListResults, diagsStream.Results)
+		stream.Results = list.NoListResults
 	}
 
-	if stream.Results != nil {
-		fwStream.Results = processListResults(req, stream.Results, diagsStream.Results)
-	}
+	fwStream.Results = processListResults(req, stream.Results, diagsStream.Results)
 }
 
 func processListResults(req list.ListRequest, streams ...iter.Seq[list.ListResult]) iter.Seq[ListResult] {

internal/fwserver/server_listresource_test.go

@@ -184,6 +184,34 @@ func TestServerListResource(t *testing.T) {
 			expectedStreamEvents: []fwserver.ListResult{},
 			expectedError:        "config cannot be nil",
 		},
+		"zero-results-with-warning-diagnostic": {
+			server: &fwserver.Server{
+				Provider: &testprovider.Provider{},
+			},
+			request: &fwserver.ListRequest{
+				Config: &tfsdk.Config{},
+				ListResource: &testprovider.ListResourceWithConfigure{
+					ConfigureMethod: func(ctx context.Context, req resource.ConfigureRequest, resp *resource.ConfigureResponse) {
+						resp.Diagnostics.AddWarning("Test Warning", "This is a test warning diagnostic")
+					},
+					ListResource: &testprovider.ListResource{
+						ListMethod: func(ctx context.Context, req list.ListRequest, resp *list.ListResultsStream) {
+							resp.Results = list.NoListResults
+						},
+					},
+				},
+			},
+			expectedStreamEvents: []fwserver.ListResult{
+				{
+					Identity:    nil,
+					Resource:    nil,
+					DisplayName: "",
+					Diagnostics: diag.Diagnostics{
+						diag.NewWarningDiagnostic("Test Warning", "This is a test warning diagnostic"),
+					},
+				},
+			},
+		},
 		"listresource-configure-data": {
 			server: &fwserver.Server{
 				ListResourceConfigureData: "test-provider-configure-value",

internal/fwserver/server_listresources.go

@@ -86,8 +86,8 @@ func (s *Server) ListResourceFuncs(ctx context.Context) (map[string]func() list.
 		}
 
 		schemasResp := list.SchemaResponse{}
-		if listResourceWithSchemas, ok := listResource.(list.ListResourceWithProtoSchemas); ok {
-			listResourceWithSchemas.Schemas(ctx, &schemasResp)
+		if listResourceWithSchemas, ok := listResource.(list.ListResourceWithRawV5Schemas); ok {
+			listResourceWithSchemas.RawV5Schemas(ctx, list.SchemaRequest{}, &schemasResp)
 		}
 
 		resourceFuncs, _ := s.ResourceFuncs(ctx)
@@ -96,7 +96,7 @@ func (s *Server) ListResourceFuncs(ctx context.Context) (map[string]func() list.
 				s.listResourceFuncsDiags.AddError(
 					"ListResource Type Defined without a Matching Managed Resource Type",
 					fmt.Sprintf("The %s ListResource type name was returned, but no matching managed Resource type was defined. ", typeName)+
-						"If the matching managed Resource type is a legacy resource, ProtoV5Schema and ProtoV5IdentitySchema must be specified in the Metadata method. "+
+						"If the matching managed Resource type is a legacy resource, ProtoV5Schema and ProtoV5IdentitySchema must be specified in the RawV5Schemas method. "+
 						"This is always an issue with the provider and should be reported to the provider developers.",
 				)
 				continue

internal/proto5server/server_listresource.go

@@ -56,14 +56,28 @@ func (s *Server) ListResource(ctx context.Context, protoReq *tfprotov5.ListResou
 	}
 
 	schemaResp := list.SchemaResponse{}
-	if listResourceWithProtoSchemas, ok := listResource.(list.ListResourceWithProtoSchemas); ok {
-		listResourceWithProtoSchemas.Schemas(ctx, &schemaResp)
+	if listResourceWithProtoSchemas, ok := listResource.(list.ListResourceWithRawV5Schemas); ok {
+		listResourceWithProtoSchemas.RawV5Schemas(ctx, list.SchemaRequest{}, &schemaResp)
 	}
 
 	// There's validation in ListResources that ensures both are set if either is provided so it should be sufficient to only nil check Identity
 	if schemaResp.ProtoV5IdentitySchema != nil {
-		req.ResourceSchema, _ = fromproto5.ResourceSchema(ctx, schemaResp.ProtoV5Schema())
-		req.ResourceIdentitySchema, _ = fromproto5.IdentitySchema(ctx, schemaResp.ProtoV5IdentitySchema())
+		var err error
+
+		req.ResourceSchema, err = fromproto5.ResourceSchema(ctx, schemaResp.ProtoV5Schema)
+		if err != nil {
+			diags.AddError("Converting Resource Schema", err.Error())
+			allDiags.Append(diags...)
+			return ListRequestErrorDiagnostics(ctx, allDiags...)
+		}
+
+		req.ResourceIdentitySchema, err = fromproto5.IdentitySchema(ctx, schemaResp.ProtoV5IdentitySchema)
+		if err != nil {
+			diags.AddError("Converting Resource Identity Schema", err.Error())
+			allDiags.Append(diags...)
+			return ListRequestErrorDiagnostics(ctx, allDiags...)
+		}
+
 	} else {
 		req.ResourceSchema, diags = s.FrameworkServer.ResourceSchema(ctx, protoReq.TypeName)
 		allDiags.Append(diags...)

list/list_resource.go

@@ -42,14 +42,14 @@ type ListResource interface {
 	List(context.Context, ListRequest, *ListResultsStream)
 }
 
-// ListResourceWithProtoSchemas is an interface type that extends ListResource to include a method
+// ListResourceWithRawV5Schemas is an interface type that extends ListResource to include a method
 // which allows provider developers to supply the ProtoV5 representations of resource and resource identity
 // schemas. This is necessary if list functionality is being used with a legacy resource.
-type ListResourceWithProtoSchemas interface {
+type ListResourceWithRawV5Schemas interface {
 	ListResource
 
-	// Schemas is called to provide the ProtoV5 representations of the resource and resource identity schemas.
-	Schemas(context.Context, *SchemaResponse)
+	// RawV5Schemas is called to provide the ProtoV5 representations of the resource and resource identity schemas.
+	RawV5Schemas(context.Context, SchemaRequest, *SchemaResponse)
 }
 
 // ListResourceWithConfigure is an interface type that extends ListResource to include a method
@@ -193,18 +193,23 @@ type ListResult struct {
 	Diagnostics diag.Diagnostics
 }
 
+// SchemaRequest represents a request for the ListResource to return the
+// ProtoV5 schemas. An instance of this request struct is supplied as an argument
+// to the ListResource type RawV5Schemas method.
+type SchemaRequest struct{}
+
 // SchemaResponse represents a response that is populated by the Schemas method
 // and is used to pass along the ProtoV5 representations of the resource and resource identity schemas.
 type SchemaResponse struct {
 	// ProtoV5IdentitySchema is the ProtoV5 representation of the resource identity
 	// schema. This should only be supplied if framework functionality is being used
 	// with a legacy resource. Currently, this only applies to list.
-	ProtoV5IdentitySchema func() *tfprotov5.ResourceIdentitySchema
+	ProtoV5IdentitySchema *tfprotov5.ResourceIdentitySchema
 
 	// ProtoV5Schema is the ProtoV5 representation of the resource schema
 	// This should only be supplied if framework functionality is being used
 	// with a legacy resource. Currently, this only applies to list.
-	ProtoV5Schema func() *tfprotov5.Schema
+	ProtoV5Schema *tfprotov5.Schema
 }
 
 // ValidateConfigRequest represents a request to validate the configuration of