Patch delete agent policy spec

Author: tobio

generated/kbapi/kibana.gen.go

@@ -820,6 +820,18 @@ func transformKibanaPaths(schema *Schema) {
 
 	schema.Components.CreateRef(schema, "Data_views_create_data_view_request_object_inner", "schemas.Data_views_create_data_view_request_object.properties.data_view")
 	schema.Components.CreateRef(schema, "Data_views_update_data_view_request_object_inner", "schemas.Data_views_update_data_view_request_object.properties.data_view")
+
+	// Can be removed when https://github.com/elastic/kibana/pull/226713 is merged
+	schema.Components.Set("schemas.APM_UI_delete_service_object", Map{
+		"type": "object",
+		"properties": Map{
+			"service": Map{
+				"$ref": "#/components/schemas/APM_UI_service_object",
+			},
+		},
+	})
+	agentConfigPath := schema.MustGetPath("/api/apm/settings/agent-configuration")
+	agentConfigPath.Delete.Set("requestBody.content.application/json.schema.$ref", "#/components/schemas/APM_UI_delete_service_object")
 }
 
 // transformFleetPaths fixes the fleet paths.

generated/kbapi/transform_schema.go

@@ -1,9 +1,7 @@
 package agent_configuration
 
 import (
-	"bytes"
 	"context"
-	"encoding/json"
 	"fmt"
 	"strings"
 
@@ -13,13 +11,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 )
 
-type deleteAgentConfigurationRequestBody struct {
-	Service struct {
-		Name        string  `json:"name"`
-		Environment *string `json:"environment,omitempty"`
-	} `json:"service"`
-}
-
 func (r *resourceAgentConfiguration) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
 	var state AgentConfiguration
 	resp.Diagnostics.Append(req.State.Get(ctx, &state)...)
@@ -40,17 +31,13 @@ func (r *resourceAgentConfiguration) Delete(ctx context.Context, req resource.De
 		serviceEnv = &idParts[1]
 	}
 
-	deleteReqBody := deleteAgentConfigurationRequestBody{}
-	deleteReqBody.Service.Name = serviceName
-	deleteReqBody.Service.Environment = serviceEnv
-
-	bodyBytes, err := json.Marshal(deleteReqBody)
-	if err != nil {
-		resp.Diagnostics.AddError("Failed to serialize delete request body", err.Error())
-		return
+	deleteReqBody := kbapi.APMUIDeleteServiceObject{
+		Service: &kbapi.APMUIServiceObject{
+			Name:        &serviceName,
+			Environment: serviceEnv,
+		},
 	}
-
-	apiResp, err := kibana.API.DeleteAgentConfigurationWithBody(ctx, &kbapi.DeleteAgentConfigurationParams{}, "application/json", bytes.NewReader(bodyBytes))
+	apiResp, err := kibana.API.DeleteAgentConfiguration(ctx, &kbapi.DeleteAgentConfigurationParams{}, deleteReqBody)
 	if err != nil {
 		resp.Diagnostics.AddError("Failed to delete APM agent configuration", err.Error())
 		return