Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

collab: Remove extension endpoints served by Cloud (#66308)

Marshall Bowersd4014230735e
diff --git a/crates/collab/src/api/extensions.rs b/crates/collab/src/api/extensions.rs
index 627948b2678..538c3343675 100644
--- a/crates/collab/src/api/extensions.rs
+++ b/crates/collab/src/api/extensions.rs
@@ -3,13 +3,13 @@ use crate::{AppState, Error, Result, db::NewExtensionVersion};
use anyhow::Context as _;
use aws_sdk_s3::presigning::PresigningConfig;
use axum::{
- Extension, Json, Router,
+ Extension, Router,
extract::{Path, Query},
http::StatusCode,
response::Redirect,
routing::get,
};
-use cloud_api_types::{ExtensionApiManifest, GetExtensionsResponse};
+use cloud_api_types::ExtensionApiManifest;
use collections::HashMap;
use semver::Version as SemanticVersion;
use serde::Deserialize;
@@ -19,8 +19,6 @@ use util::{ResultExt, maybe};
pub fn router() -> Router {
Router::new()
- .route("/extensions/updates", get(get_extension_updates))
- .route("/extensions/:extension_id", get(get_extension_versions))
.route(
"/extensions/:extension_id/download",
get(download_latest_extension),
@@ -31,50 +29,6 @@ pub fn router() -> Router {
)
}
-#[derive(Debug, Deserialize)]
-struct GetExtensionUpdatesParams {
- ids: String,
- min_schema_version: i32,
- max_schema_version: i32,
- min_wasm_api_version: semver::Version,
- max_wasm_api_version: semver::Version,
-}
-
-async fn get_extension_updates(
- Extension(app): Extension<Arc<AppState>>,
- Query(params): Query<GetExtensionUpdatesParams>,
-) -> Result<Json<GetExtensionsResponse>> {
- let constraints = ExtensionVersionConstraints {
- schema_versions: params.min_schema_version..=params.max_schema_version,
- wasm_api_versions: params.min_wasm_api_version..=params.max_wasm_api_version,
- };
-
- let extension_ids = params.ids.split(',').map(|s| s.trim()).collect::<Vec<_>>();
-
- let extensions = app
- .db
- .get_extensions_by_ids(&extension_ids, Some(&constraints))
- .await?;
-
- Ok(Json(GetExtensionsResponse { data: extensions }))
-}
-
-#[derive(Debug, Deserialize)]
-struct GetExtensionVersionsParams {
- extension_id: String,
-}
-
-async fn get_extension_versions(
- Extension(app): Extension<Arc<AppState>>,
- Path(params): Path<GetExtensionVersionsParams>,
-) -> Result<Json<GetExtensionsResponse>> {
- let extension_versions = app.db.get_extension_versions(&params.extension_id).await?;
-
- Ok(Json(GetExtensionsResponse {
- data: extension_versions,
- }))
-}
-
#[derive(Debug, Deserialize)]
struct DownloadLatestExtensionPathParams {
extension_id: String,
diff --git a/crates/collab/src/db/queries/extensions.rs b/crates/collab/src/db/queries/extensions.rs
index dd2ea4aa6b7..dcc7aa72f57 100644
--- a/crates/collab/src/db/queries/extensions.rs
+++ b/crates/collab/src/db/queries/extensions.rs
@@ -2,38 +2,11 @@ use std::str::FromStr;
use anyhow::Context;
use chrono::Utc;
-use sea_orm::sea_query::IntoCondition;
use util::ResultExt;
use super::*;
impl Database {
- pub async fn get_extensions_by_ids(
- &self,
- ids: &[&str],
- constraints: Option<&ExtensionVersionConstraints>,
- ) -> Result<Vec<ExtensionMetadata>> {
- self.transaction(|tx| async move {
- let extensions = extension::Entity::find()
- .filter(extension::Column::ExternalId.is_in(ids.iter().copied()))
- .all(&*tx)
- .await?;
-
- let mut max_versions = self
- .get_latest_versions_for_extensions(&extensions, constraints, &tx)
- .await?;
-
- Ok(extensions
- .into_iter()
- .filter_map(|extension| {
- let (version, _) = max_versions.remove(&extension.id)?;
- Some(metadata_from_extension_and_version(extension, version))
- })
- .collect())
- })
- .await
- }
-
async fn get_latest_versions_for_extensions(
&self,
extensions: &[extension::Model],
@@ -87,45 +60,6 @@ impl Database {
Ok(max_versions)
}
- /// Returns all of the versions for the extension with the given ID.
- pub async fn get_extension_versions(
- &self,
- extension_id: &str,
- ) -> Result<Vec<ExtensionMetadata>> {
- self.transaction(|tx| async move {
- let condition = extension::Column::ExternalId
- .eq(extension_id)
- .into_condition();
-
- self.get_extensions_where(condition, None, &tx).await
- })
- .await
- }
-
- async fn get_extensions_where(
- &self,
- condition: Condition,
- limit: Option<u64>,
- tx: &DatabaseTransaction,
- ) -> Result<Vec<ExtensionMetadata>> {
- let extensions = extension::Entity::find()
- .inner_join(extension_version::Entity)
- .select_also(extension_version::Entity)
- .filter(condition)
- .order_by_desc(extension::Column::TotalDownloadCount)
- .order_by_asc(extension::Column::Name)
- .limit(limit)
- .all(tx)
- .await?;
-
- Ok(extensions
- .into_iter()
- .filter_map(|(extension, version)| {
- Some(metadata_from_extension_and_version(extension, version?))
- })
- .collect())
- }
-
pub async fn get_extension(
&self,
extension_id: &str,
@@ -151,27 +85,6 @@ impl Database {
.await
}
- pub async fn get_extension_version(
- &self,
- extension_id: &str,
- version: &str,
- ) -> Result<Option<ExtensionMetadata>> {
- self.transaction(|tx| async move {
- let extension = extension::Entity::find()
- .filter(extension::Column::ExternalId.eq(extension_id))
- .filter(extension_version::Column::Version.eq(version))
- .inner_join(extension_version::Entity)
- .select_also(extension_version::Entity)
- .one(&*tx)
- .await?;
-
- Ok(extension.and_then(|(extension, version)| {
- Some(metadata_from_extension_and_version(extension, version?))
- }))
- })
- .await
- }
-
pub async fn get_known_extension_versions(&self) -> Result<HashMap<String, Vec<String>>> {
self.transaction(|tx| async move {
let mut extension_external_ids_by_id = HashMap::default();
diff --git a/crates/collab/tests/integration/db_tests/extension_tests.rs b/crates/collab/tests/integration/db_tests/extension_tests.rs
index 97bd8e8c65b..3ff62c9d3f3 100644
--- a/crates/collab/tests/integration/db_tests/extension_tests.rs
+++ b/crates/collab/tests/integration/db_tests/extension_tests.rs
@@ -9,12 +9,12 @@ use collab::db::{NewExtensionVersion, queries::extensions::convert_time_to_chron
use crate::test_both_dbs;
test_both_dbs!(
- test_extensions_by_id,
- test_extensions_by_id_postgres,
- test_extensions_by_id_sqlite
+ test_get_extension,
+ test_get_extension_postgres,
+ test_get_extension_sqlite
);
-async fn test_extensions_by_id(db: &Arc<Database>) {
+async fn test_get_extension(db: &Arc<Database>) {
let versions = db.get_known_extension_versions().await.unwrap();
assert!(versions.is_empty());
@@ -95,9 +95,9 @@ async fn test_extensions_by_id(db: &Arc<Database>) {
.await
.unwrap();
- let extensions = db
- .get_extensions_by_ids(
- &["ext1"],
+ let extension = db
+ .get_extension(
+ "ext1",
Some(&ExtensionVersionConstraints {
schema_versions: 1..=1,
wasm_api_versions: "0.0.1".parse().unwrap()..="0.0.4".parse().unwrap(),
@@ -107,8 +107,8 @@ async fn test_extensions_by_id(db: &Arc<Database>) {
.unwrap();
assert_eq!(
- extensions,
- &[ExtensionMetadata {
+ extension,
+ Some(ExtensionMetadata {
id: "ext1".into(),
manifest: cloud_api_types::ExtensionApiManifest {
name: "Extension 1".into(),
@@ -126,6 +126,6 @@ async fn test_extensions_by_id(db: &Arc<Database>) {
},
published_at: t0_chrono,
download_count: 0,
- }]
+ })
);
}