From b1210b27ce2ee7614dd770e273a02a0005e7f1e1 Mon Sep 17 00:00:00 2001 From: Shiven Garia Date: Mon, 16 Mar 2026 13:41:06 +0530 Subject: [PATCH 1/2] fix: Replace unwrap with proper error handling in set_domains handler Closes #4635 --- crates/client-api/src/routes/database.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/client-api/src/routes/database.rs b/crates/client-api/src/routes/database.rs index 20e6196c78b..37ef98803e0 100644 --- a/crates/client-api/src/routes/database.rs +++ b/crates/client-api/src/routes/database.rs @@ -1108,7 +1108,7 @@ pub async fn set_names( })?; for name in &validated_names { - if ctx.lookup_database_identity(name.as_str()).await.unwrap().is_some() { + if ctx.lookup_database_identity(name.as_str()).await.map_err(log_and_500)?.is_some() { return Ok(( StatusCode::BAD_REQUEST, axum::Json(name::SetDomainsResult::OtherError(format!( From 473b1925658550ba81e84c004499875904f21687 Mon Sep 17 00:00:00 2001 From: Zeke Foppa Date: Wed, 18 Mar 2026 14:27:26 -0700 Subject: [PATCH 2/2] [fix/set-domains-unwrap-panic]: fix lint --- crates/client-api/src/routes/database.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crates/client-api/src/routes/database.rs b/crates/client-api/src/routes/database.rs index d65a47e7a5c..8a272002eba 100644 --- a/crates/client-api/src/routes/database.rs +++ b/crates/client-api/src/routes/database.rs @@ -1107,7 +1107,12 @@ pub async fn set_names( })?; for name in &validated_names { - if ctx.lookup_database_identity(name.as_str()).await.map_err(log_and_500)?.is_some() { + if ctx + .lookup_database_identity(name.as_str()) + .await + .map_err(log_and_500)? + .is_some() + { return Ok(( StatusCode::BAD_REQUEST, axum::Json(name::SetDomainsResult::OtherError(format!(