refactor: apply request editor pattern to all Fleet resources

Following Tobio's enrollment tokens example, refactor all Fleet client
functions to use spaceAwarePathRequestEditor instead of duplicate *InSpace
functions with manual HTTP handling.

Changes:
- Deleted 17 duplicate *InSpace functions (~581 lines of manual HTTP code)
- Updated base functions to accept spaceID parameter and use request editor
- Simplified all CRUD operations to single function calls
- Updated test files for new signatures

Benefits:
- Single code path using generated client (vs manual HTTP)
- Consistent pattern across all Fleet resources
- Eliminates 50% code duplication for Fleet operations
- Easier to maintain and test

All Fleet resources now use:
  GetResource(ctx, client, id, spaceID)
  CreateResource(ctx, client, spaceID, body)
  UpdateResource(ctx, client, id, spaceID, body)
  DeleteResource(ctx, client, id, spaceID)

The spaceAwarePathRequestEditor handles path modification automatically.

Author: jamesagarside

internal/clients/fleet/fleet.go

@@ -622,7 +622,7 @@ func checkResourceAgentPolicyDestroy(s *terraform.State) error {
 		if err != nil {
 			return err
 		}
-		policy, diags := fleet.GetAgentPolicy(context.Background(), fleetClient, rs.Primary.ID)
+		policy, diags := fleet.GetAgentPolicy(context.Background(), fleetClient, rs.Primary.ID, "")
 		if diags.HasError() {
 			return diagutil.FwDiagsAsError(diags)
 		}
@@ -648,15 +648,15 @@ func checkResourceAgentPolicySkipDestroy(s *terraform.State) error {
 		if err != nil {
 			return err
 		}
-		policy, diags := fleet.GetAgentPolicy(context.Background(), fleetClient, rs.Primary.ID)
+		policy, diags := fleet.GetAgentPolicy(context.Background(), fleetClient, rs.Primary.ID, "")
 		if diags.HasError() {
 			return diagutil.FwDiagsAsError(diags)
 		}
 		if policy == nil {
 			return fmt.Errorf("agent policy id=%v does not exist, but should still exist when skip_destroy is true", rs.Primary.ID)
 		}
 
-		if diags = fleet.DeleteAgentPolicy(context.Background(), fleetClient, rs.Primary.ID); diags.HasError() {
+		if diags = fleet.DeleteAgentPolicy(context.Background(), fleetClient, rs.Primary.ID, ""); diags.HasError() {
 			return diagutil.FwDiagsAsError(diags)
 		}
 	}

internal/fleet/agent_policy/acc_test.go

@@ -54,23 +54,19 @@ func (r *agentPolicyResource) Create(ctx context.Context, req resource.CreateReq
 		// exists within that space context, not in the default space.
 		var readPolicy *kbapi.AgentPolicy
 		var getDiags diag.Diagnostics
+		var spaceID string
 
 		if !planModel.SpaceIds.IsNull() && !planModel.SpaceIds.IsUnknown() {
 			var tempDiags diag.Diagnostics
 			spaceIDs := utils.SetTypeAs[types.String](ctx, planModel.SpaceIds, path.Root("space_ids"), &tempDiags)
 			if !tempDiags.HasError() && len(spaceIDs) > 0 {
 				// Use the first space for the GET request
-				spaceID := spaceIDs[0].ValueString()
-				readPolicy, getDiags = fleet.GetAgentPolicyInSpace(ctx, client, policy.Id, spaceID)
-			} else {
-				// Fall back to standard GET if we couldn't extract space IDs
-				readPolicy, getDiags = fleet.GetAgentPolicy(ctx, client, policy.Id)
+				spaceID = spaceIDs[0].ValueString()
 			}
-		} else {
-			// No space_ids, use standard GET
-			readPolicy, getDiags = fleet.GetAgentPolicy(ctx, client, policy.Id)
 		}
 
+		readPolicy, getDiags = fleet.GetAgentPolicy(ctx, client, policy.Id, spaceID)
+
 		resp.Diagnostics.Append(getDiags...)
 		if resp.Diagnostics.HasError() {
 			return

internal/fleet/agent_policy/create.go

@@ -41,11 +41,7 @@ func (r *agentPolicyResource) Delete(ctx context.Context, req resource.DeleteReq
 	}
 
 	// Delete using the operational space from STATE
-	if spaceID != "" {
-		diags = fleet.DeleteAgentPolicyInSpace(ctx, client, policyID, spaceID)
-	} else {
-		diags = fleet.DeleteAgentPolicy(ctx, client, policyID)
-	}
+	diags = fleet.DeleteAgentPolicy(ctx, client, policyID, spaceID)
 
 	resp.Diagnostics.Append(diags...)
 }

internal/fleet/agent_policy/delete.go

@@ -3,7 +3,6 @@ package agent_policy
 import (
 	"context"
 
-	"github.com/elastic/terraform-provider-elasticstack/generated/kbapi"
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients/fleet"
 	fleetutils "github.com/elastic/terraform-provider-elasticstack/internal/fleet"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
@@ -34,12 +33,7 @@ func (r *agentPolicyResource) Read(ctx context.Context, req resource.ReadRequest
 	}
 
 	// Query using the operational space from STATE
-	var policy *kbapi.AgentPolicy
-	if spaceID != "" {
-		policy, diags = fleet.GetAgentPolicyInSpace(ctx, client, policyID, spaceID)
-	} else {
-		policy, diags = fleet.GetAgentPolicy(ctx, client, policyID)
-	}
+	policy, diags := fleet.GetAgentPolicy(ctx, client, policyID, spaceID)
 
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {

internal/fleet/agent_policy/read.go

@@ -3,7 +3,6 @@ package agent_policy
 import (
 	"context"
 
-	"github.com/elastic/terraform-provider-elasticstack/generated/kbapi"
 	"github.com/elastic/terraform-provider-elasticstack/internal/clients/fleet"
 	fleetutils "github.com/elastic/terraform-provider-elasticstack/internal/fleet"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
@@ -52,12 +51,7 @@ func (r *agentPolicyResource) Update(ctx context.Context, req resource.UpdateReq
 
 	// Update using the operational space from STATE
 	// The API will handle adding/removing the policy from spaces based on space_ids in body
-	var policy *kbapi.AgentPolicy
-	if spaceID != "" {
-		policy, diags = fleet.UpdateAgentPolicyInSpace(ctx, client, policyID, spaceID, body)
-	} else {
-		policy, diags = fleet.UpdateAgentPolicy(ctx, client, policyID, body)
-	}
+	policy, diags := fleet.UpdateAgentPolicy(ctx, client, policyID, spaceID, body)
 
 	resp.Diagnostics.Append(diags...)
 	if resp.Diagnostics.HasError() {

internal/fleet/agent_policy/update.go

@@ -68,7 +68,7 @@ func checkResourceAgentPolicyDestroy(s *terraform.State) error {
 		if err != nil {
 			return err
 		}
-		policy, diags := fleet.GetAgentPolicy(context.Background(), fleetClient, rs.Primary.ID)
+		policy, diags := fleet.GetAgentPolicy(context.Background(), fleetClient, rs.Primary.ID, "")
 		if diags.HasError() {
 			return diagutil.FwDiagsAsError(diags)
 		}

internal/fleet/enrollment_tokens/data_source_test.go

@@ -136,7 +136,7 @@ func TestAccResourceIntegrationDeleted(t *testing.T) {
 					require.NoError(t, err)
 
 					ctx := context.Background()
-					diags := fleet.Uninstall(ctx, fleetClient, "sysmon_linux", "1.7.0", true)
+					diags := fleet.Uninstall(ctx, fleetClient, "sysmon_linux", "1.7.0", "", true)
 					require.Empty(t, diags)
 				},
 				// Expect the plan to want to reinstall

internal/fleet/integration/acc_test.go

@@ -45,11 +45,7 @@ func (r integrationResource) create(ctx context.Context, plan tfsdk.Plan, state
 		}
 	}
 
-	if spaceID != "" && spaceID != "default" {
-		diags = fleet.InstallPackageInSpace(ctx, client, name, version, spaceID, force)
-	} else {
-		diags = fleet.InstallPackage(ctx, client, name, version, force)
-	}
+	diags = fleet.InstallPackage(ctx, client, name, version, spaceID, force)
 	respDiags.Append(diags...)
 	if respDiags.HasError() {
 		return

internal/fleet/integration/create.go

@@ -46,10 +46,6 @@ func (r *integrationResource) Delete(ctx context.Context, req resource.DeleteReq
 		}
 	}
 
-	if spaceID != "" && spaceID != "default" {
-		diags = fleet.UninstallInSpace(ctx, client, name, version, spaceID, force)
-	} else {
-		diags = fleet.Uninstall(ctx, client, name, version, force)
-	}
+	diags = fleet.Uninstall(ctx, client, name, version, spaceID, force)
 	resp.Diagnostics.Append(diags...)
 }