Merge pull request #5872 from jeffa5/ajeffery/list-acceptance-tests

Add rule list acceptance tests

Author: vaishakdinesh

internal/services/list/data_source.go

@@ -67,7 +67,7 @@ func (d *ListDataSource) Read(ctx context.Context, req datasource.ReadRequest, r
 	env := ListResultDataSourceEnvelope{*data}
 	_, err := d.client.Rules.Lists.Get(
 		ctx,
-		data.ID.ValueString(),
+		data.ListID.ValueString(),
 		params,
 		option.WithResponseBodyInto(&res),
 		option.WithMiddleware(logging.Middleware(ctx)),

internal/services/list/data_source_model.go

@@ -16,8 +16,9 @@ type ListResultDataSourceEnvelope struct {
 }
 
 type ListDataSourceModel struct {
-	ID                    types.String  `tfsdk:"id" path:"id,required"`
 	AccountID             types.String  `tfsdk:"account_id" path:"account_id,required"`
+	ListID                types.String  `tfsdk:"list_id" path:"list_id,required"`
+	ID                    types.String  `tfsdk:"id" path:"list_id,computed"`
 	CreatedOn             types.String  `tfsdk:"created_on" json:"created_on,computed"`
 	Description           types.String  `tfsdk:"description" json:"description,computed"`
 	Kind                  types.String  `tfsdk:"kind" json:"kind,computed"`

internal/services/list/data_source_schema.go

@@ -16,14 +16,18 @@ var _ datasource.DataSourceWithConfigValidators = (*ListDataSource)(nil)
 func DataSourceSchema(ctx context.Context) schema.Schema {
 	return schema.Schema{
 		Attributes: map[string]schema.Attribute{
-			"id": schema.StringAttribute{
-				Description: "The unique ID of the list.",
-				Required:    true,
-			},
 			"account_id": schema.StringAttribute{
 				Description: "The Account ID for this resource.",
 				Required:    true,
 			},
+			"list_id": schema.StringAttribute{
+				Description: "The unique ID of the list.",
+				Required:    true,
+			},
+			"id": schema.StringAttribute{
+				Description: "The unique ID of the list.",
+				Computed:    true,
+			},
 			"created_on": schema.StringAttribute{
 				Description: "The RFC 3339 timestamp of when the list was created.",
 				Computed:    true,

internal/services/list/resource_test.go

@@ -1,7 +1,6 @@
-
-  resource "cloudflare_list" "%[1]s" {
-    account_id = "%[4]s"
-    name = "%[2]s"
-    description = "%[3]s"
-    kind = "%[5]s"
-  }
+resource "cloudflare_list" "%[1]s" {
+  account_id = "%[4]s"
+  name = "%[2]s"
+  description = "%[3]s"
+  kind = "%[5]s"
+}

internal/services/list/testdata/list.tf

@@ -0,0 +1,11 @@
+resource "cloudflare_list" "%[1]s" {
+  account_id = "%[2]s"
+  name = "%[3]s"
+  description = "%[4]s"
+  kind = "%[5]s"
+}
+
+data "cloudflare_list" "%[1]s" {
+  account_id = "%[2]s"
+  list_id    = cloudflare_list.%[1]s.id
+}