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

--- a/src/cmds/generate_secrets.rs
+++ b/src/cmds/generate_secrets.rs
@@ -5,7 +5,6 @@
 use log::info;
 
 use crate::db::{
-	keys::KeyDb,
 	secret::{list_secrets, SecretDb},
 	Db, DbData,
 };
@@ -24,8 +23,8 @@
 
 		let defined_secrets = list_secrets()?;
 		for (secret, data) in defined_secrets.iter() {
-			let keys = KeyDb::open(&db)?;
-			secrets.ensure_generated(&keys, &secret, &data)?;
+			// let keys = KeyDb::open(&db)?;
+			// secrets.ensure_generated(&keys, &secret, &data)?;
 		}
 		let key_names = defined_secrets
 			.keys()

1use crate::{command::CommandExt, nix::SECRETS_ATTRIBUTE};1use crate::{command::CommandExt, host::FleetConfig, nix::SECRETS_ATTRIBUTE};
2use anyhow::{bail, Result};2use anyhow::{bail, Result};
3use log::info;3use log::info;
4use serde::{Deserialize, Deserializer, Serialize, Serializer};4use serde::{Deserialize, Deserializer, Serialize, Serializer};
10};10};
11use time::{Duration, PrimitiveDateTime};11use time::{Duration, PrimitiveDateTime};
1212
13use super::{db::DbData, keys::KeyDb};13use super::db::DbData;
1414
15#[derive(Serialize, Deserialize, Debug)]15#[derive(Serialize, Deserialize, Debug)]
16pub struct SecretListData {16pub struct SecretListData {
109	// Secrets are generated on machine running fleet command109	// Secrets are generated on machine running fleet command
110	pub fn generate_secret(110	pub fn generate_secret(
111		&mut self,111		&mut self,
112		keys: &KeyDb,112		fleet_config: FleetConfig,
113		secret: &str,113		secret: &str,
114		data: &SecretListData,114		data: &SecretListData,
115	) -> Result<()> {115	) -> Result<()> {
119				rage_keys.push(' ');119				rage_keys.push(' ');
120			}120			}
121			rage_keys.push_str("--recipient \"");121			rage_keys.push_str("--recipient \"");
122			rage_keys.push_str(&keys.get_host_key(&owner)?);122			// rage_keys.push_str(&keys.get_host_key(&owner)?);
123			rage_keys.push('"')123			rage_keys.push('"')
124		}124		}
125		let created_at: PrimitiveDateTime = SystemTime::now().into();125		let created_at: PrimitiveDateTime = SystemTime::now().into();
184	}184	}
185	pub fn ensure_generated(185	pub fn ensure_generated(
186		&mut self,186		&mut self,
187		keys: &KeyDb,187		// keys: &KeyDb,
188		secret: &str,188		secret: &str,
189		data: &SecretListData,189		data: &SecretListData,
190	) -> Result<()> {190	) -> Result<()> {
191		if self.need_to_generate(secret, data)? {191		if self.need_to_generate(secret, data)? {
192			info!("Generating secret {}", secret);192			info!("Generating secret {}", secret);
193			self.generate_secret(keys, secret, data)?;193			// self.generate_secret(keys, secret, data)?;
194		}194		}
195195
196		Ok(())196		Ok(())