feat: implement update handlers for upstream and upstream target management
This commit is contained in:
@@ -3,6 +3,8 @@ pub mod create_upstream_target;
|
||||
pub mod get_upstream;
|
||||
pub mod get_upstream_target;
|
||||
pub mod info;
|
||||
pub mod update_upstream;
|
||||
pub mod update_upstream_target;
|
||||
|
||||
use std::sync::Arc;
|
||||
|
||||
@@ -19,14 +21,18 @@ pub fn get_upstream_router(state: Arc<AppState>) -> Router {
|
||||
"/upstreams",
|
||||
get(get_upstream::get_upstream_list).post(create_upstream::create_upstream),
|
||||
)
|
||||
.route("/upstreams/{upstream_id}", get(get_upstream::get_upstream))
|
||||
.route(
|
||||
"/upstreams/{upstream_id}",
|
||||
get(get_upstream::get_upstream).patch(update_upstream::update_upstream),
|
||||
)
|
||||
.route(
|
||||
"/upstreams/{upstream_id}/targets",
|
||||
post(create_upstream_target::add_upstream_target),
|
||||
)
|
||||
.route(
|
||||
"/upstream_targets/{upstream_target_id}",
|
||||
get(get_upstream_target::get_upstream_target),
|
||||
get(get_upstream_target::get_upstream_target)
|
||||
.patch(update_upstream_target::update_upstream_target),
|
||||
)
|
||||
.with_state(state)
|
||||
}
|
||||
|
||||
@@ -162,3 +162,71 @@ impl From<crate::services::nginx::info::upstream_target::UpstreamTargetInfo>
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, utoipa::ToSchema)]
|
||||
pub struct UpdateUpstreamInfoResponse {
|
||||
pub id: uuid::Uuid,
|
||||
pub name: String,
|
||||
pub protocol: String,
|
||||
pub algorithm: String,
|
||||
pub sticky_session: bool,
|
||||
pub created_by: Option<uuid::Uuid>,
|
||||
pub created_at: DateTime<Utc>,
|
||||
pub updated_at: DateTime<Utc>,
|
||||
//
|
||||
pub upstream_targets: Vec<UpstreamTargetBasicInfo>,
|
||||
}
|
||||
|
||||
impl From<crate::services::nginx::info::upstream::UpstreamInfo> for UpdateUpstreamInfoResponse {
|
||||
fn from(info: crate::services::nginx::info::upstream::UpstreamInfo) -> Self {
|
||||
Self {
|
||||
id: info.id,
|
||||
name: info.name,
|
||||
protocol: info.protocol,
|
||||
algorithm: info.algorithm,
|
||||
sticky_session: info.sticky_session,
|
||||
created_by: info.created_by,
|
||||
created_at: info.created_at,
|
||||
updated_at: info.updated_at,
|
||||
upstream_targets: info
|
||||
.upstream_targets
|
||||
.into_iter()
|
||||
.map(|t| t.into())
|
||||
.collect(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, utoipa::ToSchema)]
|
||||
pub struct UpdateUpstreamTargetInfoResponse {
|
||||
pub id: uuid::Uuid,
|
||||
pub host: String,
|
||||
pub port: i64,
|
||||
pub enabled: bool,
|
||||
pub is_backup: bool,
|
||||
pub weight: i32,
|
||||
//
|
||||
pub created_at: DateTime<Utc>,
|
||||
pub updated_at: DateTime<Utc>,
|
||||
//
|
||||
pub upstream_id: Uuid,
|
||||
}
|
||||
|
||||
impl From<crate::services::nginx::info::upstream_target::UpstreamTargetInfo>
|
||||
for UpdateUpstreamTargetInfoResponse
|
||||
{
|
||||
fn from(info: crate::services::nginx::info::upstream_target::UpstreamTargetInfo) -> Self {
|
||||
Self {
|
||||
id: info.id,
|
||||
host: info.target_host,
|
||||
port: info.target_port,
|
||||
enabled: info.enabled,
|
||||
is_backup: info.is_backup,
|
||||
weight: info.weight as i32,
|
||||
//
|
||||
created_at: info.created_at,
|
||||
updated_at: info.updated_at,
|
||||
upstream_id: info.upstream_id,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,203 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
use axum::{
|
||||
Json,
|
||||
extract::{Path, State},
|
||||
response::Result as AxumResult,
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::{
|
||||
errors::api_error::ApiError,
|
||||
middlewares::request_info::AuthenticatedRequestInfo,
|
||||
routes::{
|
||||
AppState, api::restricted::nginx::upstream::info::response::UpdateUpstreamInfoResponse,
|
||||
},
|
||||
services::nginx::info::upstream::UpdateUpstreamInfo,
|
||||
};
|
||||
|
||||
#[derive(Deserialize, utoipa::ToSchema, Serialize)]
|
||||
pub struct UpstreamTargetBasicUpdateInfo {
|
||||
pub id: i64,
|
||||
pub enabled: bool,
|
||||
}
|
||||
|
||||
#[derive(Deserialize, utoipa::ToSchema, Serialize)]
|
||||
pub struct UpdateUpstreamRequestBody {
|
||||
pub name: Option<String>,
|
||||
pub protocol: Option<String>,
|
||||
pub algorithm: Option<String>,
|
||||
pub sticky_session: Option<bool>,
|
||||
// only updates upstream targets' enabled status for now
|
||||
pub upstream_targets: Option<Vec<UpstreamTargetBasicUpdateInfo>>,
|
||||
}
|
||||
|
||||
impl From<UpdateUpstreamRequestBody> for UpdateUpstreamInfo {
|
||||
fn from(val: UpdateUpstreamRequestBody) -> Self {
|
||||
Self {
|
||||
name: val.name,
|
||||
protocol: val.protocol,
|
||||
algorithm: val.algorithm,
|
||||
sticky_session: val.sticky_session,
|
||||
//
|
||||
upstream_targets: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn update_upstream(
|
||||
_request_info: AuthenticatedRequestInfo,
|
||||
Path(upstream_id): Path<Uuid>,
|
||||
State(state): State<Arc<AppState>>,
|
||||
Json(payload): Json<UpdateUpstreamRequestBody>,
|
||||
) -> AxumResult<Json<UpdateUpstreamInfoResponse>, ApiError> {
|
||||
let upstream_service = &state.service.nginx.get_upstream_service();
|
||||
let update_info: UpdateUpstreamInfo = payload.into();
|
||||
|
||||
let r = upstream_service
|
||||
.update_upstream(upstream_id, update_info, None)
|
||||
.await?;
|
||||
|
||||
Ok(Json(r.into()))
|
||||
}
|
||||
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::sync::Arc;
|
||||
|
||||
use axum::http::StatusCode;
|
||||
use axum_test::TestServer;
|
||||
use sea_orm::{DatabaseBackend, DatabaseConnection, MockDatabase};
|
||||
|
||||
use database::generated::entities::upstream;
|
||||
|
||||
use crate::{
|
||||
configs::{FromConfig, ProgramSettings},
|
||||
middlewares::require_auth::mock::REQUEST_AUTH_USER_INVALID_HEADER,
|
||||
routes::api::restricted::nginx::upstream::get_upstream_router,
|
||||
services::get_app_service,
|
||||
};
|
||||
use super::UpdateUpstreamRequestBody;
|
||||
|
||||
fn get_router_with_state(db: DatabaseConnection) -> axum::Router {
|
||||
let program_settings = ProgramSettings::mock();
|
||||
let app_service = get_app_service(&Arc::new(db.clone()), &program_settings);
|
||||
let state = Arc::new(crate::routes::AppState {
|
||||
database_connection: Arc::new(db),
|
||||
service: Arc::new(app_service),
|
||||
config: Arc::new(program_settings),
|
||||
});
|
||||
get_upstream_router(state).layer(axum::middleware::from_fn(
|
||||
crate::middlewares::require_auth::mock::mock_require_auth,
|
||||
))
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn handler_update_upstream_succeeds_returns_ok() {
|
||||
let up_id = uuid::Uuid::new_v4();
|
||||
|
||||
let current_model = upstream::Model {
|
||||
id: up_id,
|
||||
name: "old_upstream".to_string(),
|
||||
protocol: "http".to_string(),
|
||||
algorithm: "round_robin".to_string(),
|
||||
sticky_session: false,
|
||||
created_by: Some(uuid::Uuid::new_v4()),
|
||||
created_at: chrono::Utc::now(),
|
||||
updated_at: chrono::Utc::now(),
|
||||
};
|
||||
|
||||
let updated_model = upstream::Model {
|
||||
id: up_id,
|
||||
name: "updated_upstream".to_string(),
|
||||
protocol: "http".to_string(),
|
||||
algorithm: "round_robin".to_string(),
|
||||
sticky_session: false,
|
||||
created_by: Some(uuid::Uuid::new_v4()),
|
||||
created_at: chrono::Utc::now(),
|
||||
updated_at: chrono::Utc::now(),
|
||||
};
|
||||
|
||||
// first find_by_id, then update returns updated model
|
||||
let first: Vec<Vec<upstream::Model>> = vec![vec![current_model.clone()]];
|
||||
let second: Vec<Vec<upstream::Model>> = vec![vec![updated_model.clone()]];
|
||||
let db = MockDatabase::new(DatabaseBackend::Sqlite)
|
||||
.append_query_results(first)
|
||||
.append_query_results(second)
|
||||
.into_connection();
|
||||
|
||||
let router = get_router_with_state(db.clone());
|
||||
let server = TestServer::new(router).expect("failed to create test server");
|
||||
|
||||
let payload = UpdateUpstreamRequestBody {
|
||||
name: Some("updated_upstream".to_string()),
|
||||
protocol: None,
|
||||
algorithm: None,
|
||||
sticky_session: None,
|
||||
upstream_targets: None,
|
||||
};
|
||||
|
||||
let res = server
|
||||
.patch(&format!("/upstreams/{}", up_id))
|
||||
.json(&payload)
|
||||
.await;
|
||||
|
||||
res.assert_status_ok();
|
||||
let text = res.text();
|
||||
let body: crate::routes::api::restricted::nginx::upstream::info::response::UpdateUpstreamInfoResponse =
|
||||
serde_json::from_str(&text).expect("failed to parse json");
|
||||
|
||||
assert_eq!(body.id, up_id);
|
||||
assert_eq!(body.name, "updated_upstream");
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn handler_update_upstream_unauthenticated_returns_unauthorized() {
|
||||
let db = MockDatabase::new(DatabaseBackend::Sqlite).into_connection();
|
||||
let router = get_router_with_state(db.clone());
|
||||
let server = TestServer::new(router).expect("failed to create test server");
|
||||
|
||||
let payload = UpdateUpstreamRequestBody {
|
||||
name: Some("updated_upstream".to_string()),
|
||||
protocol: None,
|
||||
algorithm: None,
|
||||
sticky_session: None,
|
||||
upstream_targets: None,
|
||||
};
|
||||
|
||||
let res = server
|
||||
.patch(&format!("/upstreams/{}", uuid::Uuid::new_v4()))
|
||||
.add_header(REQUEST_AUTH_USER_INVALID_HEADER, "true")
|
||||
.json(&payload)
|
||||
.await;
|
||||
|
||||
res.assert_status(StatusCode::UNAUTHORIZED);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn handler_update_upstream_not_found_returns_not_found() {
|
||||
let empty_results: Vec<Vec<upstream::Model>> = vec![Vec::<upstream::Model>::new()];
|
||||
let db = MockDatabase::new(DatabaseBackend::Sqlite)
|
||||
.append_query_results(empty_results)
|
||||
.into_connection();
|
||||
let router = get_router_with_state(db.clone());
|
||||
let server = TestServer::new(router).expect("failed to create test server");
|
||||
|
||||
let payload = UpdateUpstreamRequestBody {
|
||||
name: Some("updated_upstream".to_string()),
|
||||
protocol: None,
|
||||
algorithm: None,
|
||||
sticky_session: None,
|
||||
upstream_targets: None,
|
||||
};
|
||||
|
||||
let res = server
|
||||
.patch(&format!("/upstreams/{}", uuid::Uuid::new_v4()))
|
||||
.json(&payload)
|
||||
.await;
|
||||
|
||||
res.assert_status(StatusCode::NOT_FOUND);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,206 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
use axum::{
|
||||
Json,
|
||||
extract::{Path, State},
|
||||
response::Result as AxumResult,
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::{
|
||||
errors::api_error::ApiError,
|
||||
middlewares::request_info::AuthenticatedRequestInfo,
|
||||
routes::{
|
||||
AppState,
|
||||
api::restricted::nginx::upstream::info::response::UpdateUpstreamTargetInfoResponse,
|
||||
},
|
||||
services::nginx::info::upstream_target::UpdateUpstreamTargetInfo,
|
||||
};
|
||||
|
||||
#[derive(Deserialize, utoipa::ToSchema, Serialize)]
|
||||
pub struct UpdateUpstreamTargetRequestBody {
|
||||
pub host: Option<String>,
|
||||
pub port: Option<i64>,
|
||||
pub enabled: Option<bool>,
|
||||
pub is_backup: Option<bool>,
|
||||
pub weight: Option<i32>,
|
||||
}
|
||||
|
||||
impl From<UpdateUpstreamTargetRequestBody> for UpdateUpstreamTargetInfo {
|
||||
fn from(val: UpdateUpstreamTargetRequestBody) -> Self {
|
||||
Self {
|
||||
target_host: val.host,
|
||||
target_port: val.port,
|
||||
enabled: val.enabled,
|
||||
is_backup: val.is_backup,
|
||||
weight: val.weight.map(|w| w as i64),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn update_upstream_target(
|
||||
_request_info: AuthenticatedRequestInfo,
|
||||
Path(upstream_target_id): Path<Uuid>,
|
||||
State(state): State<Arc<AppState>>,
|
||||
Json(payload): Json<UpdateUpstreamTargetRequestBody>,
|
||||
) -> AxumResult<Json<UpdateUpstreamTargetInfoResponse>, ApiError> {
|
||||
let upstream_service = &state.service.nginx.get_upstream_service();
|
||||
let update_info: UpdateUpstreamTargetInfo = payload.into();
|
||||
|
||||
let r = upstream_service
|
||||
.update_upstream_target(upstream_target_id, update_info, None)
|
||||
.await?;
|
||||
|
||||
Ok(Json(r.into()))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use std::sync::Arc;
|
||||
|
||||
use axum::http::StatusCode;
|
||||
use axum::routing::patch;
|
||||
use axum_test::TestServer;
|
||||
use sea_orm::{DatabaseBackend, DatabaseConnection, MockDatabase};
|
||||
|
||||
use database::generated::entities::upstream_target;
|
||||
|
||||
use super::UpdateUpstreamTargetRequestBody;
|
||||
use crate::{
|
||||
configs::{FromConfig, ProgramSettings},
|
||||
middlewares::require_auth::mock::REQUEST_AUTH_USER_INVALID_HEADER,
|
||||
services::get_app_service,
|
||||
};
|
||||
|
||||
fn get_router_with_state(db: DatabaseConnection) -> axum::Router {
|
||||
let program_settings = ProgramSettings::mock();
|
||||
let app_service = get_app_service(&Arc::new(db.clone()), &program_settings);
|
||||
let state = Arc::new(crate::routes::AppState {
|
||||
database_connection: Arc::new(db),
|
||||
service: Arc::new(app_service),
|
||||
config: Arc::new(program_settings),
|
||||
});
|
||||
|
||||
axum::Router::new()
|
||||
.route(
|
||||
"/upstream_targets/{upstream_target_id}",
|
||||
patch(crate::routes::api::restricted::nginx::upstream::update_upstream_target::update_upstream_target),
|
||||
)
|
||||
.with_state(state)
|
||||
.layer(axum::middleware::from_fn(
|
||||
crate::middlewares::require_auth::mock::mock_require_auth,
|
||||
))
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn handler_update_upstream_target_succeeds_returns_ok() {
|
||||
let target_id = uuid::Uuid::new_v4();
|
||||
|
||||
let current_model = upstream_target::Model {
|
||||
id: target_id,
|
||||
upstream_id: uuid::Uuid::new_v4(),
|
||||
target_host: "127.0.0.1".to_string(),
|
||||
target_port: 8080,
|
||||
weight: 1,
|
||||
is_backup: false,
|
||||
enabled: true,
|
||||
created_at: chrono::Utc::now(),
|
||||
updated_at: chrono::Utc::now(),
|
||||
};
|
||||
|
||||
let updated_model = upstream_target::Model {
|
||||
id: target_id,
|
||||
upstream_id: current_model.upstream_id,
|
||||
target_host: "127.0.0.1".to_string(),
|
||||
target_port: 8081,
|
||||
weight: 2,
|
||||
is_backup: false,
|
||||
enabled: false,
|
||||
created_at: chrono::Utc::now(),
|
||||
updated_at: chrono::Utc::now(),
|
||||
};
|
||||
|
||||
let first: Vec<Vec<upstream_target::Model>> = vec![vec![current_model.clone()]];
|
||||
let second: Vec<Vec<upstream_target::Model>> = vec![vec![updated_model.clone()]];
|
||||
|
||||
let db = MockDatabase::new(DatabaseBackend::Sqlite)
|
||||
.append_query_results(first)
|
||||
.append_query_results(second)
|
||||
.into_connection();
|
||||
|
||||
let router = get_router_with_state(db.clone());
|
||||
let server = TestServer::new(router).expect("failed to create test server");
|
||||
|
||||
let payload = UpdateUpstreamTargetRequestBody {
|
||||
host: None,
|
||||
port: Some(8081),
|
||||
enabled: Some(false),
|
||||
is_backup: None,
|
||||
weight: Some(2),
|
||||
};
|
||||
|
||||
let res = server
|
||||
.patch(&format!("/upstream_targets/{}", target_id))
|
||||
.json(&payload)
|
||||
.await;
|
||||
|
||||
res.assert_status_ok();
|
||||
let text = res.text();
|
||||
let body: crate::routes::api::restricted::nginx::upstream::info::response::UpdateUpstreamTargetInfoResponse =
|
||||
serde_json::from_str(&text).expect("failed to parse json");
|
||||
|
||||
assert_eq!(body.id, target_id);
|
||||
assert_eq!(body.port, 8081);
|
||||
assert!(!body.enabled);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn handler_update_upstream_target_unauthenticated_returns_unauthorized() {
|
||||
let db = MockDatabase::new(DatabaseBackend::Sqlite).into_connection();
|
||||
let router = get_router_with_state(db.clone());
|
||||
let server = TestServer::new(router).expect("failed to create test server");
|
||||
|
||||
let payload = UpdateUpstreamTargetRequestBody {
|
||||
host: None,
|
||||
port: Some(8081),
|
||||
enabled: Some(false),
|
||||
is_backup: None,
|
||||
weight: Some(2),
|
||||
};
|
||||
|
||||
let res = server
|
||||
.patch(&format!("/upstream_targets/{}", uuid::Uuid::new_v4()))
|
||||
.add_header(REQUEST_AUTH_USER_INVALID_HEADER, "true")
|
||||
.json(&payload)
|
||||
.await;
|
||||
|
||||
res.assert_status(StatusCode::UNAUTHORIZED);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn handler_update_upstream_target_not_found_returns_not_found() {
|
||||
let empty_results: Vec<Vec<upstream_target::Model>> =
|
||||
vec![Vec::<upstream_target::Model>::new()];
|
||||
let db = MockDatabase::new(DatabaseBackend::Sqlite)
|
||||
.append_query_results(empty_results)
|
||||
.into_connection();
|
||||
let router = get_router_with_state(db.clone());
|
||||
let server = TestServer::new(router).expect("failed to create test server");
|
||||
|
||||
let payload = UpdateUpstreamTargetRequestBody {
|
||||
host: None,
|
||||
port: Some(8081),
|
||||
enabled: Some(false),
|
||||
is_backup: None,
|
||||
weight: Some(2),
|
||||
};
|
||||
|
||||
let res = server
|
||||
.patch(&format!("/upstream_targets/{}", uuid::Uuid::new_v4()))
|
||||
.json(&payload)
|
||||
.await;
|
||||
|
||||
res.assert_status(StatusCode::NOT_FOUND);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user