ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

ssh: Clean up

Browse source
This commit is contained in:
Zhaofeng Li 2022-05-22 02:15:33 -07:00
parent 9bd5e7bb25
commit c8b79e7e2d
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/nix/host/ssh.rs
View file

@ -39,6 +39,7 @@ impl Host for Ssh {
let command = self.nix_copy_closure(closure, direction, options); let command = self.nix_copy_closure(closure, direction, options);
self.run_command(command).await self.run_command(command).await
} }
async fn realize_remote(&mut self, derivation: &StorePath) -> ColmenaResult<Vec<StorePath>> { async fn realize_remote(&mut self, derivation: &StorePath) -> ColmenaResult<Vec<StorePath>> {
let command = self.ssh(&["nix-store", "--no-gc-warning", "--realise", derivation.as_path().to_str().unwrap()]); let command = self.ssh(&["nix-store", "--no-gc-warning", "--realise", derivation.as_path().to_str().unwrap()]);
@ -51,6 +52,11 @@ impl Host for Ssh {
paths.lines().map(|p| p.to_string().try_into()).collect() paths.lines().map(|p| p.to_string().try_into()).collect()
} }
fn set_job(&mut self, job: Option<JobHandle>) {
self.job = job;
}
async fn upload_keys(&mut self, keys: &HashMap<String, Key>, require_ownership: bool) -> ColmenaResult<()> { async fn upload_keys(&mut self, keys: &HashMap<String, Key>, require_ownership: bool) -> ColmenaResult<()> {
for (name, key) in keys { for (name, key) in keys {
self.upload_key(name, key, require_ownership).await?; self.upload_key(name, key, require_ownership).await?;
@ -58,6 +64,7 @@ impl Host for Ssh {
Ok(()) Ok(())
} }
async fn activate(&mut self, profile: &Profile, goal: Goal) -> ColmenaResult<()> { async fn activate(&mut self, profile: &Profile, goal: Goal) -> ColmenaResult<()> {
if !goal.requires_activation() { if !goal.requires_activation() {
return Err(ColmenaError::Unsupported); return Err(ColmenaError::Unsupported);
@ -74,10 +81,7 @@ impl Host for Ssh {
let command = self.ssh(&v); let command = self.ssh(&v);
self.run_command(command).await self.run_command(command).await
} }
async fn run_command(&mut self, command: &[&str]) -> ColmenaResult<()> {
let command = self.ssh(command);
self.run_command(command).await
}
async fn get_main_system_profile(&mut self) -> ColmenaResult<StorePath> { async fn get_main_system_profile(&mut self) -> ColmenaResult<StorePath> {
let command = format!("\"readlink -e {} || readlink -e {}\"", SYSTEM_PROFILE, CURRENT_PROFILE); let command = format!("\"readlink -e {} || readlink -e {}\"", SYSTEM_PROFILE, CURRENT_PROFILE);
@ -92,8 +96,10 @@ impl Host for Ssh {
Ok(path) Ok(path)
} }
fn set_job(&mut self, job: Option<JobHandle>) {
self.job = job; async fn run_command(&mut self, command: &[&str]) -> ColmenaResult<()> {
let command = self.ssh(command);
self.run_command(command).await
} }
} }
@ -152,9 +158,7 @@ impl Ssh {
let mut execution = CommandExecution::new(command); let mut execution = CommandExecution::new(command);
execution.set_job(self.job.clone()); execution.set_job(self.job.clone());
let result = execution.run().await; execution.run().await
result
} }
fn ssh_target(&self) -> String { fn ssh_target(&self) -> String {