fix s3 proxy dev build (#6535)
This commit is contained in:
@@ -100,7 +100,7 @@ mod integration;
|
||||
mod live_migrations;
|
||||
#[cfg(feature = "postgres_trigger")]
|
||||
mod postgres_triggers;
|
||||
#[cfg(all(feature = "private"))]
|
||||
#[cfg(all(feature = "private", feature = "parquet"))]
|
||||
pub mod s3_proxy_ee;
|
||||
mod s3_proxy_oss;
|
||||
|
||||
@@ -661,10 +661,9 @@ pub async fn run_server(
|
||||
"/w/:workspace_id/capture_u",
|
||||
capture::workspaced_unauthed_service().layer(cors.clone()),
|
||||
)
|
||||
.nest(
|
||||
"/w/:workspace_id/s3_proxy",
|
||||
s3_proxy_oss::workspaced_unauthed_service(),
|
||||
)
|
||||
.nest("/w/:workspace_id/s3_proxy", {
|
||||
s3_proxy_oss::workspaced_unauthed_service()
|
||||
})
|
||||
.nest(
|
||||
"/auth",
|
||||
users::make_unauthed_service().layer(Extension(argon2)),
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
#[cfg(feature = "private")]
|
||||
#[cfg(all(feature = "private", feature = "parquet"))]
|
||||
#[allow(unused)]
|
||||
pub use crate::s3_proxy_ee::*;
|
||||
|
||||
#[cfg(not(feature = "private"))]
|
||||
use axum::Router;
|
||||
|
||||
#[cfg(not(feature = "private"))]
|
||||
pub fn workspaced_unauthed_service() -> Router {
|
||||
Router::new()
|
||||
#[cfg(not(all(feature = "private", feature = "parquet")))]
|
||||
pub fn workspaced_unauthed_service() -> axum::Router {
|
||||
axum::Router::new()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user