sentry - routes - get config

elpiel · elpiel · commit e7b0fd2592eb · 2022-08-15T11:45:42.000+02:00
diff --git a/sentry/src/application.rs b/sentry/src/application.rs
@@ -8,7 +8,7 @@ use adapter::client::Locked;
 use axum::{
     extract::{FromRequest, RequestParts},
     http::StatusCode,
-    middleware, Extension, Router,
+    middleware, Extension, Router, routing::get,
 };
 use hyper::{
     service::{make_service_fn, service_fn},
@@ -37,7 +37,7 @@ use crate::{
         routers::{
             analytics_router, campaigns_router, campaigns_router_axum, channels_router,
             channels_router_axum,
-        },
+        }, get_cfg_axum,
     },
 };
 use adapter::Adapter;
@@ -195,6 +195,7 @@ where
 
         Router::new()
             .nest("/v5", router)
+            .route("/cfg", get(get_cfg_axum::<C>))
             .layer(
                 // keeps the order from top to bottom!
                 ServiceBuilder::new()
diff --git a/sentry/src/routes.rs b/sentry/src/routes.rs
@@ -499,6 +499,7 @@
 pub use analytics::analytics as get_analytics;
 
 pub use cfg::config as get_cfg;
+pub use cfg::config_axum as get_cfg_axum;
 
 // `analytics` module has single request, so we only export this request
 mod analytics;
diff --git a/sentry/src/routes/campaign.rs b/sentry/src/routes/campaign.rs
@@ -791,6 +791,7 @@ pub mod insert_events {
         #[error("Campaign ran out of remaining budget to spend")]
         CampaignOutOfBudget,
     }
+
     /// POST `/v5/campaign/:id/events`
     ///
     /// Request body (json): [`InsertEventsRequest`]
@@ -1268,7 +1269,7 @@ mod test {
     };
 
     /// Test single campaign creation and modification
-    // &
+    /// &
     /// Test with multiple campaigns (because of Budget) and modifications
     #[tokio::test]
     async fn create_and_modify_with_multiple_campaigns() {
diff --git a/sentry/src/routes/cfg.rs b/sentry/src/routes/cfg.rs
@@ -1,9 +1,20 @@
 //! `GET /cfg` request
 
-use crate::{response::ResponseError, Application};
 use adapter::client::Locked;
+use axum::{Extension, Json};
 use hyper::{header::CONTENT_TYPE, Body, Request, Response};
 
+use primitives::Config;
+
+use crate::{response::ResponseError, Application};
+
+/// `GET /cfg` request
+pub async fn config_axum<C: Locked + 'static>(
+    Extension(app): Extension<Application<C>>,
+) -> Json<Config> {
+    Json(app.config.clone())
+}
+
 /// `GET /cfg` request
 pub async fn config<C: Locked + 'static>(
     _: Request<Body>,
