fix(list_item): fix schema mappings

cloudflare · Feb 5, 2025 · 7944314 · 7944314
1 parent 169d4f5
commit 7944314
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/internal/services/list_item/model.go b/internal/services/list_item/model.go
@@ -15,7 +15,7 @@ type ListItemResultEnvelope struct {
 type ListItemModel struct {
 	ListID      types.String                                    `tfsdk:"list_id" path:"list_id,required"`
 	AccountID   types.String                                    `tfsdk:"account_id" path:"account_id,optional"`
-	ItemID      types.String                                    `tfsdk:"item_id" path:"item_id,computed"`
+	ID          types.String                                    `tfsdk:"id" path:"item_id,computed"`
 	ASN         types.Int64                                     `tfsdk:"asn" json:"asn,optional"`
 	Comment     types.String                                    `tfsdk:"comment" json:"comment,optional"`
 	IP          types.String                                    `tfsdk:"ip" json:"ip,optional"`

diff --git a/internal/services/list_item/resource.go b/internal/services/list_item/resource.go
@@ -115,15 +115,15 @@ func (r *ListItemResource) Create(ctx context.Context, req resource.CreateReques
 	}
 	findListItem, _ := io.ReadAll(findItemRes.Body)
 	itemID := gjson.Get(string(findListItem), "result.0.id")
-	data.ItemID = types.StringValue(itemID.String())
+	data.ID = types.StringValue(itemID.String())
 
 	env := ListItemResultEnvelope{*data}
 	listItemRes := new(http.Response)
 	_, err = r.client.Rules.Lists.Items.Get(
 		ctx,
 		data.AccountID.ValueString(),
 		data.ListID.ValueString(),
-		data.ItemID.ValueString(),
+		data.ID.ValueString(),
 		option.WithResponseBodyInto(&listItemRes),
 		option.WithMiddleware(logging.Middleware(ctx)),
 	)
@@ -207,7 +207,7 @@ func (r *ListItemResource) Read(ctx context.Context, req resource.ReadRequest, r
 		ctx,
 		data.AccountID.ValueString(),
 		data.ListID.ValueString(),
-		data.ItemID.ValueString(),
+		data.ID.ValueString(),
 		option.WithResponseBodyInto(&res),
 		option.WithMiddleware(logging.Middleware(ctx)),
 	)
@@ -242,7 +242,7 @@ func (r *ListItemResource) Delete(ctx context.Context, req resource.DeleteReques
 
 	deletePayload := bodyDeletePayload{
 		Items: []bodyDeleteItems{{
-			ID: data.ItemID.ValueString(),
+			ID: data.ID.ValueString(),
 		}},
 	}
 	deleteBody, _ := json.Marshal(deletePayload)

diff --git a/internal/services/list_item/schema.go b/internal/services/list_item/schema.go
@@ -31,7 +31,7 @@ func ResourceSchema(ctx context.Context) schema.Schema {
 				Optional:      true,
 				PlanModifiers: []planmodifier.String{stringplanmodifier.RequiresReplace()},
 			},
-			"item_id": schema.StringAttribute{
+			"id": schema.StringAttribute{
 				Description:   "The unique ID of the item in the List.",
 				Computed:      true,
 				PlanModifiers: []planmodifier.String{stringplanmodifier.RequiresReplace()},
@@ -42,16 +42,12 @@ func ResourceSchema(ctx context.Context) schema.Schema {
 			},
 			"comment": schema.StringAttribute{
 				Description: "An informative summary of the list item.",
-				Computed:    true,
+				Optional:    true,
 			},
 			"created_on": schema.StringAttribute{
 				Description: "The RFC 3339 timestamp of when the item was created.",
 				Computed:    true,
 			},
-			"id": schema.StringAttribute{
-				Description: "The unique ID of the list.",
-				Computed:    true,
-			},
 			"modified_on": schema.StringAttribute{
 				Description: "The RFC 3339 timestamp of when the item was last modified.",
 				Computed:    true,