From 52583fe1eda4eb748fe0d2fc21b86cf7bb4582ef Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Wed, 3 Jul 2024 19:03:49 -0400 Subject: [PATCH] Remove unused `ids` query parameter from `GET /extensions` endpoint (#13802) This PR removes the `ids` query parameter from the `GET /extensions` endpoint, as we don't use it. We originally added the query parameter in #9929 to facilitate auto-updates. However, it was superseded by the `GET /extensions/updates` endpoint in #10052. There shouldn't be any Zed versions out in the wild that are using the `ids` query parameter, as we added the endpoint on Thursday, March 28, and replaced its usage with the new endpoint on Monday, April 1, before the next Zed release. Release Notes: - N/A --- crates/collab/src/api/extensions.rs | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/crates/collab/src/api/extensions.rs b/crates/collab/src/api/extensions.rs index 4f797adb68..ed70b347a9 100644 --- a/crates/collab/src/api/extensions.rs +++ b/crates/collab/src/api/extensions.rs @@ -36,8 +36,6 @@ pub fn router() -> Router { struct GetExtensionsParams { filter: Option, #[serde(default)] - ids: Option, - #[serde(default)] max_schema_version: i32, } @@ -45,26 +43,15 @@ async fn get_extensions( Extension(app): Extension>, Query(params): Query, ) -> Result> { - let extension_ids = params - .ids - .as_ref() - .map(|s| s.split(',').map(|s| s.trim()).collect::>()); + let extensions = app + .db + .get_extensions(params.filter.as_deref(), params.max_schema_version, 500) + .await?; - let extensions = if let Some(extension_ids) = extension_ids { - app.db.get_extensions_by_ids(&extension_ids, None).await? - } else { - let result = app - .db - .get_extensions(params.filter.as_deref(), params.max_schema_version, 500) - .await?; - - if let Some(query) = params.filter.as_deref() { - let count = result.len(); - tracing::info!(query, count, "extension_search") - } - - result - }; + if let Some(query) = params.filter.as_deref() { + let count = extensions.len(); + tracing::info!(query, count, "extension_search") + } Ok(Json(GetExtensionsResponse { data: extensions })) }