Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 0 additions & 46 deletions internal/services/domain/record.go
Original file line number Diff line number Diff line change
Expand Up @@ -495,51 +495,5 @@ func resourceDomainRecordDelete(ctx context.Context, d *schema.ResourceData, m a

d.SetId("")

// for non-root zone, if the zone have only NS records, then delete the zone
if d.Get("root_zone").(bool) {
return nil
}

res, err := domainAPI.ListDNSZoneRecords(&domain.ListDNSZoneRecordsRequest{
DNSZone: d.Get("dns_zone").(string),
})
if err != nil {
if httperrors.Is404(err) || httperrors.Is403(err) {
return nil
}

return diag.FromErr(err)
}

for _, r := range res.Records {
if r.Type != domain.RecordTypeNS {
// The zone isn't empty, keep it
return nil
}

tflog.Debug(ctx, fmt.Sprintf("record [%s], type [%s]", r.Name, r.Type))
}

_, err = waitForDNSZone(ctx, domainAPI, d.Get("dns_zone").(string), d.Timeout(schema.TimeoutDelete))
if err != nil {
if httperrors.Is404(err) || httperrors.Is403(err) {
return nil
}

return diag.FromErr(err)
}

_, err = domainAPI.DeleteDNSZone(&domain.DeleteDNSZoneRequest{
DNSZone: d.Get("dns_zone").(string),
ProjectID: d.Get("project_id").(string),
})
if err != nil {
if httperrors.Is404(err) || httperrors.Is403(err) {
return nil
}

return diag.FromErr(err)
}

return nil
}
7 changes: 5 additions & 2 deletions internal/services/domain/record_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -831,8 +831,11 @@ func testAccCheckDomainRecordDestroy(tt *acctest.TestTools) resource.TestCheckFu
return fmt.Errorf("failed to check if domain zone exists: %w", err)
}

if listDNSZones.TotalCount > 0 {
return fmt.Errorf("zone %s still exist", rs.Primary.Attributes["dns_zone"])
// Check if the specific record still exists
for _, record := range listDNSZones.Records {
if record.ID == rs.Primary.ID {
return fmt.Errorf("record %s still exists in zone %s", rs.Primary.ID, rs.Primary.Attributes["dns_zone"])
}
}

return nil
Expand Down
Loading
Loading