b24692c drop status page argument to Broker::execute_ci — radicle-ci-broker

modified src/bin/cib.rs

@@ -16,7 +16,6 @@ use radicle_ci_broker::{

     config::{Config, ConfigError},
     db::{Db, DbError},
     error::BrokerError,
     pages::{PageBuilder, PageError},
     queueadd::{AdderError, QueueAdderBuilder},
     queueproc::{QueueError, QueueProcessorBuilder},
 };

@@ -138,15 +137,9 @@ impl QueuedCmd {

         debug!("default adapter: {adapter:?}");
         broker.set_default_adapter(&adapter);
         let page = PageBuilder::default()
             .node_alias("dummy")
             .build()
             .map_err(CibError::status_page)?;
         let processor = QueueProcessorBuilder::default()
             .db(db)
             .broker(broker)
             .page(page)
             .build()
             .map_err(CibError::process_queue)?;
         let thread = processor.process_in_thread();

@@ -174,9 +167,6 @@ enum CibError {

     #[error("failed create broker data type")]
     NewBroker(#[source] BrokerError),
     #[error("failed to update status page data structure")]
     StatusPage(#[source] PageError),
     #[error("failed to add node events into queue")]
     QueueAdder(#[source] AdderError),

@@ -207,10 +197,6 @@ impl CibError {

         Self::NewBroker(e)
     }
     fn status_page(e: PageError) -> Self {
         Self::StatusPage(e)
     }
     fn process_queue(e: QueueError) -> Self {
         Self::ProcessQueue(e)
     }

modified src/broker.rs

@@ -15,7 +15,6 @@ use crate::{

     db::Db,
     error::BrokerError,
     msg::{PatchEvent, PushEvent, Request},
     pages::StatusPage,
     run::{Run, Whence},
 };

@@ -69,11 +68,7 @@ impl Broker {

     }
     #[allow(clippy::result_large_err)]
     pub fn execute_ci(
         &mut self,
         trigger: &Request,
         _status: &mut StatusPage,
     ) -> Result<Run, BrokerError> {
     pub fn execute_ci(&mut self, trigger: &Request) -> Result<Run, BrokerError> {
         info!("Start CI run on {trigger:#?}");
         let run = match trigger {
             Request::Trigger {

@@ -147,7 +142,6 @@ mod test {

     use super::{Adapter, Broker, RepoId};
     use crate::{
         msg::{RunId, RunResult},
         pages::{PageBuilder, StatusPage},
         run::RunState,
         test::{log_in_tests, mock_adapter, trigger_request, TestResult},
     };

@@ -166,13 +160,6 @@ mod test {

         RepoId::from_urn(RID).unwrap()
     }
     fn status_page() -> StatusPage {
         PageBuilder::default()
             .node_alias("test.alias")
             .build()
             .unwrap()
     }
     #[test]
     fn has_no_adapters_initially() -> TestResult<()> {
         let tmp = tempdir().unwrap();

@@ -265,8 +252,7 @@ echo '{"response":"finished","result":"success"}'

         let trigger = trigger_request()?;
         let mut status = status_page();
         let x = broker.execute_ci(&trigger, &mut status);
         let x = broker.execute_ci(&trigger);
         assert!(x.is_ok());
         let run = x.unwrap();
         assert_eq!(run.adapter_run_id(), Some(&RunId::from("xyzzy")));

@@ -299,8 +285,7 @@ exit 1

         let trigger = trigger_request()?;
         let mut status = status_page();
         let x = broker.execute_ci(&trigger, &mut status);
         let x = broker.execute_ci(&trigger);
         assert!(x.is_ok());
         let run = x.unwrap();
         assert_eq!(run.adapter_run_id(), Some(&RunId::from("xyzzy")));

modified src/queueproc.rs

@@ -16,7 +16,6 @@ use crate::{

     error::BrokerError,
     event::BrokerEvent,
     msg::{MessageError, RequestBuilder},
     pages::StatusPage,
 };
 const WAIT_FOR_EVENTS_DURATION: u64 = 10_000;

@@ -25,7 +24,6 @@ const WAIT_FOR_EVENTS_DURATION: u64 = 10_000;

 pub struct QueueProcessorBuilder {
     db: Option<Db>,
     broker: Option<Broker>,
     page: Option<StatusPage>,
 }
 impl QueueProcessorBuilder {

@@ -34,7 +32,6 @@ impl QueueProcessorBuilder {

             db: self.db.ok_or(QueueError::Missing("db"))?,
             profile: Profile::load().map_err(QueueError::Profile)?,
             broker: self.broker.ok_or(QueueError::Missing("broker"))?,
             page: self.page.ok_or(QueueError::Missing("page"))?,
         })
     }

@@ -47,18 +44,12 @@ impl QueueProcessorBuilder {

         self.broker = Some(broker);
         self
     }
     pub fn page(mut self, page: StatusPage) -> Self {
         self.page = Some(page);
         self
     }
 }
 pub struct QueueProcessor {
     db: Db,
     profile: Profile,
     broker: Broker,
     page: StatusPage,
 }
 impl QueueProcessor {

@@ -116,7 +107,7 @@ impl QueueProcessor {

                     .build_trigger()
                     .map_err(|e| QueueError::build_trigger(event, e))?;
                 self.broker
                     .execute_ci(&trigger, &mut self.page)
                     .execute_ci(&trigger)
                     .map_err(QueueError::execute_ci)?;
                 Ok(false)
             }