From 20b58ca9ded468e113bf5fdda795f3bc9a732cc2 Mon Sep 17 00:00:00 2001 From: "Carpenter, Adam (CORP)" Date: Fri, 10 Dec 2021 11:27:55 -0500 Subject: chore: move deprov into subdir --- angelsharkd/src/routes/extensions/simple_deprov.rs | 70 ---------------------- .../src/routes/extensions/simple_deprov/mod.rs | 70 ++++++++++++++++++++++ 2 files changed, 70 insertions(+), 70 deletions(-) delete mode 100644 angelsharkd/src/routes/extensions/simple_deprov.rs create mode 100644 angelsharkd/src/routes/extensions/simple_deprov/mod.rs (limited to 'angelsharkd/src/routes') diff --git a/angelsharkd/src/routes/extensions/simple_deprov.rs b/angelsharkd/src/routes/extensions/simple_deprov.rs deleted file mode 100644 index fc734f3..0000000 --- a/angelsharkd/src/routes/extensions/simple_deprov.rs +++ /dev/null @@ -1,70 +0,0 @@ -use libangelshark::{AcmRunner, Message, ParallelIterator}; -use log::error; -use serde::Deserialize; -use std::convert::Infallible; -use warp::{ - body::{content_length_limit, json}, - post, reply, Filter, Rejection, Reply, -}; - -const SIXTEEN_K: u64 = 1024 * 16; - -/// Returns a warp filter to handle HTTP POSTs for deprovisioning stations, agents, etc. -pub fn filter(runner: AcmRunner) -> impl Filter + Clone { - warp::path("deprov") - .and(post()) - .and(content_length_limit(SIXTEEN_K)) - .and(json()) - .and_then(move |entries| remove_entries(entries, runner.to_owned())) -} - -/// Queues removal commands for [Entries] on an [AcmRunner]. Gathers any errors encountered and returns those. -async fn remove_entries(entries: Entries, mut runner: AcmRunner) -> Result { - // Construct OSSI messages to carry out removals. - for entry in entries { - match entry { - Entry::StationUser { acm, ext } => { - runner.queue_input(&acm, &Message::new(&format!("clear amw all {}", ext))); - runner.queue_input(&acm, &Message::new(&format!("remove station {}", ext))); - } - Entry::AgentLoginId { acm, ext } => { - runner.queue_input( - &acm, - &Message::new(&format!("remove agent-loginID {}", ext)), - ); - } - } - } - - // Gather any errors encountered and format them for the client response. - let errors: Vec = runner - .run_cached() - .map(|(acm, output)| match output { - Ok(messages) => messages - .into_iter() - .filter_map(|message| Some(format!("ACM {}: {}", acm.clone(), message.error?))) - .collect(), - Err(error) => vec![format!("ACM {}: {}", acm, error)], - }) - .flatten() - .collect(); - - // Log errors for tracking. - for error in &errors { - error!("{}", error); - } - - Ok(reply::json(&errors)) -} - -/// Collection of [Entry]. -type Entries = Vec; - -/// Very basic [Deserialize] target for deprov inputs. Going from stringly typed to strongly typed. -#[derive(Debug, Deserialize)] -enum Entry { - #[serde(rename(deserialize = "station-user"))] - StationUser { acm: String, ext: String }, - #[serde(rename(deserialize = "agent-loginid"))] - AgentLoginId { acm: String, ext: String }, -} diff --git a/angelsharkd/src/routes/extensions/simple_deprov/mod.rs b/angelsharkd/src/routes/extensions/simple_deprov/mod.rs new file mode 100644 index 0000000..fc734f3 --- /dev/null +++ b/angelsharkd/src/routes/extensions/simple_deprov/mod.rs @@ -0,0 +1,70 @@ +use libangelshark::{AcmRunner, Message, ParallelIterator}; +use log::error; +use serde::Deserialize; +use std::convert::Infallible; +use warp::{ + body::{content_length_limit, json}, + post, reply, Filter, Rejection, Reply, +}; + +const SIXTEEN_K: u64 = 1024 * 16; + +/// Returns a warp filter to handle HTTP POSTs for deprovisioning stations, agents, etc. +pub fn filter(runner: AcmRunner) -> impl Filter + Clone { + warp::path("deprov") + .and(post()) + .and(content_length_limit(SIXTEEN_K)) + .and(json()) + .and_then(move |entries| remove_entries(entries, runner.to_owned())) +} + +/// Queues removal commands for [Entries] on an [AcmRunner]. Gathers any errors encountered and returns those. +async fn remove_entries(entries: Entries, mut runner: AcmRunner) -> Result { + // Construct OSSI messages to carry out removals. + for entry in entries { + match entry { + Entry::StationUser { acm, ext } => { + runner.queue_input(&acm, &Message::new(&format!("clear amw all {}", ext))); + runner.queue_input(&acm, &Message::new(&format!("remove station {}", ext))); + } + Entry::AgentLoginId { acm, ext } => { + runner.queue_input( + &acm, + &Message::new(&format!("remove agent-loginID {}", ext)), + ); + } + } + } + + // Gather any errors encountered and format them for the client response. + let errors: Vec = runner + .run_cached() + .map(|(acm, output)| match output { + Ok(messages) => messages + .into_iter() + .filter_map(|message| Some(format!("ACM {}: {}", acm.clone(), message.error?))) + .collect(), + Err(error) => vec![format!("ACM {}: {}", acm, error)], + }) + .flatten() + .collect(); + + // Log errors for tracking. + for error in &errors { + error!("{}", error); + } + + Ok(reply::json(&errors)) +} + +/// Collection of [Entry]. +type Entries = Vec; + +/// Very basic [Deserialize] target for deprov inputs. Going from stringly typed to strongly typed. +#[derive(Debug, Deserialize)] +enum Entry { + #[serde(rename(deserialize = "station-user"))] + StationUser { acm: String, ext: String }, + #[serde(rename(deserialize = "agent-loginid"))] + AgentLoginId { acm: String, ext: String }, +} -- cgit v1.2.3