rename all references of key_agent to agent for consistency

Unifying the key agent with the magic rollback feature soon to be implemented

Author: itslychee

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace]
-members = ["wire/key_agent", "wire/lib", "wire/cli"]
+members = ["wire/agent", "wire/lib", "wire/cli"]
 resolver = "2"
 package.edition = "2021"
 package.version = "0.1.0"

Cargo.toml

@@ -29,7 +29,7 @@
         ./nix/shells.nix
         ./nix/checks.nix
         ./wire/cli
-        ./wire/key_agent
+        ./wire/agent
         ./doc
         ./tests/nix
       ];

flake.nix

@@ -4,4 +4,4 @@ build-dhat:
     cargo build --profile profiling --features dhat-heap
     @echo 'dhat binaries in target/profiling'
     @echo 'Example:'
-    @echo 'WIRE_RUNTIME=/nix/store/...-runtime WIRE_KEY_AGENT=/nix/store/...-key_agent-0.1.0 PROJECT/target/profiling/wire apply ...'
+    @echo 'WIRE_RUNTIME=/nix/store/...-runtime WIRE_AGENT=/nix/store/...-agent-0.1.0 PROJECT/target/profiling/wire apply ...'

justfile

@@ -1,5 +1,5 @@
 [package]
-name = "key_agent"
+name = "agent"
 edition.workspace = true
 version.workspace = true
 

wire/key_agent/Cargo.toml renamed to wire/agent/Cargo.toml

@@ -7,9 +7,9 @@
     {
       packages = {
         agent = buildRustProgram {
-          name = "key_agent";
-          pname = "key_agent";
-          cargoExtraArgs = "-p key_agent";
+          name = "agent";
+          pname = "agent";
+          cargoExtraArgs = "-p agent";
         };
       };
     };

wire/key_agent/build.rs renamed to wire/agent/build.rs

@@ -11,7 +11,7 @@ use std::{
 use tokio::fs::File;
 use tokio::io::AsyncWriteExt;
 
-use key_agent::keys::Keys;
+use agent::keys::Keys;
 
 fn create_path(key_path: &Path) -> Result<(), anyhow::Error> {
     let prefix = key_path.parent().unwrap();

wire/key_agent/default.nix renamed to wire/agent/default.nix

@@ -19,7 +19,7 @@ thiserror = "1.0.62"
 serde_repr = "0.1.20"
 regex = "1.11.1"
 derive_more = "0.99.18"
-key_agent = { path = "../key_agent" }
+agent = { path = "../agent" }
 futures = "0.3.31"
 prost = { workspace = true }
 gethostname = "1.0.1"

wire/key_agent/src/keys.proto renamed to wire/agent/src/keys.proto

@@ -128,7 +128,7 @@ async fn copy_buffers<T: AsyncWriteExt + Unpin>(
     Ok(())
 }
 
-async fn process_key(key: &Key) -> Result<(key_agent::keys::Key, Vec<u8>), Error> {
+async fn process_key(key: &Key) -> Result<(agent::keys::Key, Vec<u8>), Error> {
     let mut reader = create_reader(&key.source).await?;
 
     let mut buf = Vec::new();
@@ -146,7 +146,7 @@ async fn process_key(key: &Key) -> Result<(key_agent::keys::Key, Vec<u8>), Error
     );
 
     Ok((
-        key_agent::keys::Key {
+        agent::keys::Key {
             length: buf
                 .len()
                 .try_into()
@@ -164,17 +164,17 @@ async fn process_key(key: &Key) -> Result<(key_agent::keys::Key, Vec<u8>), Error
 pub struct UploadKeyStep {
     pub moment: UploadKeyAt,
 }
-pub struct PushKeyAgentStep;
+pub struct PushAgentStep;
 
 impl Display for UploadKeyStep {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "Upload key @ {:?}", self.moment)
     }
 }
 
-impl Display for PushKeyAgentStep {
+impl Display for PushAgentStep {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "Push the key agent")
+        write!(f, "Push the agent")
     }
 }
 
@@ -207,7 +207,7 @@ impl ExecuteStep for UploadKeyStep {
     }
 
     async fn execute(&self, ctx: &mut Context<'_>) -> Result<(), HiveLibError> {
-        let agent_directory = ctx.state.key_agent_directory.as_ref().unwrap();
+        let agent_directory = ctx.state.agent_directory.as_ref().unwrap();
 
         let futures = ctx
             .node
@@ -219,15 +219,15 @@ impl ExecuteStep for UploadKeyStep {
             })
             .map(|key| async move { process_key(key).await });
 
-        let (keys, bufs): (Vec<key_agent::keys::Key>, Vec<Vec<u8>>) = join_all(futures)
+        let (keys, bufs): (Vec<agent::keys::Key>, Vec<Vec<u8>>) = join_all(futures)
             .await
             .into_iter()
             .collect::<Result<Vec<_>, Error>>()
             .map_err(HiveLibError::KeyError)?
             .into_iter()
             .unzip();
 
-        let msg = key_agent::keys::Keys { keys };
+        let msg = agent::keys::Keys { keys };
 
         trace!("Sending message {msg:?}");
 
@@ -237,7 +237,7 @@ impl ExecuteStep for UploadKeyStep {
 
         let mut child = command
             .args([
-                format!("{agent_directory}/bin/key_agent"),
+                format!("{agent_directory}/bin/agent"),
                 buf.len().to_string(),
             ])
             .stdout(Stdio::piped())
@@ -278,20 +278,20 @@ impl ExecuteStep for UploadKeyStep {
 }
 
 #[async_trait]
-impl ExecuteStep for PushKeyAgentStep {
+impl ExecuteStep for PushAgentStep {
     fn should_execute(&self, ctx: &Context) -> bool {
         should_execute(&UploadKeyAt::AnyOpportunity, ctx)
     }
 
     async fn execute(&self, ctx: &mut Context<'_>) -> Result<(), HiveLibError> {
-        let agent_directory = match env::var_os("WIRE_KEY_AGENT") {
+        let agent_directory = match env::var_os("WIRE_AGENT") {
             Some(agent) => agent.into_string().unwrap(),
-            None => panic!("WIRE_KEY_AGENT environment variable not set"),
+            None => panic!("WIRE_AGENT environment variable not set"),
         };
 
         push(ctx.node, ctx.name, Push::Path(&agent_directory)).await?;
 
-        ctx.state.key_agent_directory = Some(agent_directory);
+        ctx.state.agent_directory = Some(agent_directory);
 
         Ok(())
     }

wire/key_agent/src/lib.rs renamed to wire/agent/src/lib.rs

@@ -12,7 +12,7 @@ use tracing_indicatif::span_ext::IndicatifSpanExt;
 use crate::nix::StreamTracing;
 use crate::SubCommandModifiers;
 
-use super::key::{Key, PushKeyAgentStep, UploadKeyAt, UploadKeyStep};
+use super::key::{Key, PushAgentStep, UploadKeyAt, UploadKeyStep};
 use super::steps::activate::SwitchToConfigurationStep;
 use super::HiveLibError;
 
@@ -117,7 +117,7 @@ pub trait ExecuteStep: Send + Sync + Display {
 pub struct StepState {
     pub evaluation: Option<Derivation>,
     pub build: Option<String>,
-    pub key_agent_directory: Option<String>,
+    pub agent_directory: Option<String>,
 }
 
 pub struct Context<'a> {
@@ -139,7 +139,7 @@ impl<'a> GoalExecutor<'a> {
     pub fn new(context: Context<'a>) -> Self {
         Self {
             steps: vec![
-                Box::new(PushKeyAgentStep),
+                Box::new(PushAgentStep),
                 Box::new(UploadKeyStep {
                     moment: UploadKeyAt::AnyOpportunity,
                 }),