fix(terraform): delete config resources by updating them with an empty object (#507)

Author: kklimonda-cl

assets/terraform/internal/manager/config.go

@@ -9,7 +9,6 @@ import (
 	sdkerrors "github.com/PaloAltoNetworks/pango/errors"
 	"github.com/PaloAltoNetworks/pango/util"
 	"github.com/PaloAltoNetworks/pango/version"
-	"github.com/PaloAltoNetworks/pango/xmlapi"
 )
 
 type TFConfigObject[E any] interface {
@@ -86,22 +85,14 @@ func (o *ConfigObjectManager[C, L, S]) Read(ctx context.Context, location L, com
 }
 
 func (o *ConfigObjectManager[C, L, S]) Delete(ctx context.Context, location L, config C) error {
-	deletes := xmlapi.NewChunkedMultiConfig(1, 1)
-
 	xpath, err := location.XpathWithComponents(o.client.Versioning())
 	if err != nil {
 		return err
 	}
 
-	deletes.Add(&xmlapi.Config{
-		Action: "delete",
-		Xpath:  util.AsXpath(xpath),
-		Target: o.client.GetTarget(),
-	})
-
-	_, _, _, err = o.client.MultiConfig(ctx, deletes, false, nil)
+	err = o.service.UpdateWithXpath(ctx, util.AsXpath(xpath), config)
 	if err != nil {
-		return &Error{err: err, message: "sdk error while deleting"}
+		return err
 	}
 
 	return nil

pkg/translate/terraform_provider/template.go

@@ -1635,20 +1635,23 @@ const resourceDeleteFunction = `
 		return
 	}
 {{- else }}
+	components, err := state.resourceXpathParentComponents()
+	if err != nil {
+		resp.Diagnostics.AddError("Error creating resource xpath", err.Error())
+		return
+	}
 
-{{- $ev := "nil" }}
-{{- if .HasEncryptedResources }}
-  {{- $ev = "&ev" }}
-	ev := make(map[string]types.String)
-{{- end }}
-	var obj *{{ $resourceSDKStructName }}
-	resp.Diagnostics.Append(state.CopyToPango(ctx, &obj, {{ $ev }})...)
-	if resp.Diagnostics.HasError() {
+	existing, err := r.manager.Read(ctx, location, components)
+	if err != nil {
+		resp.Diagnostics.AddError("Error while deleting resource", err.Error())
 		return
 	}
 
-	err := r.manager.Delete(ctx, location, obj)
-	if err != nil && errors.Is(err, sdkmanager.ErrObjectNotFound) {
+	var obj {{ $resourceSDKStructName }}
+	obj.Misc = existing.Misc
+
+	err = r.manager.Delete(ctx, location, &obj)
+	if err != nil && !errors.Is(err, sdkmanager.ErrObjectNotFound) {
 		resp.Diagnostics.AddError("Error in delete", err.Error())
 		return
 	}