mirror of
https://github.com/zed-industries/zed.git
synced 2026-05-31 19:05:00 +07:00
This PR makes it so we route the `UserService::get_users_by_ids` call through Cloud instead of hitting the database. We've introduced a new `CloudUserService` that will fetch the users from Cloud using the internal API. Note that we've only implemented the `get_users_by_ids` method on this service, as the endpoints for the other methods don't yet exist. We have also introduced a `TransitionalUserService` for the purposes of gradually transitioning these calls over to Cloud. Right now it uses the `CloudUserService` for the `get_users_by_ids` implementation, but then uses the `DatabaseUserService` for the other methods. Closes CLO-740. Release Notes: - N/A
349 lines
10 KiB
Rust
349 lines
10 KiB
Rust
pub mod api;
|
|
pub mod auth;
|
|
pub mod db;
|
|
pub mod entities;
|
|
pub mod env;
|
|
pub mod executor;
|
|
pub mod rpc;
|
|
pub mod seed;
|
|
pub mod services;
|
|
|
|
use anyhow::Context as _;
|
|
use aws_config::{BehaviorVersion, Region};
|
|
use axum::{
|
|
http::{HeaderMap, StatusCode},
|
|
response::IntoResponse,
|
|
};
|
|
use db::Database;
|
|
use executor::Executor;
|
|
use serde::Deserialize;
|
|
use std::{path::PathBuf, sync::Arc};
|
|
use util::ResultExt;
|
|
|
|
use crate::services::{
|
|
CloudUserService, DatabaseUserService, TransitionalUserService, UserService,
|
|
};
|
|
|
|
pub const VERSION: &str = env!("CARGO_PKG_VERSION");
|
|
pub const REVISION: Option<&'static str> = option_env!("GITHUB_SHA");
|
|
|
|
pub type Result<T, E = Error> = std::result::Result<T, E>;
|
|
|
|
pub enum Error {
|
|
Http(StatusCode, String, HeaderMap),
|
|
Database(sea_orm::error::DbErr),
|
|
Internal(anyhow::Error),
|
|
}
|
|
|
|
impl From<anyhow::Error> for Error {
|
|
fn from(error: anyhow::Error) -> Self {
|
|
Self::Internal(error)
|
|
}
|
|
}
|
|
|
|
impl From<sea_orm::error::DbErr> for Error {
|
|
fn from(error: sea_orm::error::DbErr) -> Self {
|
|
Self::Database(error)
|
|
}
|
|
}
|
|
|
|
impl From<axum::Error> for Error {
|
|
fn from(error: axum::Error) -> Self {
|
|
Self::Internal(error.into())
|
|
}
|
|
}
|
|
|
|
impl From<axum::http::Error> for Error {
|
|
fn from(error: axum::http::Error) -> Self {
|
|
Self::Internal(error.into())
|
|
}
|
|
}
|
|
|
|
impl From<serde_json::Error> for Error {
|
|
fn from(error: serde_json::Error) -> Self {
|
|
Self::Internal(error.into())
|
|
}
|
|
}
|
|
|
|
impl Error {
|
|
fn http(code: StatusCode, message: String) -> Self {
|
|
Self::Http(code, message, HeaderMap::default())
|
|
}
|
|
}
|
|
|
|
impl IntoResponse for Error {
|
|
fn into_response(self) -> axum::response::Response {
|
|
match self {
|
|
Error::Http(code, message, headers) => {
|
|
log::error!("HTTP error {}: {}", code, &message);
|
|
(code, headers, message).into_response()
|
|
}
|
|
Error::Database(error) => {
|
|
log::error!(
|
|
"HTTP error {}: {:?}",
|
|
StatusCode::INTERNAL_SERVER_ERROR,
|
|
&error
|
|
);
|
|
(StatusCode::INTERNAL_SERVER_ERROR, format!("{}", &error)).into_response()
|
|
}
|
|
Error::Internal(error) => {
|
|
log::error!(
|
|
"HTTP error {}: {:?}",
|
|
StatusCode::INTERNAL_SERVER_ERROR,
|
|
&error
|
|
);
|
|
(StatusCode::INTERNAL_SERVER_ERROR, format!("{}", &error)).into_response()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
impl std::fmt::Debug for Error {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
match self {
|
|
Error::Http(code, message, _headers) => (code, message).fmt(f),
|
|
Error::Database(error) => error.fmt(f),
|
|
Error::Internal(error) => error.fmt(f),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl std::fmt::Display for Error {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
match self {
|
|
Error::Http(code, message, _) => write!(f, "{code}: {message}"),
|
|
Error::Database(error) => error.fmt(f),
|
|
Error::Internal(error) => error.fmt(f),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl std::error::Error for Error {}
|
|
|
|
#[derive(Clone, Deserialize)]
|
|
pub struct Config {
|
|
pub http_port: u16,
|
|
pub database_url: String,
|
|
pub seed_path: Option<PathBuf>,
|
|
pub database_max_connections: u32,
|
|
pub livekit_server: Option<String>,
|
|
pub livekit_key: Option<String>,
|
|
pub livekit_secret: Option<String>,
|
|
pub rust_log: Option<String>,
|
|
pub log_json: Option<bool>,
|
|
pub blob_store_url: Option<String>,
|
|
pub blob_store_region: Option<String>,
|
|
pub blob_store_access_key: Option<String>,
|
|
pub blob_store_secret_key: Option<String>,
|
|
pub blob_store_bucket: Option<String>,
|
|
pub kinesis_region: Option<String>,
|
|
pub kinesis_stream: Option<String>,
|
|
pub kinesis_access_key: Option<String>,
|
|
pub kinesis_secret_key: Option<String>,
|
|
pub zed_environment: Arc<str>,
|
|
pub zed_cloud_internal_api_key: String,
|
|
pub zed_client_checksum_seed: Option<String>,
|
|
}
|
|
|
|
impl Config {
|
|
pub fn is_development(&self) -> bool {
|
|
self.zed_environment == "development".into()
|
|
}
|
|
|
|
/// Returns the base `zed.dev` URL.
|
|
pub fn zed_dot_dev_url(&self) -> &str {
|
|
match self.zed_environment.as_ref() {
|
|
"development" => "http://localhost:3000",
|
|
"staging" => "https://staging.zed.dev",
|
|
_ => "https://zed.dev",
|
|
}
|
|
}
|
|
|
|
/// Returns the base Zed Cloud URL.
|
|
pub fn zed_cloud_url(&self) -> &str {
|
|
match self.zed_environment.as_ref() {
|
|
"development" => "http://localhost:8787",
|
|
_ => "https://cloud.zed.dev",
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "test-support")]
|
|
pub fn test() -> Self {
|
|
Self {
|
|
http_port: 0,
|
|
database_url: "".into(),
|
|
database_max_connections: 0,
|
|
livekit_server: None,
|
|
livekit_key: None,
|
|
livekit_secret: None,
|
|
rust_log: None,
|
|
log_json: None,
|
|
zed_environment: "test".into(),
|
|
zed_cloud_internal_api_key: "test-internal-api-key".into(),
|
|
blob_store_url: None,
|
|
blob_store_region: None,
|
|
blob_store_access_key: None,
|
|
blob_store_secret_key: None,
|
|
blob_store_bucket: None,
|
|
zed_client_checksum_seed: None,
|
|
seed_path: None,
|
|
kinesis_region: None,
|
|
kinesis_access_key: None,
|
|
kinesis_secret_key: None,
|
|
kinesis_stream: None,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// The service mode that collab should run in.
|
|
#[derive(Debug, PartialEq, Eq, Clone, Copy, strum::Display)]
|
|
#[strum(serialize_all = "snake_case")]
|
|
pub enum ServiceMode {
|
|
Api,
|
|
Collab,
|
|
All,
|
|
}
|
|
|
|
impl ServiceMode {
|
|
pub fn is_collab(&self) -> bool {
|
|
matches!(self, Self::Collab | Self::All)
|
|
}
|
|
|
|
pub fn is_api(&self) -> bool {
|
|
matches!(self, Self::Api | Self::All)
|
|
}
|
|
}
|
|
|
|
pub struct AppState {
|
|
pub db: Arc<Database>,
|
|
pub http_client: Option<reqwest::Client>,
|
|
pub livekit_client: Option<Arc<dyn livekit_api::Client>>,
|
|
pub blob_store_client: Option<aws_sdk_s3::Client>,
|
|
pub executor: Executor,
|
|
pub kinesis_client: Option<::aws_sdk_kinesis::Client>,
|
|
pub user_service: Arc<dyn UserService>,
|
|
pub config: Config,
|
|
}
|
|
|
|
impl AppState {
|
|
pub async fn new(config: Config, executor: Executor) -> Result<Arc<Self>> {
|
|
let mut db_options = db::ConnectOptions::new(config.database_url.clone());
|
|
db_options.max_connections(config.database_max_connections);
|
|
let mut db = Database::new(db_options).await?;
|
|
db.initialize_notification_kinds().await?;
|
|
|
|
let livekit_client = if let Some(((server, key), secret)) = config
|
|
.livekit_server
|
|
.as_ref()
|
|
.zip(config.livekit_key.as_ref())
|
|
.zip(config.livekit_secret.as_ref())
|
|
{
|
|
Some(Arc::new(livekit_api::LiveKitClient::new(
|
|
server.clone(),
|
|
key.clone(),
|
|
secret.clone(),
|
|
)) as Arc<dyn livekit_api::Client>)
|
|
} else {
|
|
None
|
|
};
|
|
|
|
let user_agent = format!("Collab/{VERSION} ({})", REVISION.unwrap_or("unknown"));
|
|
let http_client = reqwest::Client::builder()
|
|
.user_agent(user_agent)
|
|
.build()
|
|
.context("failed to construct HTTP client")?;
|
|
|
|
let db = Arc::new(db);
|
|
let this = Self {
|
|
db: db.clone(),
|
|
http_client: Some(http_client.clone()),
|
|
livekit_client,
|
|
blob_store_client: build_blob_store_client(&config).await.log_err(),
|
|
executor,
|
|
kinesis_client: if config.kinesis_access_key.is_some() {
|
|
build_kinesis_client(&config).await.log_err()
|
|
} else {
|
|
None
|
|
},
|
|
user_service: {
|
|
let database_user_service = DatabaseUserService::new(db);
|
|
let cloud_user_service = CloudUserService::new(
|
|
http_client,
|
|
config.zed_cloud_url().to_string(),
|
|
config.zed_cloud_internal_api_key.clone(),
|
|
);
|
|
|
|
Arc::new(TransitionalUserService::new(
|
|
cloud_user_service,
|
|
database_user_service,
|
|
))
|
|
},
|
|
config,
|
|
};
|
|
Ok(Arc::new(this))
|
|
}
|
|
}
|
|
|
|
async fn build_blob_store_client(config: &Config) -> anyhow::Result<aws_sdk_s3::Client> {
|
|
let keys = aws_sdk_s3::config::Credentials::new(
|
|
config
|
|
.blob_store_access_key
|
|
.clone()
|
|
.context("missing blob_store_access_key")?,
|
|
config
|
|
.blob_store_secret_key
|
|
.clone()
|
|
.context("missing blob_store_secret_key")?,
|
|
None,
|
|
None,
|
|
"env",
|
|
);
|
|
|
|
let s3_config = aws_config::defaults(BehaviorVersion::latest())
|
|
.endpoint_url(
|
|
config
|
|
.blob_store_url
|
|
.as_ref()
|
|
.context("missing blob_store_url")?,
|
|
)
|
|
.region(Region::new(
|
|
config
|
|
.blob_store_region
|
|
.clone()
|
|
.context("missing blob_store_region")?,
|
|
))
|
|
.credentials_provider(keys)
|
|
.load()
|
|
.await;
|
|
|
|
Ok(aws_sdk_s3::Client::new(&s3_config))
|
|
}
|
|
|
|
async fn build_kinesis_client(config: &Config) -> anyhow::Result<aws_sdk_kinesis::Client> {
|
|
let keys = aws_sdk_s3::config::Credentials::new(
|
|
config
|
|
.kinesis_access_key
|
|
.clone()
|
|
.context("missing kinesis_access_key")?,
|
|
config
|
|
.kinesis_secret_key
|
|
.clone()
|
|
.context("missing kinesis_secret_key")?,
|
|
None,
|
|
None,
|
|
"env",
|
|
);
|
|
|
|
let kinesis_config = aws_config::defaults(BehaviorVersion::latest())
|
|
.region(Region::new(
|
|
config
|
|
.kinesis_region
|
|
.clone()
|
|
.context("missing kinesis_region")?,
|
|
))
|
|
.credentials_provider(keys)
|
|
.load()
|
|
.await;
|
|
|
|
Ok(aws_sdk_kinesis::Client::new(&kinesis_config))
|
|
}
|