Use composite id for internal id

Author: nick-benoit

internal/kibana/security_list/models.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/elastic/terraform-provider-elasticstack/generated/kbapi"
+	"github.com/elastic/terraform-provider-elasticstack/internal/clients"
 	"github.com/elastic/terraform-provider-elasticstack/internal/utils"
 	"github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
@@ -112,7 +113,13 @@ func (m *SecurityListModel) toUpdateRequest() (*kbapi.UpdateListJSONRequestBody,
 func (m *SecurityListModel) fromAPI(ctx context.Context, apiList *kbapi.SecurityListsAPIList) diag.Diagnostics {
 	var diags diag.Diagnostics
 
-	m.ID = utils.StringishValue(apiList.Id)
+	// Create composite ID from space_id and list_id
+	compId := clients.CompositeId{
+		ClusterId:  m.SpaceID.ValueString(),
+		ResourceId: string(apiList.Id),
+	}
+	m.ID = types.StringValue(compId.String())
+
 	m.ListID = utils.StringishValue(apiList.Id)
 	m.Name = utils.StringishValue(apiList.Name)
 	m.Description = utils.StringishValue(apiList.Description)

internal/kibana/security_list/read.go

@@ -4,8 +4,10 @@ import (
 	"context"
 
 	"github.com/elastic/terraform-provider-elasticstack/generated/kbapi"
+	"github.com/elastic/terraform-provider-elasticstack/internal/clients"
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients/kibana_oapi"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
+	"github.com/hashicorp/terraform-plugin-framework/types"
 )
 
 func (r *securityListResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
@@ -21,10 +23,20 @@ func (r *securityListResource) Read(ctx context.Context, req resource.ReadReques
 		return
 	}
 
+	// Parse composite ID to get space_id and list_id
 	spaceID := state.SpaceID.ValueString()
+	listID := state.ListID.ValueString()
+
+	// Try to parse as composite ID from state.ID
+	if compId, diags := clients.CompositeIdFromStrFw(state.ID.ValueString()); !diags.HasError() {
+		spaceID = compId.ClusterId
+		listID = compId.ResourceId
+		// Update space_id in state if it was parsed from composite ID
+		state.SpaceID = types.StringValue(spaceID)
+	}
 
 	params := &kbapi.ReadListParams{
-		Id: kbapi.SecurityListsAPIListId(state.ID.ValueString()),
+		Id: kbapi.SecurityListsAPIListId(listID),
 	}
 
 	readResp, diags := kibana_oapi.GetList(ctx, client, spaceID, params)