Merge pull request #5852 from broswen/bswenson/list-item-import

implement import for list_item

Author: vaishakdinesh

internal/services/list_item/resource.go

@@ -14,6 +14,7 @@ import (
 	"github.com/cloudflare/cloudflare-go/v5/option"
 	"github.com/cloudflare/cloudflare-go/v5/rules"
 	"github.com/cloudflare/terraform-provider-cloudflare/internal/apijson"
+	"github.com/cloudflare/terraform-provider-cloudflare/internal/importpath"
 	"github.com/cloudflare/terraform-provider-cloudflare/internal/logging"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -23,6 +24,7 @@ import (
 // Ensure provider defined types fully satisfy framework interfaces.
 var _ resource.ResourceWithConfigure = (*ListItemResource)(nil)
 var _ resource.ResourceWithModifyPlan = (*ListItemResource)(nil)
+var _ resource.ResourceWithImportState = (*ListItemResource)(nil)
 
 func NewResource() resource.Resource {
 	return &ListItemResource{}
@@ -265,6 +267,55 @@ func (r *ListItemResource) Delete(ctx context.Context, req resource.DeleteReques
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
 }
 
+func (r *ListItemResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
+	var data *ListItemModel = new(ListItemModel)
+
+	path_account_id := ""
+	path_list_id := ""
+	path_item_id := ""
+	diags := importpath.ParseImportID(
+		req.ID,
+		"<account_id>/<list_id>/<item_id>",
+		&path_account_id,
+		&path_list_id,
+		&path_item_id,
+	)
+	resp.Diagnostics.Append(diags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	data.AccountID = types.StringValue(path_account_id)
+	data.ListID = types.StringValue(path_list_id)
+	data.ID = types.StringValue(path_item_id)
+
+	res := new(http.Response)
+	env := ListItemResultEnvelope{*data}
+	_, err := r.client.Rules.Lists.Items.Get(
+		ctx,
+		path_list_id,
+		path_item_id,
+		rules.ListItemGetParams{
+			AccountID: cloudflare.F(path_account_id),
+		},
+		option.WithResponseBodyInto(&res),
+		option.WithMiddleware(logging.Middleware(ctx)),
+	)
+	if err != nil {
+		resp.Diagnostics.AddError("failed to make http request", err.Error())
+		return
+	}
+	bytes, _ := io.ReadAll(res.Body)
+	err = apijson.Unmarshal(bytes, &env)
+	if err != nil {
+		resp.Diagnostics.AddError("failed to deserialize http request", err.Error())
+		return
+	}
+	data = &env.Result
+
+	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)
+}
+
 func (r *ListItemResource) ModifyPlan(_ context.Context, _ resource.ModifyPlanRequest, _ *resource.ModifyPlanResponse) {
 
 }

internal/services/list_item/resource_test.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/cloudflare/terraform-provider-cloudflare/internal/acctest"
 	"github.com/cloudflare/terraform-provider-cloudflare/internal/utils"
+	"github.com/hashicorp/terraform-plugin-testing/terraform"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
@@ -33,6 +34,49 @@ func TestAccCloudflareListItem_Basic(t *testing.T) {
 	})
 }
 
+func TestAccCloudflareListItem_Import(t *testing.T) {
+	rnd := utils.GenerateRandomResourceName()
+	itemName := fmt.Sprintf("cloudflare_list_item.%s", rnd)
+	listName := fmt.Sprintf("cloudflare_list.%s", rnd)
+	accountID := os.Getenv("CLOUDFLARE_ACCOUNT_ID")
+	ip := "192.0.2.0"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck: func() {
+			acctest.TestAccPreCheck_AccountID(t)
+			acctest.TestAccPreCheck_Credentials(t)
+		},
+		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCheckCloudflareIPListItem(rnd, rnd, rnd, accountID),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(itemName, "ip", ip),
+					resource.TestCheckResourceAttr(itemName, "comment", rnd),
+				),
+			},
+			{
+				ResourceName:      itemName,
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateIdFunc: func(s *terraform.State) (string, error) {
+					rs, ok := s.RootModule().Resources[listName]
+					if !ok {
+						return "", fmt.Errorf("list resource not found: %s", listName)
+					}
+					listID := rs.Primary.ID
+					rs, ok = s.RootModule().Resources[itemName]
+					if !ok {
+						return "", fmt.Errorf("list_item resource not found: %s", itemName)
+					}
+					itemID := rs.Primary.ID
+					return fmt.Sprintf("%s/%s/%s", accountID, listID, itemID), nil
+				},
+			},
+		},
+	})
+}
+
 func TestAccCloudflareListItem_MultipleItems(t *testing.T) {
 	t.Skip("FIXME: Getting rate limited. Probably causing the cascading failures with the rest.")
 	rnd := utils.GenerateRandomResourceName()