git.delta.rocks / jrsonnet / refs/commits / 5eda0552da5c

difftreelog

refactor move keys command to secrets

Yaroslav Bolyukin2021-09-18parent: #fad91f8.patch.diff
in: trunk

3 files changed

deletedsrc/cmds/fetch_keys.rsdiffbeforeafterboth
--- a/src/cmds/fetch_keys.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use crate::host::FleetOpts;
-use anyhow::Result;
-use clap::Clap;
-use log::{info, warn};
-
-#[derive(Clap)]
-pub struct FetchKeys {
-	#[clap(flatten)]
-	fleet_opts: FleetOpts,
-
-	/// If true - remove orphaned keys
-	#[clap(long)]
-	cleanup: bool,
-}
-
-impl FetchKeys {
-	pub fn run(self) -> Result<()> {
-		let fleet = self.fleet_opts.build()?;
-		let hosts = fleet.list_hosts()?;
-		for host in hosts.iter() {
-			if host.skip() {
-				warn!("Skipped host {}", host.hostname);
-				continue;
-			}
-			host.key()?;
-		}
-		let orphans: Vec<_> = fleet.list_orphaned_keys()?;
-		if !orphans.is_empty() {
-			if self.cleanup {
-				info!("Removed orphan host keys:");
-			} else {
-				info!("Orphan host keys found, run with --cleanup to remove them from db:");
-			}
-			for (name, path) in orphans {
-				info!("- {}", name);
-				if self.cleanup {
-					std::fs::remove_file(path)?;
-				}
-			}
-		}
-		Ok(())
-	}
-}
addedsrc/cmds/secrets/mod.rsdiffbeforeafterboth

no changes

modifiedsrc/main.rsdiffbeforeafterboth
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,12 +15,12 @@
 #[derive(Clap)]
 #[clap(version = "1.0", author = "CertainLach <iam@lach.pw>")]
 enum Opts {
-	/// Fetch encryption (ssh) public keys from remote hosts
-	FetchKeys(FetchKeys),
 	/// Force generation of missing secrets
 	GenerateSecrets(GenerateSecrets),
 	/// Prepare systems for deployments
 	BuildSystems(BuildSystems),
+	/// Secret management
+	Secrets(Secrets),
 }
 
 fn main() -> Result<()> {