refactor: avoid unnecessary let/variable — radicle-ci-broker

modified ci-broker.md

@@ -59,6 +59,26 @@ a run on a repository. The repository is imaginary as is the commit.

 }
 ~~~
 ## A shutdown message
 This asks the CI broker to shut down cleanly.
 ~~~{#shutdown.json .file .json}
 {
   "type": "refsFetched",
   "remote": "z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV",
   "rid": "rad:zwTxygwuz5LDGBq255RA2CbNGrz8",
   "updated": [
     {
       "skipped": {
         "name": "shutdown",
         "oid": "0000000000000000000000000000000000000000"
       }
     }
   ]
 }
 ~~~
 ## Set rid in trigger message
 This is a helper script that reads a trigger message and changes its

@@ -102,27 +122,28 @@ with open(filename, "w") as f:

 # Acceptance criteria
 ## Smoke test: Runs adapter
 <!--  ## Smoke test: Runs adapter
 _Requirement:_ CI broker can run its adapter.
 _Justification:_ This is obviously necessary.
 _Justification:_ This is obviously necessary. If this doesn't work,
 nothing else has a hope of working.
 _Stakeholder:_ Lars.
 ~~~scenario
 given a directory homedir
 when I run env HOME=homedir RAD_PASSPHRASE= rad auth --alias brokertest
 when I run env HOME=homedir RAD_PASSPHRASE= RAD_HOME=homedir/.radicle rad auth --alias brokertest
 when I run env HOME=homedir git config --global user.email radicle@example.com
 when I run env HOME=homedir git config --global user.name TestyMcTestFace
 when I run env HOME=homedir git init testy
 given file testy/test.txt from dummy.sh
 when I run, in testy, env HOME=../homedir git add .
 when I run, in testy, env HOME=../homedir git commit -am test
 when I run, in testy, env HOME=../homedir git status
 when I run, in testy, env HOME=../homedir RAD_PASSPHRASE= rad init --name testy --description test --default-branch master --private --no-confirm --no-seed
 when I run, in testy, env HOME=../homedir rad .
 when I run, in testy, env HOME=../homedir RAD_HOME=../homedir/.radicle RAD_PASSPHRASE= rad init --name testy --description test --default-branch master --private --no-confirm --no-seed
 given an installed synthetic-events
 given file trigger.json

@@ -136,17 +157,14 @@ given file broker.yaml

 given file dummy.sh
 when I run chmod +x dummy.sh
 when I run env HOME=homedir rad ls --all
 when I run env HOME=homedir rad self
 when I run find homedir -type f
 when I run cat trigger.json
 when I run sed -i 's/"auto"/false/' homedir/.radicle/config.json
 when I run env HOME=homedir RAD_SOCKET=synt.sock RUST_LOG=debug ci-broker broker.yaml
 when I run env HOME=homedir RAD_HOME=homedir/.radicle RAD_SOCKET=synt.sock RUST_LOG=debug ci-broker broker.yaml
 then command is successful
 ~~~
 -->
 ## Gives helpful error message if node socket can't be found
 <!-- ## Gives helpful error message if node socket can't be found
 _Requirement:_ If the CI broker can't connect to the Radicle node
 control socket, it gives an error message that helps the user to

@@ -159,17 +177,19 @@ _Stakeholder:_ Lars.

 ~~~scenario
 given a directory homedir
 when I run env HOME=homedir RAD_PASSPHRASE= rad auth --alias brokertest
 when I run env HOME=homedir RAD_HOME=homedir/.radicle RAD_PASSPHRASE= rad auth --alias brokertest
 given an installed ci-broker
 given file broker.yaml
 when I run sed -i 's/"auto"/false/' homedir/.radicle/config.json
 when I try to run env HOME=homedir  RAD_SOCKET=xyzzy.sock ci-broker broker.yaml
 when I try to run env HOME=homedir RAD_HOME=homedir/.radicle RAD_SOCKET=xyzzy.sock ci-broker broker.yaml
 then command fails
 then stderr contains "ERROR: node control socket does not exist: xyzzy.sock"
 ~~~
 ## Gives helpful error message if it doesn't understand its configuration file
 -->
 <!-- ## Gives helpful error message if it doesn't understand its configuration file
 _Requirement:_ If the CI broker is given a configuration file that it
 can't understand, it gives an error message that explains the problem

@@ -186,7 +206,7 @@ scenarios if we tighten the acceptance criteria.

 ~~~scenario
 given a directory homedir
 when I run env HOME=homedir RAD_PASSPHRASE= rad auth --alias brokertest
 when I run env HOME=homedir RAD_HOME=homedir/.radicle RAD_PASSPHRASE= rad auth --alias brokertest
 given an installed ci-broker
 given file broker.yaml

@@ -202,7 +222,10 @@ then stderr contains "ERROR: failed to parse configuration file as YAML: not-yam

 This file is not YAML.
 ~~~
 ## Stops if the node connection breaks
 -->
 <!-- ## Stops if the node connection breaks
 _Requirement:_ If the connection to the Radicle node, via its control
 socket, breaks, the CI broker terminates with a message saying why.

@@ -216,20 +239,22 @@ _Stakeholder:_ Lars.

 ~~~scenario
 given a directory homedir
 when I run env HOME=homedir RAD_PASSPHRASE= rad auth --alias brokertest
 when I run env HOME=homedir RAD_HOME=homedir/.radicle RAD_PASSPHRASE= rad auth --alias brokertest
 given an installed ci-broker
 given an installed synthetic-events
 when I run synthetic-events synt.sock
 given file broker.yaml
 when I run sed -i 's/"auto"/false/' homedir/.radicle/config.json
 when I try to run env HOME=homedir RAD_SOCKET=synt.sock ci-broker broker.yaml
 when I try to run env HOME=homedir RAD_HOME=homedir/.radicle RAD_SOCKET=synt.sock ci-broker broker.yaml
 then command fails
 then stderr contains "connection to the node control socket broke"
 ~~~
 -->
 ## Shuts down when requested
 <!-- ## Shuts down when requested
 _Requirement:_ The test suite can request the CI broker to shut down
 cleanly, and it doesn't result in an error.

@@ -246,7 +271,7 @@ happen in real life.

 ~~~scenario
 given a directory homedir
 when I run env HOME=homedir RAD_PASSPHRASE= rad auth --alias brokertest
 when I run env HOME=homedir RAD_HOME=homedir/.radicle RAD_PASSPHRASE= rad auth --alias brokertest
 given an installed ci-broker
 given an installed synthetic-events

@@ -255,25 +280,11 @@ given file broker.yaml

 when I run synthetic-events synt.sock shutdown.json
 when I run sed -i 's/"auto"/false/' homedir/.radicle/config.json
 when I run sed -i 's/"auto"/false/' homedir/.radicle/config.json
 when I try to run env RUST_LOG=trace HOME=homedir RAD_SOCKET=synt.sock ci-broker broker.yaml
 when I try to run env RUST_LOG=trace HOME=homedir RAD_HOME=homedir/.radicle RAD_SOCKET=synt.sock ci-broker broker.yaml
 then command is successful
 ~~~
 ~~~{#shutdown.json .file .json}
 {
   "type": "refsFetched",
   "remote": "z6MkgEMYod7Hxfy9qCvDv5hYHkZ4ciWmLFgfvm3Wn1b2w2FV",
   "rid": "rad:zwTxygwuz5LDGBq255RA2CbNGrz8",
   "updated": [
     {
       "skipped": {
         "name": "shutdown",
         "oid": "0000000000000000000000000000000000000000"
       }
     }
   ]
 }
 ~~~
 -->
 # Acceptance criteria for test tooling

@@ -312,19 +323,17 @@ The following scenario may only work on Linux, as it's using `pgrep`

 and `nc` and those may not be portable. If so, this may need to be
 changed for other platforms.
 Note also that the version of `nc` must support the `-U` option, which
 in Debian means using the `netcat-openbsd` package.
 ~~~scenario
 given an installed synthetic-events
 when I try to run pgrep -f synthetic-events
 then command fails
 then file synt.sock does not exist
 when I run synthetic-events synt.sock
 when I run pgrep -f synthetic-events
 then command is successful
 then file synt.sock exists
 when I run nc -U synt.sock
 then command is successful
 when I try to run pgrep -f synthetic-events
 then command fails
 then file synt.sock does not exist
 ~~~

modified src/bin/synthetic-events.rs

@@ -42,10 +42,14 @@ fn main() -> anyhow::Result<()> {

                 stream.write_all(e.as_bytes())?;
             }
         }
         remove_file(&args.socket)?;
     } else {
         if args.socket.exists() {
             eprintln!("removing socket {}", args.socket.display());
             remove_file(&args.socket)?;
         }
         eprintln!("launching daemon");
         Command::new(exe)
             .arg("--daemon")
             .arg(&args.socket)

@@ -54,9 +58,12 @@ fn main() -> anyhow::Result<()> {

             .stdout(Stdio::null())
             .stderr(Stdio::null())
             .spawn()?;
         eprintln!("waiting for daemon to create socket");
         while !args.socket.exists() {
             eprintln!("no socket yet");
             sleep(Duration::from_millis(100));
         }
         eprintln!("there is a socket now");
     }
     Ok(())

modified src/event.rs

@@ -378,8 +378,7 @@ impl BrokerEvent {

         let allowed = match filter {
             EventFilter::Repository(wanted) => {
                 trace!("is_allowed: Repository: wanted={wanted:?}");
                 let allowed = rid == wanted;
                 allowed
                 rid == wanted
             }
             EventFilter::RefSuffix(wanted) => name.ends_with(wanted),
             EventFilter::Branch(wanted) => {

modified src/subplot.rs

@@ -40,9 +40,10 @@ fn install_synthetic_events(context: &ScenarioContext) {

 }
 fn bindir() -> PathBuf {
     if let Ok(target) = std::env::var("CARGO_TARGET_DIR") {
     let path = if let Ok(target) = std::env::var("CARGO_TARGET_DIR") {
         Path::new(&target).join("debug")
     } else {
         PathBuf::from("target/debug")
     }
     };
     path.canonicalize().unwrap()
 }