From 2a625abed5ed378aec061d523702fc2036b4027a Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Sun, 19 Sep 2021 13:57:12 +0000
Subject: [PATCH] refactor: remove intermediate directory


---
--- a/cmds/install-secrets/src/main.rs
+++ b/cmds/install-secrets/src/main.rs
@@ -127,8 +127,7 @@
 	let data_str = from_utf8(&data).context("failed to read data to string")?;
 	let data: Data = serde_json::from_str(data_str).context("failed to parse data")?;
 
-	let tempdir =
-		tempfile::tempdir_in("/run/secrets.d").context("failed to create secrets tempdir")?;
+	let tempdir = tempfile::tempdir_in("/run/").context("failed to create secrets tempdir")?;
 
 	let identity = age::ssh::Identity::from_buffer(
 		&mut Cursor::new(
@@ -152,7 +151,7 @@
 		bail!("one or more secrets failed");
 	}
 
-	if fs::metadata("/run/secrets.d/secrets.fleet")
+	if fs::metadata("/run/secrets")
 		.map(|m| m.is_dir())
 		.unwrap_or(false)
 	{
@@ -161,7 +160,7 @@
 			None,
 			tempdir.path(),
 			None,
-			"/run/secrets.d/secrets.fleet",
+			"/run/secrets",
 			RenameFlags::RENAME_EXCHANGE,
 		)
 		.context("failed to exchange secret directories")?;
@@ -171,8 +170,7 @@
 	} else {
 		// Link now
 		let persisted = tempdir.into_path();
-		fs::rename(&persisted, "/run/secrets.d/secrets.fleet")
-			.context("failed to link secret directory")?;
+		fs::rename(&persisted, "/run/secrets").context("failed to link secret directory")?;
 	}
 	Ok(())
 }

-- 
gitstuff