b3638a2 drop Adapter::run status argument harder — radicle-ci-broker

Radicle CI broker

drop Adapter::run status argument harder

Lars Wirzenius committed 1 year ago

commit b3638a2342e8c1bf39c3bd0f24c69256c54e9a55
parent 67b66b1f910e0a84b7b4bc515ba54aca780a12a0

2 files changed +16 -41

modified src/adapter.rs

@@ -19,7 +19,6 @@ use log::{debug, error};

 use crate::{
     msg::{MessageError, Request, Response},
     pages::StatusPage,
     run::{Run, RunState},
 };

@@ -51,12 +50,7 @@ impl Adapter {

         self.env.iter().map(|(k, v)| (k.as_ref(), v.as_ref()))
     }
     pub fn run(
         &self,
         trigger: &Request,
         run: &mut Run,
         _status: &mut StatusPage,
     ) -> Result<(), AdapterError> {
     pub fn run(&self, trigger: &Request, run: &mut Run) -> Result<(), AdapterError> {
         debug!("running adapter");
         run.set_state(RunState::Triggered);
         let x = self.run_helper(trigger, run);

@@ -221,11 +215,10 @@ mod test {

     use radicle::git::Oid;
     use radicle::prelude::RepoId;
     use super::{Adapter, Run, StatusPage};
     use super::{Adapter, Run};
     use crate::{
         adapter::AdapterError,
         msg::{MessageError, Response, RunResult},
         pages::PageBuilder,
         run::Whence,
         test::{log_in_tests, mock_adapter, trigger_request, TestResult},
     };

@@ -242,12 +235,6 @@ mod test {

             "2024-02-29T12:58:12+02:00".into(),
         )
     }
     fn status_page() -> StatusPage {
         PageBuilder::default()
             .node_alias("test.alias")
             .build()
             .unwrap()
     }
     #[test]
     fn adapter_reports_success() -> TestResult<()> {

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

         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut status = status_page();
         Adapter::new(&bin).run(&trigger_request()?, &mut run, &mut status)?;
         Adapter::new(&bin).run(&trigger_request()?, &mut run)?;
         assert_eq!(run.result(), Some(&RunResult::Success));
         Ok(())

@@ -286,8 +272,7 @@ echo '{"response":"finished","result":"failure"}'

         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut status = status_page();
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run, &mut status);
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         match x {
             Ok(_) => (),

@@ -315,8 +300,7 @@ exit 1

         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut status = status_page();
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run, &mut status);
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         assert!(x.is_err());
         assert_eq!(run.result(), Some(&RunResult::Failure));

@@ -337,8 +321,7 @@ kill -9 $BASHPID

         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut status = status_page();
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run, &mut status);
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         assert!(matches!(
             x,

@@ -363,8 +346,7 @@ kill -9 $BASHPID

         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut status = status_page();
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run, &mut status);
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         assert!(matches!(x, Err(AdapterError::Failed(_))));

@@ -387,8 +369,7 @@ kill -9 $BASHPID

         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut status = status_page();
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run, &mut status);
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         assert!(matches!(x, Err(AdapterError::Failed(_))));

@@ -410,8 +391,7 @@ echo '{"response":"finished","result":"success","bad":"field"}'

         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut status = status_page();
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run, &mut status);
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         match x {
             Err(AdapterError::ParseResponse(MessageError::DeserializeResponse(_))) => (),

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

         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut status = status_page();
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run, &mut status);
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         assert!(matches!(
             x,

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

         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut status = status_page();
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run, &mut status);
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         assert!(matches!(
             x,

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

         let bin = tmp.path().join("adapter.sh");
         let mut run = run();
         let mut status = status_page();
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run, &mut status);
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         match x {
             Err(AdapterError::SpawnAdapter(filename, e)) => {

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

         write(&bin, ADAPTER)?;
         let mut run = run();
         let mut status = status_page();
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run, &mut status);
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         match x {
             Err(AdapterError::SpawnAdapter(filename, e)) => {

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

         mock_adapter(&bin, ADAPTER)?;
         let mut run = run();
         let mut status = status_page();
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run, &mut status);
         let x = Adapter::new(&bin).run(&trigger_request()?, &mut run);
         eprintln!("{x:#?}");
         match x {
             Err(AdapterError::SpawnAdapter(filename, e)) => {

modified src/broker.rs

@@ -72,7 +72,7 @@ impl Broker {

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

@@ -111,7 +111,7 @@ impl Broker {

                     // log the error. The `Run` value records the
                     // result of the run.
                     debug!("broker runs adapter");
                     if let Err(e) = adapter.run(trigger, &mut run, status) {
                     if let Err(e) = adapter.run(trigger, &mut run) {
                         error!("failed to run adapter or it failed to run CI: {e}");
                         let mut e = e.source();
                         while let Some(source) = e {