Merge pull request #4590 from vaishakdinesh/vaishak/zone-dns-sec

Fix: testdata and custom code

internal/services/zone_dnssec/custom.go

@@ -0,0 +1,27 @@
+package zone_dnssec
+
+import (
+	"context"
+
+	"github.com/cloudflare/cloudflare-go/v3"
+	"github.com/cloudflare/cloudflare-go/v3/dnssec"
+	"github.com/cloudflare/cloudflare-go/v3/option"
+	"github.com/cloudflare/terraform-provider-cloudflare/internal/logging"
+	"github.com/hashicorp/terraform-plugin-framework/resource"
+)
+
+func disableDNSSECRecord(ctx context.Context, r *ZoneDNSSECResource, zoneID string, resp *resource.DeleteResponse) {
+	var err error
+	_, err = r.client.DNSSEC.Edit(
+		ctx,
+		dnssec.DNSSECEditParams{
+			ZoneID: cloudflare.F(zoneID),
+			Status: cloudflare.F[dnssec.DNSSECEditParamsStatus](dnssec.DNSSECEditParamsStatusDisabled),
+		},
+		option.WithMiddleware(logging.Middleware(ctx)),
+	)
+	if err != nil {
+		resp.Diagnostics.AddError("failed to make http request", err.Error())
+		return
+	}
+}

internal/services/zone_dnssec/resource.go

@@ -188,6 +188,8 @@ func (r *ZoneDNSSECResource) Delete(ctx context.Context, req resource.DeleteRequ
 		return
 	}
 
+	disableDNSSECRecord(ctx, r, data.ZoneID.ValueString(), resp)
+
 	_, err := r.client.DNSSEC.Delete(
 		ctx,
 		dnssec.DNSSECDeleteParams{

internal/services/zone_dnssec/testdata/zonednsdatasourceconfig.tf

@@ -0,0 +1,9 @@
+resource "cloudflare_zone_dnssec" "%[1]s" {
+  zone_id = "%[2]s"
+  status = "active"
+}
+
+data "cloudflare_zone_dnssec" "%[1]s" {
+  zone_id = "%[2]s"
+  depends_on = [ "cloudflare_dns_zone_dnssec.%[1]s" ]
+}

internal/services/zone_dnssec/testdata/zonednssecresourceconfig.tf

@@ -1,4 +1,4 @@
-
 resource "cloudflare_zone_dnssec" "%s" {
 	zone_id = "%s"
+	status = "active"
 }