Skip to content

fix(worker): keep tunnel cleanup consistent #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ostenbom merged 2 commits into from
Sep 18, 2026
Merged

fix(worker): keep tunnel cleanup consistent #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5eb94d
fix(worker): keep tunnel cleanup consistent
ostenbom Sep 18, 2026
9d0c158
test(worker): avoid mock server dependency
ostenbom Sep 18, 2026
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
43 changes: 20 additions & 23 deletions worker/src/tunnel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,6 @@ pub async fn delete_tunnel(
tunnel_id: &str,
) -> Result<(), DeleteTunnelError> {
let client = crate::cloudflare_client(api_token);

let delete_tunnel_req = cloudflare::endpoints::cfd_tunnel::delete_tunnel::DeleteTunnel {
account_identifier: account_id,
tunnel_id,
params: cloudflare::endpoints::cfd_tunnel::delete_tunnel::Params { cascade: true },
};

client
.request(&delete_tunnel_req)
.await
.map_err(|error| DeleteTunnelError::DeleteCloudflareTunnel(error.to_string()))?;

let get_dns_record_req = cloudflare::endpoints::dns::ListDnsRecords {
zone_identifier: zone_id,
params: cloudflare::endpoints::dns::ListDnsRecordsParams {
Expand All @@ -87,28 +75,37 @@ pub async fn delete_tunnel(
.result;

let record = match records.len() {
0 => {
return Err(DeleteTunnelError::GetDNSRecord(
"Fetching DNS for tunnel returned empty".to_string(),
));
}
1 => &records[0],
0 => None,
1 => Some(&records[0]),
2.. => {
return Err(DeleteTunnelError::GetDNSRecord(
"Fetching DNS for tunnel returned more than one record".to_string(),
));
}
};

let delete_dns_record_red = cloudflare::endpoints::dns::DeleteDnsRecord {
zone_identifier: zone_id,
identifier: &record.id,
if let Some(record) = record {
let delete_dns_record_req = cloudflare::endpoints::dns::DeleteDnsRecord {
zone_identifier: zone_id,
identifier: &record.id,
};

client
.request(&delete_dns_record_req)
.await
.map_err(|error| DeleteTunnelError::DeleteDNSRecord(error.to_string()))?;
}

let delete_tunnel_req = cloudflare::endpoints::cfd_tunnel::delete_tunnel::DeleteTunnel {
account_identifier: account_id,
tunnel_id,
params: cloudflare::endpoints::cfd_tunnel::delete_tunnel::Params { cascade: true },
};

client
.request(&delete_dns_record_red)
.request(&delete_tunnel_req)
.await
.map_err(|error| DeleteTunnelError::DeleteDNSRecord(error.to_string()))?;
.map_err(|error| DeleteTunnelError::DeleteCloudflareTunnel(error.to_string()))?;

Ok(())
}
Expand Down
Loading