diff options
Diffstat (limited to 'crates/configuration/src/server/http_svc/routes/typology')
4 files changed, 518 insertions, 2 deletions
diff --git a/crates/configuration/src/server/http_svc/routes/typology/create_typology.rs b/crates/configuration/src/server/http_svc/routes/typology/create_typology.rs index 9f4985a..8aeeeec 100644 --- a/crates/configuration/src/server/http_svc/routes/typology/create_typology.rs +++ b/crates/configuration/src/server/http_svc/routes/typology/create_typology.rs @@ -36,3 +36,106 @@ pub async fn create_typology( .into_inner(); Ok((axum::http::StatusCode::CREATED, axum::Json(response))) } + +#[cfg(test)] +mod tests { + use axum::{ + body::Body, + http::{Request, StatusCode}, + }; + use sqlx::PgPool; + use tower::ServiceExt; + use warden_stack::cache::RedisManager; + + use crate::{ + server::http_svc::{build_router, routes::test_config}, + state::{AppState, Services}, + }; + + #[sqlx::test] + async fn post_typology(pool: PgPool) { + let config = test_config(); + + let cache = RedisManager::new(&config.cache).await.unwrap(); + let client = async_nats::connect(&config.nats.hosts[0]).await.unwrap(); + let jetstream = async_nats::jetstream::new(client); + + let state = AppState::create( + Services { + postgres: pool, + cache, + jetstream, + }, + &test_config(), + ) + .await + .unwrap(); + + let app = build_router(state); + + let typology = serde_json::json!({ + "description": "Test description", + "typology_name": "Rule-901-Typology-999", + "id": "999", + "version": "1.0.0", + "workflow": { + "alert_threshold": 200, + "interdiction_threshold": 400 + }, + "rules": [ + { + "id": "901", + "version": "1.0.0", + "wghts": [ + { + "ref": ".err", + "wght": 0 + }, + { + "ref": ".x00", + "wght": 100 + }, + { + "ref": ".01", + "wght": 100 + }, + { + "ref": ".02", + "wght": 200 + }, + { + "ref": ".03", + "wght": 400 + } + ] + } + ], + "expression": { + "operator": "ADD", + "terms": [ + { + "id": "901", + "version": "1.0.0" + } + ] + } + }); + + let body = serde_json::to_vec(&typology).unwrap(); + + let response = app + .clone() + .oneshot( + Request::builder() + .method("POST") + .header("Content-Type", "application/json") + .uri("/api/v0/typology") + .body(Body::from(body)) + .unwrap(), + ) + .await + .unwrap(); + + assert_eq!(response.status(), StatusCode::CREATED); + } +} diff --git a/crates/configuration/src/server/http_svc/routes/typology/delete_typology.rs b/crates/configuration/src/server/http_svc/routes/typology/delete_typology.rs index 0e85e29..276aa67 100644 --- a/crates/configuration/src/server/http_svc/routes/typology/delete_typology.rs +++ b/crates/configuration/src/server/http_svc/routes/typology/delete_typology.rs @@ -39,3 +39,119 @@ pub async fn delete_typology( Ok(axum::Json(config)) } + +#[cfg(test)] +mod tests { + use axum::{ + body::Body, + http::{Request, StatusCode}, + }; + use sqlx::PgPool; + use tower::ServiceExt; + use warden_stack::cache::RedisManager; + + use crate::{ + server::http_svc::{build_router, routes::test_config}, + state::{AppState, Services}, + }; + + #[sqlx::test] + async fn delete_typology(pool: PgPool) { + let config = test_config(); + + let cache = RedisManager::new(&config.cache).await.unwrap(); + let client = async_nats::connect(&config.nats.hosts[0]).await.unwrap(); + let jetstream = async_nats::jetstream::new(client); + + let state = AppState::create( + Services { + postgres: pool, + cache, + jetstream, + }, + &test_config(), + ) + .await + .unwrap(); + + let app = build_router(state); + + let typology = serde_json::json!({ + "description": "Test description", + "typology_name": "Rule-901-Typology-999", + "id": "999", + "version": "1.0.0", + "workflow": { + "alert_threshold": 200, + "interdiction_threshold": 400 + }, + "rules": [ + { + "id": "901", + "version": "1.0.0", + "wghts": [ + { + "ref": ".err", + "wght": 0 + }, + { + "ref": ".x00", + "wght": 100 + }, + { + "ref": ".01", + "wght": 100 + }, + { + "ref": ".02", + "wght": 200 + }, + { + "ref": ".03", + "wght": 400 + } + ] + } + ], + "expression": { + "operator": "ADD", + "terms": [ + { + "id": "901", + "version": "1.0.0" + } + ] + } + + }); + + let body = serde_json::to_vec(&typology).unwrap(); + + app.clone() + .oneshot( + Request::builder() + .method("POST") + .header("Content-Type", "application/json") + .uri("/api/v0/typology") + .body(Body::from(body)) + .unwrap(), + ) + .await + .unwrap(); + + let response = app + .clone() + .oneshot( + Request::builder() + .method("DELETE") + .header("Content-Type", "application/json") + .uri("/api/v0/typology?id=999&version=1.0.0") + .body(Body::empty()) + .unwrap(), + ) + .await + .unwrap(); + + assert_eq!(response.status(), StatusCode::OK); + } +} diff --git a/crates/configuration/src/server/http_svc/routes/typology/get_typology.rs b/crates/configuration/src/server/http_svc/routes/typology/get_typology.rs index 4962593..40d3faf 100644 --- a/crates/configuration/src/server/http_svc/routes/typology/get_typology.rs +++ b/crates/configuration/src/server/http_svc/routes/typology/get_typology.rs @@ -38,3 +38,129 @@ pub async fn get_typology( Ok(axum::Json(config.configuration)) } + +#[cfg(test)] +mod tests { + use axum::{ + body::{self, Body}, + http::{Request, StatusCode}, + }; + use sqlx::PgPool; + use tower::ServiceExt; + use warden_core::configuration::typology::TypologyConfiguration; + use warden_stack::cache::RedisManager; + + use crate::{ + server::http_svc::{build_router, routes::test_config}, + state::{AppState, Services}, + }; + + #[sqlx::test] + async fn get(pool: PgPool) { + let config = test_config(); + + let cache = RedisManager::new(&config.cache).await.unwrap(); + let client = async_nats::connect(&config.nats.hosts[0]).await.unwrap(); + let jetstream = async_nats::jetstream::new(client); + + let state = AppState::create( + Services { + postgres: pool, + cache, + jetstream, + }, + &test_config(), + ) + .await + .unwrap(); + + let app = build_router(state); + + let typology = serde_json::json!({ + "description": "Test description", + "typology_name": "Rule-901-Typology-999", + "id": "999", + "version": "1.0.0", + "workflow": { + "alert_threshold": 200, + "interdiction_threshold": 400 + }, + "rules": [ + { + "id": "901", + "version": "1.0.0", + "wghts": [ + { + "ref": ".err", + "wght": 0 + }, + { + "ref": ".x00", + "wght": 100 + }, + { + "ref": ".01", + "wght": 100 + }, + { + "ref": ".02", + "wght": 200 + }, + { + "ref": ".03", + "wght": 400 + } + ] + } + ], + "expression": { + "operator": "ADD", + "terms": [ + { + "id": "901", + "version": "1.0.0" + } + ] + } + }); + + let body = serde_json::to_vec(&typology).unwrap(); + + let response = app + .clone() + .oneshot( + Request::builder() + .method("POST") + .header("Content-Type", "application/json") + .uri("/api/v0/typology") + .body(Body::from(body)) + .unwrap(), + ) + .await + .unwrap(); + + assert_eq!(response.status(), StatusCode::CREATED); + + let response = app + .clone() + .oneshot( + Request::builder() + .method("GET") + .header("Content-Type", "application/json") + .uri("/api/v0/typology?id=999&version=1.0.0") + .body(Body::empty()) + .unwrap(), + ) + .await + .unwrap(); + + let body = body::to_bytes(response.into_body(), usize::MAX) + .await + .unwrap(); + + let config: TypologyConfiguration = serde_json::from_slice(&body).unwrap(); + + assert_eq!(&config.id, "999"); + assert_eq!(&config.version, "1.0.0"); + } +} diff --git a/crates/configuration/src/server/http_svc/routes/typology/post_typology.rs b/crates/configuration/src/server/http_svc/routes/typology/post_typology.rs index 2864372..0c432ab 100644 --- a/crates/configuration/src/server/http_svc/routes/typology/post_typology.rs +++ b/crates/configuration/src/server/http_svc/routes/typology/post_typology.rs @@ -1,6 +1,7 @@ -use axum::extract::State; +use axum::extract::{Query, State}; use warden_core::configuration::typology::{ - TypologyConfiguration, UpdateTypologyConfigRequest, mutate_typologies_server::MutateTypologies, + TypologyConfiguration, TypologyConfigurationRequest, UpdateTypologyConfigRequest, + mutate_typologies_server::MutateTypologies, }; use crate::{ @@ -14,6 +15,7 @@ use crate::{ path = "/{version}/typology", params( ("version" = Version, Path, description = "API version, e.g., v1, v2, v3"), + TypologyConfigurationRequest, ), responses(( status = OK, @@ -26,14 +28,183 @@ use crate::{ #[axum::debug_handler] #[tracing::instrument(skip(state))] pub async fn update( + version: Version, + Query(params): Query<TypologyConfigurationRequest>, State(state): State<AppHandle>, axum::Json(body): axum::Json<TypologyConfiguration>, ) -> Result<axum::Json<TypologyConfiguration>, AppError> { let response = state .update_typology_configuration(tonic::Request::new(UpdateTypologyConfigRequest { + id: params.id, + version: params.version, configuration: Some(body), })) .await? .into_inner(); Ok(axum::Json(response)) } + +#[cfg(test)] +mod tests { + use axum::{ + body::Body, + http::{Request, StatusCode}, + }; + use sqlx::PgPool; + use tower::ServiceExt; + use warden_stack::cache::RedisManager; + + use crate::{ + server::http_svc::{build_router, routes::test_config}, + state::{AppState, Services}, + }; + + #[sqlx::test] + async fn update(pool: PgPool) { + let config = test_config(); + + let cache = RedisManager::new(&config.cache).await.unwrap(); + let client = async_nats::connect(&config.nats.hosts[0]).await.unwrap(); + let jetstream = async_nats::jetstream::new(client); + + let state = AppState::create( + Services { + postgres: pool, + cache, + jetstream, + }, + &test_config(), + ) + .await + .unwrap(); + + let app = build_router(state); + + let typology = serde_json::json!({ + "description": "Test description", + "typology_name": "Rule-901-Typology-999", + "id": "999", + "version": "1.0.0", + "workflow": { + "alert_threshold": 200, + "interdiction_threshold": 400 + }, + "rules": [ + { + "id": "901", + "version": "1.0.0", + "wghts": [ + { + "ref": ".err", + "wght": 0 + }, + { + "ref": ".x00", + "wght": 100 + }, + { + "ref": ".01", + "wght": 100 + }, + { + "ref": ".02", + "wght": 200 + }, + { + "ref": ".03", + "wght": 400 + } + ] + } + ], + "expression": { + "operator": "ADD", + "terms": [ + { + "id": "901", + "version": "1.0.0" + } + ] + } + }); + + let body = serde_json::to_vec(&typology).unwrap(); + + app.clone() + .oneshot( + Request::builder() + .method("POST") + .header("Content-Type", "application/json") + .uri("/api/v0/typology") + .body(Body::from(body)) + .unwrap(), + ) + .await + .unwrap(); + + let typology = serde_json::json!({ + "description": "Test description", + "typology_name": "Rule-901-Typology-999", + "id": "901", + "version": "1.0.0", + "workflow": { + "alert_threshold": 200, + "interdiction_threshold": 400 + }, + "rules": [ + { + "id": "901", + "version": "1.0.0", + "wghts": [ + { + "ref": ".err", + "wght": 0 + }, + { + "ref": ".x00", + "wght": 100 + }, + { + "ref": ".01", + "wght": 100 + }, + { + "ref": ".02", + "wght": 200 + }, + { + "ref": ".03", + "wght": 400 + } + ] + } + ], + "expression": { + "operator": "ADD", + "terms": [ + { + "id": "901", + "version": "1.0.0" + } + ] + } + }); + + let body = serde_json::to_vec(&typology).unwrap(); + + let response = app + .clone() + .oneshot( + Request::builder() + .method("PUT") + .header("Content-Type", "application/json") + .uri("/api/v0/typology?id=999&version=1.0.0") + .body(Body::from(body)) + .unwrap(), + ) + .await + .unwrap(); + + assert_eq!(response.status(), StatusCode::OK); + } +} |