From 6eef4016022b029041486b8c5736e2d044b2cf9f Mon Sep 17 00:00:00 2001 From: Kirill Bulatov Date: Wed, 9 Feb 2022 00:29:30 +0200 Subject: [PATCH] Move routerify behind zenith_utils --- Cargo.lock | 3 --- pageserver/Cargo.toml | 1 - pageserver/src/http/routes.rs | 2 +- pageserver/src/virtual_file.rs | 3 +-- proxy/Cargo.toml | 2 -- proxy/src/http.rs | 2 +- walkeeper/Cargo.toml | 1 - walkeeper/src/http/routes.rs | 3 +-- zenith/src/main.rs | 2 +- zenith_utils/src/http/endpoint.rs | 3 +-- 10 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5bbd555ab1..1cfa70e9c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1290,7 +1290,6 @@ dependencies = [ "postgres_ffi", "rand", "regex", - "routerify", "rust-s3", "scopeguard", "serde", @@ -1563,7 +1562,6 @@ dependencies = [ "md5", "rand", "reqwest", - "routerify", "rustls 0.19.1", "serde", "serde_json", @@ -2509,7 +2507,6 @@ dependencies = [ "postgres-protocol 0.6.1 (git+https://github.com/zenithdb/rust-postgres.git?rev=2949d98df52587d562986aad155dd4e889e408b7)", "postgres_ffi", "regex", - "routerify", "rust-s3", "serde", "serde_json", diff --git a/pageserver/Cargo.toml b/pageserver/Cargo.toml index 45a9bb6a1e..eb96544404 100644 --- a/pageserver/Cargo.toml +++ b/pageserver/Cargo.toml @@ -22,7 +22,6 @@ postgres-protocol = { git = "https://github.com/zenithdb/rust-postgres.git", rev postgres = { git = "https://github.com/zenithdb/rust-postgres.git", rev="2949d98df52587d562986aad155dd4e889e408b7" } tokio-postgres = { git = "https://github.com/zenithdb/rust-postgres.git", rev="2949d98df52587d562986aad155dd4e889e408b7" } tokio-stream = "0.1.8" -routerify = "3" anyhow = { version = "1.0", features = ["backtrace"] } crc32c = "0.6.0" thiserror = "1.0" diff --git a/pageserver/src/http/routes.rs b/pageserver/src/http/routes.rs index fedcb76609..b13a45750e 100644 --- a/pageserver/src/http/routes.rs +++ b/pageserver/src/http/routes.rs @@ -4,7 +4,6 @@ use anyhow::{Context, Result}; use hyper::header; use hyper::StatusCode; use hyper::{Body, Request, Response, Uri}; -use routerify::{ext::RequestExt, RouterBuilder}; use serde::Serialize; use tracing::*; use zenith_utils::auth::JwtAuth; @@ -19,6 +18,7 @@ use zenith_utils::http::{ request::get_request_param, request::parse_request_param, }; +use zenith_utils::http::{RequestExt, RouterBuilder}; use zenith_utils::lsn::Lsn; use zenith_utils::zid::{opt_display_serde, ZTimelineId}; diff --git a/pageserver/src/virtual_file.rs b/pageserver/src/virtual_file.rs index 21b6daa8d9..3d725a2e91 100644 --- a/pageserver/src/virtual_file.rs +++ b/pageserver/src/virtual_file.rs @@ -334,8 +334,7 @@ impl VirtualFile { // library RwLock doesn't allow downgrading without releasing the lock, // and that doesn't seem worth the trouble. // - // XXX - // `parking_lot::RwLock` can enable such downgrades, yet its implemenation is fair and + // XXX `parking_lot::RwLock` can enable such downgrades, yet its implemenation is fair and // may deadlock on subsequent read calls, not all code places would benefit from such benaviour let result = STORAGE_IO_TIME .with_label_values(&[op, &self.tenantid, &self.timelineid]) diff --git a/proxy/Cargo.toml b/proxy/Cargo.toml index b18647a9c9..6e50ac9853 100644 --- a/proxy/Cargo.toml +++ b/proxy/Cargo.toml @@ -11,8 +11,6 @@ md5 = "0.7.0" rand = "0.8.3" hex = "0.4.3" hyper = "0.14" -# TODO kb reexport this from zenith_utils -routerify = "3" serde = "1" serde_json = "1" tokio = { version = "1.11", features = ["macros"] } diff --git a/proxy/src/http.rs b/proxy/src/http.rs index 7a65d76e6d..20863286ce 100644 --- a/proxy/src/http.rs +++ b/proxy/src/http.rs @@ -1,5 +1,5 @@ use hyper::{Body, Request, Response, StatusCode}; -use routerify::RouterBuilder; +use zenith_utils::http::RouterBuilder; use zenith_utils::http::endpoint; use zenith_utils::http::error::ApiError; diff --git a/walkeeper/Cargo.toml b/walkeeper/Cargo.toml index f2a3c5aef3..193fc4acf6 100644 --- a/walkeeper/Cargo.toml +++ b/walkeeper/Cargo.toml @@ -8,7 +8,6 @@ regex = "1.4.5" bytes = "1.0.1" byteorder = "1.4.3" hyper = "0.14" -routerify = "3" fs2 = "0.4.3" lazy_static = "1.4.0" serde_json = "1" diff --git a/walkeeper/src/http/routes.rs b/walkeeper/src/http/routes.rs index c5c4c1fc4b..b8d9a4ae36 100644 --- a/walkeeper/src/http/routes.rs +++ b/walkeeper/src/http/routes.rs @@ -1,10 +1,9 @@ use hyper::{Body, Request, Response, StatusCode}; -use routerify::ext::RequestExt; -use routerify::RouterBuilder; use serde::Serialize; use serde::Serializer; use std::fmt::Display; use std::sync::Arc; +use zenith_utils::http::{RequestExt, RouterBuilder}; use zenith_utils::lsn::Lsn; use zenith_utils::zid::ZTenantTimelineId; diff --git a/zenith/src/main.rs b/zenith/src/main.rs index 6d8b6f218a..4a345799eb 100644 --- a/zenith/src/main.rs +++ b/zenith/src/main.rs @@ -416,7 +416,7 @@ fn handle_init(init_match: &ArgMatches) -> Result<()> { Ok(()) } -fn pageserver_config_overrides<'a>(init_match: &'a ArgMatches) -> Vec<&'a str> { +fn pageserver_config_overrides(init_match: &ArgMatches) -> Vec<&str> { init_match .values_of("pageserver-config-override") .into_iter() diff --git a/zenith_utils/src/http/endpoint.rs b/zenith_utils/src/http/endpoint.rs index b549ae2b72..0be08f45e1 100644 --- a/zenith_utils/src/http/endpoint.rs +++ b/zenith_utils/src/http/endpoint.rs @@ -110,7 +110,6 @@ fn parse_token(header_value: &str) -> Result<&str, ApiError> { Ok(token) } -// TODO kb now test_auth fails, is it after jsonwebtoken update? pub fn auth_middleware( provide_auth: fn(&Request) -> Option<&JwtAuth>, ) -> Middleware { @@ -124,7 +123,7 @@ pub fn auth_middleware( let token = parse_token(header_value)?; let data = auth - .decode(dbg!(token)) + .decode(token) .map_err(|_| ApiError::Unauthorized("malformed jwt token".to_string()))?; req.set_context(data.claims); }