Use composite id for internal id

Author: nick-benoit

internal/kibana/security_exception_list/create.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 
 	"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/elastic/terraform-provider-elasticstack/internal/utils"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
@@ -129,7 +130,11 @@ func (r *ExceptionListResource) Create(ctx context.Context, req resource.CreateR
 func (r *ExceptionListResource) updateStateFromAPIResponse(ctx context.Context, model *ExceptionListModel, apiResp *kbapi.SecurityExceptionsAPIExceptionList) diag.Diagnostics {
 	var diags diag.Diagnostics
 
-	model.ID = types.StringValue(string(apiResp.Id))
+	compId := clients.CompositeId{
+		ClusterId:  model.SpaceID.ValueString(),
+		ResourceId: string(apiResp.Id),
+	}
+	model.ID = types.StringValue(compId.String())
 	model.ListID = types.StringValue(string(apiResp.ListId))
 	model.Name = types.StringValue(string(apiResp.Name))
 	model.Description = types.StringValue(string(apiResp.Description))

internal/kibana/security_exception_list/delete.go

@@ -4,6 +4,7 @@ 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"
 )
@@ -23,12 +24,19 @@ func (r *ExceptionListResource) Delete(ctx context.Context, req resource.DeleteR
 		return
 	}
 
-	// Delete by ID
-	id := kbapi.SecurityExceptionsAPIExceptionListId(state.ID.ValueString())
+	// Parse composite ID to get space_id and resource_id
+	compId, compIdDiags := clients.CompositeIdFromStrFw(state.ID.ValueString())
+	resp.Diagnostics.Append(compIdDiags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	// Delete by resource ID from composite ID
+	id := kbapi.SecurityExceptionsAPIExceptionListId(compId.ResourceId)
 	params := &kbapi.DeleteExceptionListParams{
 		Id: &id,
 	}
 
-	diags = kibana_oapi.DeleteExceptionList(ctx, client, state.SpaceID.ValueString(), params)
+	diags = kibana_oapi.DeleteExceptionList(ctx, client, compId.ClusterId, params)
 	resp.Diagnostics.Append(diags...)
 }

internal/kibana/security_exception_list/read.go

@@ -4,6 +4,7 @@ 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"
 )
@@ -23,13 +24,20 @@ func (r *ExceptionListResource) Read(ctx context.Context, req resource.ReadReque
 		return
 	}
 
-	// Read by ID
-	id := kbapi.SecurityExceptionsAPIExceptionListId(state.ID.ValueString())
+	// Parse composite ID to get space_id and resource_id
+	compId, compIdDiags := clients.CompositeIdFromStrFw(state.ID.ValueString())
+	resp.Diagnostics.Append(compIdDiags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
+	// Read by resource ID from composite ID
+	id := kbapi.SecurityExceptionsAPIExceptionListId(compId.ResourceId)
 	params := &kbapi.ReadExceptionListParams{
 		Id: &id,
 	}
 
-	readResp, diags := kibana_oapi.GetExceptionList(ctx, client, state.SpaceID.ValueString(), params)
+	readResp, diags := kibana_oapi.GetExceptionList(ctx, client, compId.ClusterId, params)
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {
 		return

internal/kibana/security_exception_list/update.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 
 	"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/elastic/terraform-provider-elasticstack/internal/utils"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
@@ -25,8 +26,15 @@ func (r *ExceptionListResource) Update(ctx context.Context, req resource.UpdateR
 		return
 	}
 
+	// Parse composite ID to get space_id and resource_id
+	compId, compIdDiags := clients.CompositeIdFromStrFw(plan.ID.ValueString())
+	resp.Diagnostics.Append(compIdDiags...)
+	if resp.Diagnostics.HasError() {
+		return
+	}
+
 	// Build the update request body
-	id := kbapi.SecurityExceptionsAPIExceptionListId(plan.ID.ValueString())
+	id := kbapi.SecurityExceptionsAPIExceptionListId(compId.ResourceId)
 	body := kbapi.UpdateExceptionListJSONRequestBody{
 		Id:          &id,
 		Name:        kbapi.SecurityExceptionsAPIExceptionListName(plan.Name.ValueString()),