Added ResourcesMethod to tests in server_validatelistresourceconfig_test.go

Author: rainkwan

internal/fwserver/server_listresource.go

@@ -88,6 +88,7 @@ func (s *Server) ListResource(ctx context.Context, fwReq *ListRequest, fwStream
 
 	if fwReq.Config == nil {
 		fwStream.Results = NoListResults
+		return
 	}
 
 	req := list.ListRequest{

internal/proto5server/server_validatelistresourceconfig_test.go

@@ -22,10 +22,7 @@ func TestServerValidateListResourceConfig(t *testing.T) {
 
 	testSchema := schema.Schema{
 		Attributes: map[string]schema.Attribute{
-			"test_optional": schema.StringAttribute{
-				Optional: false,
-			},
-			"test_required": schema.StringAttribute{
+			"test": schema.StringAttribute{
 				Required: true,
 			},
 		},
@@ -64,16 +61,17 @@ func TestServerValidateListResourceConfig(t *testing.T) {
 										MetadataMethod: func(_ context.Context, _ resource.MetadataRequest, resp *resource.MetadataResponse) {
 											resp.TypeName = "test_resource"
 										},
-										ListResourceConfigSchemaMethod: func(_ context.Context, _ list.ListResourceSchemaRequest, resp *list.ListResourceSchemaResponse) {
-											resp.Schema = schema.Schema{
-												Attributes: map[string]schema.Attribute{
-													"example_attribute": schema.StringAttribute{
-														Required: true,
-													},
-												},
-											}
-										},
-										ListMethod: func(_ context.Context, _ list.ListRequest, resp *list.ListResultsStream) {
+										ListResourceConfigSchemaMethod: func(_ context.Context, _ list.ListResourceSchemaRequest, resp *list.ListResourceSchemaResponse) {},
+									}
+								},
+							}
+						},
+						ResourcesMethod: func(_ context.Context) []func() resource.Resource {
+							return []func() resource.Resource{
+								func() resource.Resource {
+									return &testprovider.Resource{
+										MetadataMethod: func(_ context.Context, _ resource.MetadataRequest, response *resource.MetadataResponse) {
+											response.TypeName = "test_resource"
 										},
 									}
 								},
@@ -105,6 +103,17 @@ func TestServerValidateListResourceConfig(t *testing.T) {
 								},
 							}
 						},
+						ResourcesMethod: func(ctx context.Context) []func() resource.Resource {
+							return []func() resource.Resource{
+								func() resource.Resource {
+									return &testprovider.Resource{
+										MetadataMethod: func(ctx context.Context, request resource.MetadataRequest, response *resource.MetadataResponse) {
+											response.TypeName = "test_resource"
+										},
+									}
+								},
+							}
+						},
 					},
 				},
 			},
@@ -138,6 +147,17 @@ func TestServerValidateListResourceConfig(t *testing.T) {
 								},
 							}
 						},
+						ResourcesMethod: func(ctx context.Context) []func() resource.Resource {
+							return []func() resource.Resource{
+								func() resource.Resource {
+									return &testprovider.Resource{
+										MetadataMethod: func(ctx context.Context, request resource.MetadataRequest, response *resource.MetadataResponse) {
+											response.TypeName = "test_resource"
+										},
+									}
+								},
+							}
+						},
 					},
 				},
 			},

internal/proto6server/server_validatelistresourceconfig_test.go

@@ -6,6 +6,7 @@ package proto6server
 import (
 	"context"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-go/tftypes"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -14,12 +15,19 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/list"
 	"github.com/hashicorp/terraform-plugin-framework/list/schema"
 	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
-	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 func TestServerValidateListResourceConfig(t *testing.T) {
 	t.Parallel()
 
+	testSchema := schema.Schema{
+		Attributes: map[string]schema.Attribute{
+			"test": schema.StringAttribute{
+				Required: true,
+			},
+		},
+	}
+
 	testType := tftypes.Object{
 		AttributeTypes: map[string]tftypes.Type{
 			"test": tftypes.String,
@@ -36,14 +44,6 @@ func TestServerValidateListResourceConfig(t *testing.T) {
 		t.Fatalf("unexpected error calling tfprotov6.NewDynamicValue(): %s", err)
 	}
 
-	testSchema := schema.Schema{
-		Attributes: map[string]schema.Attribute{
-			"test": schema.StringAttribute{
-				Required: true,
-			},
-		},
-	}
-
 	testCases := map[string]struct {
 		server           *Server
 		request          *tfprotov6.ValidateListResourceConfigRequest
@@ -58,10 +58,21 @@ func TestServerValidateListResourceConfig(t *testing.T) {
 							return []func() list.ListResource{
 								func() list.ListResource {
 									return &testprovider.ListResource{
-										ListResourceConfigSchemaMethod: func(_ context.Context, _ list.ListResourceSchemaRequest, resp *list.ListResourceSchemaResponse) {},
 										MetadataMethod: func(_ context.Context, _ resource.MetadataRequest, resp *resource.MetadataResponse) {
 											resp.TypeName = "test_resource"
 										},
+										ListResourceConfigSchemaMethod: func(_ context.Context, _ list.ListResourceSchemaRequest, resp *list.ListResourceSchemaResponse) {},
+									}
+								},
+							}
+						},
+						ResourcesMethod: func(_ context.Context) []func() resource.Resource {
+							return []func() resource.Resource{
+								func() resource.Resource {
+									return &testprovider.Resource{
+										MetadataMethod: func(_ context.Context, _ resource.MetadataRequest, response *resource.MetadataResponse) {
+											response.TypeName = "test_resource"
+										},
 									}
 								},
 							}
@@ -92,6 +103,17 @@ func TestServerValidateListResourceConfig(t *testing.T) {
 								},
 							}
 						},
+						ResourcesMethod: func(ctx context.Context) []func() resource.Resource {
+							return []func() resource.Resource{
+								func() resource.Resource {
+									return &testprovider.Resource{
+										MetadataMethod: func(ctx context.Context, request resource.MetadataRequest, response *resource.MetadataResponse) {
+											response.TypeName = "test_resource"
+										},
+									}
+								},
+							}
+						},
 					},
 				},
 			},
@@ -125,6 +147,17 @@ func TestServerValidateListResourceConfig(t *testing.T) {
 								},
 							}
 						},
+						ResourcesMethod: func(ctx context.Context) []func() resource.Resource {
+							return []func() resource.Resource{
+								func() resource.Resource {
+									return &testprovider.Resource{
+										MetadataMethod: func(ctx context.Context, request resource.MetadataRequest, response *resource.MetadataResponse) {
+											response.TypeName = "test_resource"
+										},
+									}
+								},
+							}
+						},
 					},
 				},
 			},