rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-31 03:50:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

apply transformation (Arc<Option> -> Option<Arc>) suggested by @funbringer

Browse Source
This commit is contained in:
Dmitry Rodionov
2021-08-19 20:04:30 +03:00
committed by Dmitry
parent b135723994
commit f2f02a8af0
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pageserver/src/http/routes.rs
View File

@@ -27,12 +27,12 @@ use crate::{
#[derive(Debug)]
struct State {
conf: &'static PageServerConf,
auth: Arc<Option<JwtAuth>>,
auth: Option<Arc<JwtAuth>>,
allowlist_routes: Vec<Uri>,
}
impl State {
fn new(conf: &'static PageServerConf, auth: Arc<Option<JwtAuth>>) -> Self {
fn new(conf: &'static PageServerConf, auth: Option<Arc<JwtAuth>>) -> Self {
let allowlist_routes = ["/v1/status", "/v1/doc", "/swagger.yml"]
.iter()
.map(|v| v.parse().unwrap())
@@ -141,7 +141,7 @@ async fn handler_404(_: Request<Body>) -> Result<Response<Body>, ApiError> {
pub fn make_router(
conf: &'static PageServerConf,
auth: Arc<Option<JwtAuth>>,
auth: Option<Arc<JwtAuth>>,
) -> RouterBuilder<hyper::Body, ApiError> {
let spec = include_bytes!("openapi_spec.yml");
let mut router = attach_openapi_ui(endpoint::make_router(), spec, "/swagger.yml", "/v1/doc");
@@ -151,7 +151,7 @@ pub fn make_router(
if state.allowlist_routes.contains(request.uri()) {
None
} else {
Option::as_ref(&state.auth)
state.auth.as_deref()
}
}))
}