git.delta.rocks / jrsonnet / refs/commits / 17bf21a48a36

difftreelog

refactor use z85

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

5 files changed

modifiedsrc/cmds/build_systems.rsdiffbeforeafterboth
--- a/src/cmds/build_systems.rs
+++ b/src/cmds/build_systems.rs
@@ -47,7 +47,6 @@
 
 impl BuildSystems {
 	pub fn run(self, config: &Config) -> Result<()> {
-		println!("Build");
 		let hosts = config.list_hosts()?;
 
 		for host in hosts.iter() {
@@ -76,7 +75,6 @@
 				));
 
 			if let Some(builders) = &self.builders {
-				println!("Using builders: {}", builders);
 				nix_build.arg("--builders").arg(builders);
 			}
 			if let Some(jobs) = &self.jobs {
modifiedsrc/cmds/secrets/mod.rsdiffbeforeafterboth
--- a/src/cmds/secrets/mod.rs
+++ b/src/cmds/secrets/mod.rs
@@ -56,14 +56,15 @@
 					let mut encryptor =
 						age::Encryptor::with_recipients(recipients).wrap_output(&mut encrypted)?;
 					io::copy(&mut Cursor::new(input), &mut encryptor)?;
-					ascii85::encode(&encrypted)
+					encryptor.finish()?;
+					encrypted
 				};
 
 				let mut data = config.data_mut();
-				if data.secret.contains_key(&name) && !force {
+				if data.secrets.contains_key(&name) && !force {
 					bail!("secret already defined");
 				}
-				data.secret.insert(
+				data.secrets.insert(
 					name,
 					FleetSecret {
 						owners: machines,
modifiedsrc/fleetdata.rsdiffbeforeafterboth
before · src/fleetdata.rs
1use chrono::{DateTime, Utc};2use serde::{Deserialize, Serialize};3use std::collections::BTreeMap;45#[derive(Serialize, Deserialize, Default)]6#[serde(rename_all = "camelCase")]7pub struct HostData {8	#[serde(default)]9	#[serde(skip_serializing_if = "String::is_empty")]10	pub encryption_key: String,11}1213#[derive(Serialize, Deserialize)]14pub struct FleetData {15	#[serde(default)]16	pub hosts: BTreeMap<String, HostData>,17	#[serde(default)]18	#[serde(skip_serializing_if = "BTreeMap::is_empty")]19	pub secret: BTreeMap<String, FleetSecret>,20}2122#[derive(Serialize, Deserialize)]23#[serde(rename_all = "camelCase")]24pub struct FleetSecret {25	pub owners: Vec<String>,26	#[serde(default)]27	#[serde(skip_serializing_if = "Option::is_none")]28	pub expire_at: Option<DateTime<Utc>>,29	#[serde(skip_serializing_if = "Option::is_none")]30	pub public: Option<String>,31	pub secret: String,32}
modifiedsrc/host.rsdiffbeforeafterboth
--- a/src/host.rs
+++ b/src/host.rs
@@ -68,8 +68,6 @@
 		let mut str = self.directory.as_os_str().to_owned();
 		str.push("#");
 		str.push(attr_name);
-
-		println!("{:?}", str);
 		str
 	}
deletedsrc/nixlike.rsdiffbeforeafterboth

no changes