update private location delete to support both id formats

Author: biscout42

internal/kibana/synthetics/private_location/delete.go

@@ -21,17 +21,24 @@ func (r *Resource) Delete(ctx context.Context, request resource.DeleteRequest, r
 		return
 	}
 
-	monitorId, dg := synthetics.GetCompositeId(plan.ID.ValueString())
+	resourceId := plan.ID.ValueString()
+	namespace := plan.SpaceID.ValueString()
+
+	compositeId, dg := readCompositeIdOrConfigId(resourceId)
 	response.Diagnostics.Append(dg...)
 	if response.Diagnostics.HasError() {
 		return
 	}
 
-	namespace := plan.SpaceID.ValueString()
-	err := kibanaClient.KibanaSynthetics.PrivateLocation.Delete(ctx, monitorId.ResourceId, namespace)
+	if compositeId != nil {
+		resourceId = compositeId.ResourceId
+		namespace = compositeId.ClusterId
+	}
+
+	err := kibanaClient.KibanaSynthetics.PrivateLocation.Delete(ctx, resourceId, namespace)
 
 	if err != nil {
-		response.Diagnostics.AddError(fmt.Sprintf("Failed to delete private location `%s`, namespace %s", monitorId, namespace), err.Error())
+		response.Diagnostics.AddError(fmt.Sprintf("Failed to delete private location `%s`, namespace %s", resourceId, namespace), err.Error())
 		return
 	}
 

internal/kibana/synthetics/private_location/read.go

@@ -7,7 +7,6 @@ import (
 	"github.com/disaster37/go-kibana-rest/v8/kbapi"
 	"github.com/elastic/terraform-provider-elasticstack/internal/kibana/synthetics"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
-	"strings"
 )
 
 func (r *Resource) Read(ctx context.Context, request resource.ReadRequest, response *resource.ReadResponse) {
@@ -26,17 +25,16 @@ func (r *Resource) Read(ctx context.Context, request resource.ReadRequest, respo
 
 	resourceId := state.ID.ValueString()
 	namespace := state.SpaceID.ValueString()
-	if strings.Contains(resourceId, "/") {
-		compositeId, dg := synthetics.GetCompositeId(state.ID.ValueString())
-		response.Diagnostics.Append(dg...)
-		if response.Diagnostics.HasError() {
-			return
-		}
 
+	compositeId, dg := readCompositeIdOrConfigId(resourceId)
+	response.Diagnostics.Append(dg...)
+	if response.Diagnostics.HasError() {
+		return
+	}
+
+	if compositeId != nil {
 		resourceId = compositeId.ResourceId
 		namespace = compositeId.ClusterId
-	} else {
-		resourceId = state.Label.ValueString()
 	}
 
 	result, err := kibanaClient.KibanaSynthetics.PrivateLocation.Get(ctx, resourceId, namespace)

internal/kibana/synthetics/private_location/schema.go

@@ -4,11 +4,13 @@ import (
 	"github.com/disaster37/go-kibana-rest/v8/kbapi"
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients"
 	"github.com/elastic/terraform-provider-elasticstack/internal/kibana/synthetics"
+	"github.com/hashicorp/terraform-plugin-framework/diag"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/listplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/types"
+	"strings"
 )
 
 type tfModelV0 struct {
@@ -86,6 +88,14 @@ func (m *tfModelV0) toPrivateLocationConfig() kbapi.PrivateLocationConfig {
 	}
 }
 
+func readCompositeIdOrConfigId(id string) (*clients.CompositeId, diag.Diagnostics) {
+	if strings.Contains(id, "/") {
+		compositeId, diagnostics := synthetics.GetCompositeId(id)
+		return compositeId, diagnostics
+	}
+	return nil, diag.Diagnostics{}
+}
+
 func toModelV0(pLoc kbapi.PrivateLocation) tfModelV0 {
 
 	resourceID := clients.CompositeId{