From 027751febba10992d70d30cf672acb504480df48 Mon Sep 17 00:00:00 2001 From: charlesgauthereau Date: Sun, 1 Feb 2026 19:51:46 +0100 Subject: [PATCH] chore(release): 1.0.5-rc.2 --- CITATION.cff | 2 +- Cargo.lock | 2 +- Cargo.toml | 2 +- src/services/backup.rs | 30 +++++++++--------------------- 4 files changed, 12 insertions(+), 24 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index a2ab0df..8235229 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -22,5 +22,5 @@ keywords: - self-hosted - portabase license: Apache-2.0 -version: 1.0.5-rc.1 +version: 1.0.5-rc.2 date-released: "2026-02-01" \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 6031425..8ec0071 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1617,7 +1617,7 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "portabase-agent" -version = "1.0.4" +version = "1.0.5-rc.1" dependencies = [ "anyhow", "async-stream", diff --git a/Cargo.toml b/Cargo.toml index 083eeda..01465db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "portabase-agent" -version = "1.0.5-rc.1" +version = "1.0.5-rc.2" edition = "2024" [dependencies] diff --git a/src/services/backup.rs b/src/services/backup.rs index 4160218..3be286b 100644 --- a/src/services/backup.rs +++ b/src/services/backup.rs @@ -6,14 +6,14 @@ use crate::services::config::{DatabaseConfig, DatabasesConfig, DbType}; use crate::utils::common::BackupMethod; use crate::utils::file::{encrypt_file_stream, full_extension}; use anyhow::Result; +use futures::StreamExt; use hex; +use rand::RngCore; +use reqwest::Body; use std::path::{Path, PathBuf}; use std::sync::Arc; -use rand::RngCore; use tempfile::TempDir; use tracing::{error, info}; -use reqwest::Body; -use futures::StreamExt; #[derive(Debug)] pub struct BackupResult { @@ -130,16 +130,8 @@ impl BackupService { let public_key_pem = self.ctx.edge_key.public_key.as_bytes().to_vec(); - let (encrypted_stream, encrypted_key_hex) = - match encrypt_file_stream( - file_path.clone(), - aes_key, - iv, - public_key_pem, - ) - .await - { + match encrypt_file_stream(file_path.clone(), aes_key, iv, public_key_pem).await { Ok(v) => v, Err(e) => { error!("Encryption failed: {}", e); @@ -147,24 +139,20 @@ impl BackupService { } }; - let file_size = std::fs::metadata(&file_path) - .map(|m| m.len()) - .unwrap_or(0); + let file_size = std::fs::metadata(&file_path).map(|m| m.len()).unwrap_or(0); let body = Body::wrap_stream( - encrypted_stream.map(|r| r.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))) + encrypted_stream + .map(|r| r.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))), ); let url = format!( - "{}/api/agent/{}/backup", - // "{}/services/v1/upload/{}", - self.ctx.edge_key.server_url, - self.ctx.edge_key.agent_id + "{}/services/v1/upload/{}", + self.ctx.edge_key.server_url, self.ctx.edge_key.agent_id ); let client = reqwest::Client::new(); - info!("file Size to {}", file_size); let resp = client