git.delta.rocks / jrsonnet / refs/commits / a8825de2d893

125			if let Some(deploy_kind) = opts.action_attr::<DeployKind>(&host, "deploy_kind").await? {125			if let Some(deploy_kind) = opts.action_attr::<DeployKind>(&host, "deploy_kind").await? {
126				host.set_deploy_kind(deploy_kind);126				host.set_deploy_kind(deploy_kind);
127			};127			};
128			if let Some(destination) = opts.action_attr::<String>(&host, "dest").await? {
129				host.set_session_destination(destination);
130			};
128131
129			set.spawn_local(132			set.spawn_local(
130				(async move {133				(async move {

--- a/crates/fleet-base/src/host.rs
+++ b/crates/fleet-base/src/host.rs
@@ -98,7 +98,9 @@
 	pub name: String,
 	groups: OnceCell<Vec<String>>,
 
+	// TODO: Both of those values are taken from host opts, there should be a cleaner way to specify it
 	deploy_kind: OnceCell<DeployKind>,
+	session_destination: OnceCell<String>,
 
 	pub host_config: Option<Value>,
 	pub nixos_config: OnceCell<Value>,
@@ -209,6 +211,12 @@
 		Ok(generations)
 	}
 
+	pub fn set_session_destination(&self, dest: String) {
+		self.session_destination
+			.set(dest)
+			.ok()
+			.expect("session destination is already set")
+	}
 	pub fn set_deploy_kind(&self, kind: DeployKind) {
 		self.deploy_kind
 			.set(kind)
@@ -217,7 +225,7 @@
 	}
 	pub async fn deploy_kind(&self) -> Result<DeployKind> {
 		if let Some(kind) = self.deploy_kind.get() {
-			return Ok(kind.clone());
+			return Ok(*kind);
 		}
 		let is_fleet_managed = match self.file_exists("/etc/FLEET_HOST").await {
 			Ok(v) => v,
@@ -237,11 +245,7 @@
 		}
 		// TOCTOU is possible
 		let _ = self.deploy_kind.set(DeployKind::Fleet);
-		Ok(self
-			.deploy_kind
-			.get()
-			.expect("deploy kind is just set")
-			.clone())
+		Ok(*self.deploy_kind.get().expect("deploy kind is just set"))
 	}
 	pub async fn escalation_strategy(&self) -> Result<EscalationStrategy> {
 		// Prefer sudo, as run0 has some gotchas with polkit
@@ -261,8 +265,10 @@
 			return Ok((*session).clone());
 		};
 		let session = SessionBuilder::default();
+
+		let dest = self.session_destination.get().unwrap_or(&self.name);
 		let session = session
-			.connect(&self.name)
+			.connect(&dest)
 			.await
 			.map_err(|e| anyhow!("ssh error while connecting to {}: {e:#?}", self.name))?;
 		let session = Arc::new(session);
@@ -281,7 +287,7 @@
 			.arg("test -e \"$1\" && echo true || echo false")
 			.arg("_")
 			.arg(path);
-		Ok(cmd.run_value().await?)
+		cmd.run_value().await
 	}
 	pub async fn read_file_bin(&self, path: impl AsRef<OsStr>) -> Result<Vec<u8>> {
 		let mut cmd = self.cmd("cat").await?;