From 94cc2ae4c51d043bf049540ee4b1fec117a8340f Mon Sep 17 00:00:00 2001
From: MasterPtato <23087326+MasterPtato@users.noreply.github.com>
Date: Sat, 1 Jun 2024 08:33:39 +0000
Subject: [PATCH] fix: gracfully delete secondary dns record (#828)

<!-- Please make sure there is an issue that this PR is correlated to. -->

## Changes

<!-- If there are frontend changes, please include screenshots. -->
---
 .../worker/src/workers/server_dns_delete.rs       | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/svc/pkg/cluster/worker/src/workers/server_dns_delete.rs b/svc/pkg/cluster/worker/src/workers/server_dns_delete.rs
index cdfffa917..a4398744f 100644
--- a/svc/pkg/cluster/worker/src/workers/server_dns_delete.rs
+++ b/svc/pkg/cluster/worker/src/workers/server_dns_delete.rs
@@ -96,14 +96,23 @@ async fn inner(
 
 	// Delete secondary record
 	if let Some(record_id) = secondary_dns_record_id {
-		client
+		let res = client
 			.request(&cf::dns::DeleteDnsRecord {
 				zone_identifier: zone_id,
 				identifier: &record_id,
 			})
-			.await?;
+			.await;
 
-		tracing::info!(%record_id, "deleted secondary dns record");
+		if let Err(cf_framework::response::ApiFailure::Error(
+			http::status::StatusCode::NOT_FOUND,
+			_,
+		)) = res
+		{
+			tracing::warn!(%zone_id, %record_id, "secondary dns record not found");
+		} else {
+			res?;
+			tracing::info!(%record_id, "deleted secondary dns record");
+		}
 	} else {
 		tracing::warn!("server has no secondary dns record");
 	}